diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/network.subr | 2 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 2 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 2 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 2 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 2 | ||||
| -rw-r--r-- | etc/rc.d/network_ipv6 | 26 | ||||
| -rw-r--r-- | etc/rc.d/routing | 2 | ||||
| -rw-r--r-- | etc/rc.network | 2 | ||||
| -rw-r--r-- | etc/rc.network6 | 26 |
9 files changed, 19 insertions, 47 deletions
diff --git a/etc/network.subr b/etc/network.subr index 00f6250..e3af24e 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 00f6250..e3af24e 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 00f6250..e3af24e 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 00f6250..e3af24e 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 00f6250..e3af24e 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6 index dc6188a..a46194f 100644 --- a/etc/rc.d/network_ipv6 +++ b/etc/rc.d/network_ipv6 @@ -232,11 +232,11 @@ network6_pass1() { case ${ipv6_ipv4mapping} in [Yy][Ee][Ss]) echo -n ' IPv4 mapped IPv6 address support=YES' - sysctl -w net.inet6.ip6.mapped_addr=1 >/dev/null + sysctl -w net.inet6.ip6.v6only=0 >/dev/null ;; '' | *) echo -n ' IPv4 mapped IPv6 address support=NO' - sysctl -w net.inet6.ip6.mapped_addr=0 >/dev/null + sysctl -w net.inet6.ip6.v6only=1 >/dev/null ;; esac @@ -256,7 +256,6 @@ network6_interface_setup() { ;; *) rtsol_available=yes - prefixcmd_enable=NO ;; esac for i in $interfaces; do @@ -265,24 +264,11 @@ network6_interface_setup() { if [ -n "${prefix}" ]; then rtsol_available=no rtsol_interface=no + laddr=`network6_getladdr $i` + hostid=`expr "${laddr}" : 'fe80::\(.*\)%\(.*\)'` for j in ${prefix}; do - case ${prefixcmd_enable} in - [Yy][Ee][Ss]) - prefix $i $j:: - ;; - *) - laddr=`network6_getladdr $i` - hostid=`expr "${laddr}" : \ - 'fe80::\(.*\)%\(.*\)'` - address=$j\:${hostid} - - eval hostid_$i=${hostid} - eval address_$i=${address} - - ifconfig $i inet6 ${address} \ - prefixlen 64 alias - ;; - esac + address=$j\:${hostid} + ifconfig $i inet6 ${address} prefixlen 64 alias case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 00f6250..e3af24e 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.network b/etc/rc.network index 00f6250..e3af24e 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -766,7 +766,7 @@ network_gif_setup() { continue ;; *) - gifconfig $i ${peers} + ifconfig $i tunnel ${peers} ;; esac done diff --git a/etc/rc.network6 b/etc/rc.network6 index dc6188a..a46194f 100644 --- a/etc/rc.network6 +++ b/etc/rc.network6 @@ -232,11 +232,11 @@ network6_pass1() { case ${ipv6_ipv4mapping} in [Yy][Ee][Ss]) echo -n ' IPv4 mapped IPv6 address support=YES' - sysctl -w net.inet6.ip6.mapped_addr=1 >/dev/null + sysctl -w net.inet6.ip6.v6only=0 >/dev/null ;; '' | *) echo -n ' IPv4 mapped IPv6 address support=NO' - sysctl -w net.inet6.ip6.mapped_addr=0 >/dev/null + sysctl -w net.inet6.ip6.v6only=1 >/dev/null ;; esac @@ -256,7 +256,6 @@ network6_interface_setup() { ;; *) rtsol_available=yes - prefixcmd_enable=NO ;; esac for i in $interfaces; do @@ -265,24 +264,11 @@ network6_interface_setup() { if [ -n "${prefix}" ]; then rtsol_available=no rtsol_interface=no + laddr=`network6_getladdr $i` + hostid=`expr "${laddr}" : 'fe80::\(.*\)%\(.*\)'` for j in ${prefix}; do - case ${prefixcmd_enable} in - [Yy][Ee][Ss]) - prefix $i $j:: - ;; - *) - laddr=`network6_getladdr $i` - hostid=`expr "${laddr}" : \ - 'fe80::\(.*\)%\(.*\)'` - address=$j\:${hostid} - - eval hostid_$i=${hostid} - eval address_$i=${address} - - ifconfig $i inet6 ${address} \ - prefixlen 64 alias - ;; - esac + address=$j\:${hostid} + ifconfig $i inet6 ${address} prefixlen 64 alias case ${ipv6_gateway_enable} in [Yy][Ee][Ss]) |
