Mailing List Archive

Author: Antonio Borneo
Date: Sat Jan 14 08:56:42 2012
New Revision: 504

Log:
No need to add link-local address on Solaris.

Revert commit 9e277b5e64315aa3e1a2f2472e9c2d55f9b0f788. Now that we plumb
the interface from openconnect instead of with ifconfig from vpnc-script,
the issues with link-local addresses no longer seem to bother us.

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:42 2012
@@ -73,9 +73,11 @@
route_syntax_netmask="-netmask"
fi
if [ "$OS" = "SunOS" ]; then
- route_syntax_interface="-interface"
+ route_syntax_interface="-interface"
+ ifconfig_syntax_ptpv6="$INTERNAL_IP6_ADDRESS"
else
- route_syntax_interface=""
+ route_syntax_interface=""
+ ifconfig_syntax_ptpv6=""
fi

if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
@@ -126,18 +128,13 @@
if [ -n "$IPROUTE" ]; then
$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
else
- if [ "$OS" = "SunOS" ]; then
- # Solaris 11 needs link-local addrs to be assigned manually
- ifconfig "$TUNDEV" inet6 fe80::1 fe80::2 mtu $MTU up
- ifconfig "$TUNDEV" inet6 addif $INTERNAL_IP6_NETMASK $INTERNAL_IP6_ADDRESS up
- else
- # Unlike for Legacy IP, we don't specify the dest_address
- # here on *BSD. OpenBSD for one will refuse to accept
- # incoming packets to that address if we do.
- # OpenVPN does the same (gives dest_address for Legacy IP
- # but not for IPv6)
- ifconfig "$TUNDEV" inet6 $INTERNAL_IP6_NETMASK mtu $MTU up
- fi
+ # Unlike for Legacy IP, we don't specify the dest_address
+ # here on *BSD. OpenBSD for one will refuse to accept
+ # incoming packets to that address if we do.
+ # OpenVPN does the same (gives dest_address for Legacy IP
+ # but not for IPv6).
+ # Only Solaris needs it; hence $ifconfig_syntax_ptpv6
+ ifconfig "$TUNDEV" inet6 $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:42 2012
@@ -73,9 +73,11 @@
route_syntax_netmask="-netmask"
fi
if [ "$OS" = "SunOS" ]; then
- route_syntax_interface="-interface"
+ route_syntax_interface="-interface"
+ ifconfig_syntax_ptpv6="$INTERNAL_IP6_ADDRESS"
else
- route_syntax_interface=""
+ route_syntax_interface=""
+ ifconfig_syntax_ptpv6=""
fi

if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
@@ -126,18 +128,13 @@
if [ -n "$IPROUTE" ]; then
$IPROUTE -6 addr add $INTERNAL_IP6_NETMASK dev $TUNDEV
else
- if [ "$OS" = "SunOS" ]; then
- # Solaris 11 needs link-local addrs to be assigned manually
- ifconfig "$TUNDEV" inet6 fe80::1 fe80::2 mtu $MTU up
- ifconfig "$TUNDEV" inet6 addif $INTERNAL_IP6_NETMASK $INTERNAL_IP6_ADDRESS up
- else
- # Unlike for Legacy IP, we don't specify the dest_address
- # here on *BSD. OpenBSD for one will refuse to accept
- # incoming packets to that address if we do.
- # OpenVPN does the same (gives dest_address for Legacy IP
- # but not for IPv6)
- ifconfig "$TUNDEV" inet6 $INTERNAL_IP6_NETMASK mtu $MTU up
- fi
+ # Unlike for Legacy IP, we don't specify the dest_address
+ # here on *BSD. OpenBSD for one will refuse to accept
+ # incoming packets to that address if we do.
+ # OpenVPN does the same (gives dest_address for Legacy IP
+ # but not for IPv6).
+ # Only Solaris needs it; hence $ifconfig_syntax_ptpv6
+ ifconfig "$TUNDEV" inet6 $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/