KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

6to4: provide "adv_preferred_lifetime" and "adv_valid_lifetime" options to control the generated radvd prefix values (#9147)

Browse source 
SVN-Revision: 27650
This commit is contained in:
Jo-Philipp Wich 2011-07-17 15:43:18 +00:00
parent 597be91074
commit 4b362b98bb
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/6to4/Makefile
View file

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6to4 PKG_NAME:=6to4
PKG_VERSION:=5 PKG_VERSION:=6
PKG_RELEASE:=2 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
package/6to4/files/6to4.sh
View file

@ -64,6 +64,8 @@ set_6to4_radvd_prefix() {
local lanif="${2:-lan}" local lanif="${2:-lan}"
local wanif="${3:-wan}" local wanif="${3:-wan}"
local prefix="${4:-0:0:0:1::/64}" local prefix="${4:-0:0:0:1::/64}"
local vlt="${5:-300}"
local plt="${6:-120}"
local pfxsection="" local pfxsection=""
find_pfxsection() { find_pfxsection() {
@ -88,8 +90,8 @@ set_6to4_radvd_prefix() {
uci_set_state radvd "$pfxsection" prefix "$prefix" uci_set_state radvd "$pfxsection" prefix "$prefix"
uci_set_state radvd "$pfxsection" AdvOnLink 1 uci_set_state radvd "$pfxsection" AdvOnLink 1
uci_set_state radvd "$pfxsection" AdvAutonomous 1 uci_set_state radvd "$pfxsection" AdvAutonomous 1
uci_set_state radvd "$pfxsection" AdvValidLifetime 300 uci_set_state radvd "$pfxsection" AdvValidLifetime "$vlt"
uci_set_state radvd "$pfxsection" AdvPreferredLifetime 120 uci_set_state radvd "$pfxsection" AdvPreferredLifetime "$plt"
uci_set_state radvd "$pfxsection" Base6to4Interface "$wanif" uci_set_state radvd "$pfxsection" Base6to4Interface "$wanif"
} }
} }
@ -200,6 +202,10 @@ setup_interface_6to4() {
config_get adv_ifname "${adv_interface:-lan}" ifname config_get adv_ifname "${adv_interface:-lan}" ifname
grep -qs "^ *$adv_ifname:" /proc/net/dev && { grep -qs "^ *$adv_ifname:" /proc/net/dev && {
local adv_valid_lifetime adv_preferred_lifetime
config_get adv_valid_lifetime "${adv_interface:-lan}" adv_valid_lifetime
config_get adv_preferred_lifetime "${adv_interface:-lan}" adv_preferred_lifetime
local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)" local subnet6="$(printf "%s:%x::1/64" "$prefix6" $adv_subnet)"
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)"
@ -207,7 +213,8 @@ setup_interface_6to4() {
set_6to4_radvd_interface "$sid" "$adv_interface" "$mtu" 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)" \
"$adv_valid_lifetime" "$adv_preferred_lifetime"
adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6" adv_subnets="${adv_subnets:+$adv_subnets }$adv_ifname:$subnet6"
adv_subnet=$(($adv_subnet + 1)) adv_subnet=$(($adv_subnet + 1))