Ticket #230: openvpn-ipv6-environment-variables.patch

src/openvpn/multi.c

@@ -1400 +1400 @@
   setenv_del (mi->context.c2.es, "ifconfig_pool_remote_ip");
   setenv_del (mi->context.c2.es, "ifconfig_pool_netmask");
 
+  setenv_del (mi->context.c2.es, "ifconfig_pool_local_ip6");
+  setenv_del (mi->context.c2.es, "ifconfig_pool_remote_ip6");
+
   if (mi->context.c2.push_ifconfig_defined)
     {
       const int tunnel_type = TUNNEL_TYPE (mi->context.c1.tuntap);
@@ -1426 +1429 @@
         }
     }
 
-    /* TODO: I'm not exactly sure what these environment variables are
-     *       used for, but if we have them for IPv4, we should also have
-     *       them for IPv6, no?
-     */
+  if (mi->context.c2.push_ifconfig_ipv6_defined)
+    {
+      setenv_in6_addr (mi->context.c2.es,
+                        "ifconfig_pool_remote",
+                        &mi->context.c2.push_ifconfig_ipv6_local,
+                        SA_SET_IF_NONZERO);
+
+      setenv_in6_addr (mi->context.c2.es,
+                        "ifconfig_pool_local",
+                        &mi->context.c2.push_ifconfig_ipv6_remote,
+                        SA_SET_IF_NONZERO);
+    }
 }
 
 /*

src/openvpn/socket.c

@@ -2409 +2409 @@
 }
 
 void
+setenv_in6_addr (struct env_set *es, const char *name_prefix, struct in6_addr *addr, const unsigned int flags)
+{
+  if (addr || !(flags & SA_SET_IF_NONZERO))
+    {
+      struct openvpn_sockaddr si;
+      CLEAR (si);
+      si.addr.in6.sin6_family = AF_INET6;
+      memcpy(&si.addr.in6.sin6_addr, addr, sizeof(struct in6_addr));
+      memcpy(&si.addr.sa, &si.addr.in6, sizeof(struct sockaddr_in6));
+      setenv_sockaddr (es, name_prefix, &si, flags);
+    }
+}
+
+void
 setenv_link_socket_actual (struct env_set *es,
                            const char *name_prefix,
                            const struct link_socket_actual *act,

src/openvpn/socket.h

@@ -383 +383 @@
                        in_addr_t addr,
                        const unsigned int flags);
 
+void setenv_in6_addr (struct env_set *es,
+                       const char *name_prefix,
+                       struct in6_addr *addr,
+                       const unsigned int flags);
+
 void setenv_link_socket_actual (struct env_set *es,
                                 const char *name_prefix,
                                 const struct link_socket_actual *act,