Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:54:47 2012
New Revision: 486

Log:
Set IPv6 address on interface; no routes yet

Initialize environment variables

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>

Modified:
branches/vpnc-nortel/vpnc-script
branches/vpnc-nortel/vpnc.c
trunk/vpnc-script
trunk/vpnc.c

Modified: branches/vpnc-nortel/vpnc-script
==============================================================================
--- branches/vpnc-nortel/vpnc-script (original)
+++ branches/vpnc-nortel/vpnc-script Sat Jan 14 08:54:47 2012
@@ -104,6 +104,13 @@

if [ -n "$INTERNAL_IP4_NETMASK" ]; then
set_network_route $INTERNAL_IP4_NETADDR $INTERNAL_IP4_NETMASK $INTERNAL_IP4_NETMASKLEN
+ fi
+
+ # If the netmask is provided, it contains the address _and_ netmask
+ if [ -n "$INTERNAL_IP6_NETMASK" -a -n "$IPROUTE" ]; then
+ $IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
+ elif [ -n "$INTERNAL_IP6_ADDRESS" -a -n "$IPROUTE" ]; then
+ $IPROUTE -6 addr add $INTERNAL_IP6_ADDRESS/128 dev $TUNDEV
fi
}


Modified: branches/vpnc-nortel/vpnc.c
==============================================================================
--- branches/vpnc-nortel/vpnc.c (original)
+++ branches/vpnc-nortel/vpnc.c Sat Jan 14 08:54:47 2012
@@ -937,6 +937,8 @@
unsetenv("INTERNAL_IP4_DNS");
unsetenv("INTERNAL_IP4_NETMASK");
unsetenv("INTERNAL_IP4_ADDRESS");
+ unsetenv("INTERNAL_IP6_NETMASK");
+ unsetenv("INTERNAL_IP6_ADDRESS");

for (; a && reject == 0; a = a->next)
switch (a->type) {

Modified: trunk/vpnc-script
==============================================================================
--- trunk/vpnc-script (original)
+++ trunk/vpnc-script Sat Jan 14 08:54:47 2012
@@ -104,6 +104,13 @@

if [ -n "$INTERNAL_IP4_NETMASK" ]; then
set_network_route $INTERNAL_IP4_NETADDR $INTERNAL_IP4_NETMASK $INTERNAL_IP4_NETMASKLEN
+ fi
+
+ # If the netmask is provided, it contains the address _and_ netmask
+ if [ -n "$INTERNAL_IP6_NETMASK" -a -n "$IPROUTE" ]; then
+ $IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
+ elif [ -n "$INTERNAL_IP6_ADDRESS" -a -n "$IPROUTE" ]; then
+ $IPROUTE -6 addr add $INTERNAL_IP6_ADDRESS/128 dev $TUNDEV
fi
}


Modified: trunk/vpnc.c
==============================================================================
--- trunk/vpnc.c (original)
+++ trunk/vpnc.c Sat Jan 14 08:54:47 2012
@@ -915,6 +915,8 @@
unsetenv("INTERNAL_IP4_DNS");
unsetenv("INTERNAL_IP4_NETMASK");
unsetenv("INTERNAL_IP4_ADDRESS");
+ unsetenv("INTERNAL_IP6_NETMASK");
+ unsetenv("INTERNAL_IP6_ADDRESS");

for (; a && reject == 0; a = a->next)
switch (a->type) {

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/