Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:56:15 2012
New Revision: 500

Log:
Tidy up IPv6 address/netmask handling a little, fix netmask handling on *BSD.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

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

Modified: branches/vpnc-nortel/vpnc-script
==============================================================================
--- branches/vpnc-nortel/vpnc-script (original)
+++ branches/vpnc-nortel/vpnc-script Sat Jan 14 08:56:15 2012
@@ -127,15 +127,14 @@
fi

# If the netmask is provided, it contains the address _and_ netmask
- if [ -n "$IPROUTE" ]; then
- if [ -n "$INTERNAL_IP6_NETMASK" ]; then
+ if [ -n "$INTERNAL_IP6_ADDRESS" ] && [ -z "$INTERNAL_IP6_NETMASK" ]; then
+ INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
+ fi
+ if [ -n "$INTERNAL_IP6_NETMASK" ]; then
+ if [ -n "$IPROUTE" ]; then
$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
- elif [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- $IPROUTE -6 addr add $INTERNAL_IP6_ADDRESS/128 dev $TUNDEV
- fi
- else
- if [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $ifconfig_syntax_ptpv6 mtu $MTU up
+ else
+ ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_NETMASK $ifconfig_syntax_ptpv6 mtu $MTU up
fi
fi
}

Modified: trunk/vpnc-script
==============================================================================
--- trunk/vpnc-script (original)
+++ trunk/vpnc-script Sat Jan 14 08:56:15 2012
@@ -127,15 +127,14 @@
fi

# If the netmask is provided, it contains the address _and_ netmask
- if [ -n "$IPROUTE" ]; then
- if [ -n "$INTERNAL_IP6_NETMASK" ]; then
+ if [ -n "$INTERNAL_IP6_ADDRESS" ] && [ -z "$INTERNAL_IP6_NETMASK" ]; then
+ INTERNAL_IP6_NETMASK="$INTERNAL_IP6_ADDRESS/128"
+ fi
+ if [ -n "$INTERNAL_IP6_NETMASK" ]; then
+ if [ -n "$IPROUTE" ]; then
$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
- elif [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- $IPROUTE -6 addr add $INTERNAL_IP6_ADDRESS/128 dev $TUNDEV
- fi
- else
- if [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $ifconfig_syntax_ptpv6 mtu $MTU up
+ else
+ ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_NETMASK $ifconfig_syntax_ptpv6 mtu $MTU up
fi
fi
}

_______________________________________________
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/