Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:56:10 2012
New Revision: 499

Log:
Remove dest_address from IPv6 ifconfig for all but Solaris

This makes OpenBSD unhappy, and it looks like OpenVPN *only* does it on
Solaris.

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:10 2012
@@ -72,12 +72,18 @@
route_syntax_del="delete"
route_syntax_netmask="-netmask"
fi
+# Only Solaris needs 'plumb', and only Solaris needs to be given a dest_address
+# for the IPv6. At least, OpenVPN doesn't do it for anything but Solaris, and
+# OpenBSD is definitely *not* happy if given a dest_address that matches the
+# local address.
if [ "$OS" = "SunOS" ]; then
route_syntax_interface="-interface"
route_syntax_plumb="plumb"
+ ifconfig_syntax_ptpv6="$INTERNAL_IP6_ADDRESS"
else
route_syntax_interface=""
route_syntax_plumb=""
+ ifconfig_syntax_ptpv6=""
fi

if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
@@ -129,7 +135,7 @@
fi
else
if [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $ifconfig_syntax_ptp $INTERNAL_IP6_ADDRESS mtu $MTU up
+ ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $ifconfig_syntax_ptpv6 mtu $MTU up
fi
fi
}

Modified: trunk/vpnc-script
==============================================================================
--- trunk/vpnc-script (original)
+++ trunk/vpnc-script Sat Jan 14 08:56:10 2012
@@ -72,12 +72,18 @@
route_syntax_del="delete"
route_syntax_netmask="-netmask"
fi
+# Only Solaris needs 'plumb', and only Solaris needs to be given a dest_address
+# for the IPv6. At least, OpenVPN doesn't do it for anything but Solaris, and
+# OpenBSD is definitely *not* happy if given a dest_address that matches the
+# local address.
if [ "$OS" = "SunOS" ]; then
route_syntax_interface="-interface"
route_syntax_plumb="plumb"
+ ifconfig_syntax_ptpv6="$INTERNAL_IP6_ADDRESS"
else
route_syntax_interface=""
route_syntax_plumb=""
+ ifconfig_syntax_ptpv6=""
fi

if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
@@ -129,7 +135,7 @@
fi
else
if [ -n "$INTERNAL_IP6_ADDRESS" ]; then
- ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $ifconfig_syntax_ptp $INTERNAL_IP6_ADDRESS mtu $MTU up
+ ifconfig "$TUNDEV" inet6 $route_syntax_plumb $INTERNAL_IP6_ADDRESS/128 $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/