summaryrefslogtreecommitdiffstats
path: root/etc/rc.network6
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2001-06-11 12:39:29 +0000
committerume <ume@FreeBSD.org>2001-06-11 12:39:29 +0000
commit832f8d224926758a9ae0b23a6b45353e44fbc87a (patch)
treea79fc7ad2b97862c4a404f352f0211ad93a7b5f1 /etc/rc.network6
parent2693854b01a52b0395a91322aa3edf926bddff38 (diff)
downloadFreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.zip
FreeBSD-src-832f8d224926758a9ae0b23a6b45353e44fbc87a.tar.gz
Sync with recent KAME.
This work was based on kame-20010528-freebsd43-snap.tgz and some critical problem after the snap was out were fixed. There are many many changes since last KAME merge. TODO: - The definitions of SADB_* in sys/net/pfkeyv2.h are still different from RFC2407/IANA assignment because of binary compatibility issue. It should be fixed under 5-CURRENT. - ip6po_m member of struct ip6_pktopts is no longer used. But, it is still there because of binary compatibility issue. It should be removed under 5-CURRENT. Reviewed by: itojun Obtained from: KAME MFC after: 3 weeks
Diffstat (limited to 'etc/rc.network6')
-rw-r--r--etc/rc.network626
1 files changed, 6 insertions, 20 deletions
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])
OpenPOWER on IntegriCloud