6to4: advertise effective tunnel mtu in RAs
SVN-Revision: 27163
This commit is contained in:
parent
6a5112a750
commit
1277bd7186
2 changed files with 7 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# Copyright (C) 2010 OpenWrt.org
|
# Copyright (C) 2010-2011 OpenWrt.org
|
||||||
#
|
#
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
# See /LICENSE for more information.
|
# See /LICENSE for more information.
|
||||||
|
@ -8,7 +8,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=6to4
|
PKG_NAME:=6to4
|
||||||
PKG_VERSION:=4
|
PKG_VERSION:=5
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
|
@ -30,6 +30,7 @@ test_6to4_rfc1918()
|
||||||
set_6to4_radvd_interface() {
|
set_6to4_radvd_interface() {
|
||||||
local cfgid="$1"
|
local cfgid="$1"
|
||||||
local lanif="${2:-lan}"
|
local lanif="${2:-lan}"
|
||||||
|
local ifmtu="${3:-1280}"
|
||||||
local ifsection=""
|
local ifsection=""
|
||||||
|
|
||||||
find_ifsection() {
|
find_ifsection() {
|
||||||
|
@ -55,6 +56,7 @@ set_6to4_radvd_interface() {
|
||||||
uci_set_state radvd "$ifsection" IgnoreIfMissing 1
|
uci_set_state radvd "$ifsection" IgnoreIfMissing 1
|
||||||
uci_set_state radvd "$ifsection" AdvSendAdvert 1
|
uci_set_state radvd "$ifsection" AdvSendAdvert 1
|
||||||
uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
|
uci_set_state radvd "$ifsection" MaxRtrAdvInterval 30
|
||||||
|
uci_set_state radvd "$ifsection" AdvLinkMTU "$ifmtu"
|
||||||
}
|
}
|
||||||
|
|
||||||
set_6to4_radvd_prefix() {
|
set_6to4_radvd_prefix() {
|
||||||
|
@ -203,7 +205,7 @@ setup_interface_6to4() {
|
||||||
logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
|
logger -t "$link" " * Advertising IPv6 subnet $subnet6 on ${adv_interface:-lan} ($adv_ifname)"
|
||||||
ip -6 addr add $subnet6 dev $adv_ifname
|
ip -6 addr add $subnet6 dev $adv_ifname
|
||||||
|
|
||||||
set_6to4_radvd_interface "$sid" "$adv_interface"
|
set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu"
|
||||||
set_6to4_radvd_prefix "$sid" "$adv_interface" \
|
set_6to4_radvd_prefix "$sid" "$adv_interface" \
|
||||||
"$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
|
"$wancfg" "$(printf "0:0:0:%x::/64" $adv_subnet)"
|
||||||
|
|
||||||
|
@ -252,9 +254,8 @@ stop_interface_6to4() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
[ "$defaultroute" = "1" ] && {
|
[ "$defaultroute" = "1" ] && \
|
||||||
ip -6 route del ::/0 via ::192.88.99.1 dev $link metric 1
|
ip -6 route del ::/0 via ::192.88.99.1 dev $link
|
||||||
}
|
|
||||||
|
|
||||||
ip addr del $local6 dev $link
|
ip addr del $local6 dev $link
|
||||||
ip link set $link down
|
ip link set $link down
|
||||||
|
|
Loading…
Reference in a new issue