From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jul 2011 15:43:18 +0000 (+0000)
Subject: 6to4: provide "adv_preferred_lifetime" and "adv_valid_lifetime" options to control... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4b362b98bbd839c045dfb3b5f7972636c5ce4ae4;p=openwrt%2Fstaging%2Fblocktrron.git

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

SVN-Revision: 27650
---

diff --git a/package/6to4/Makefile b/package/6to4/Makefile
index f4831a4905..14c9f2227d 100644
--- a/package/6to4/Makefile
+++ b/package/6to4/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
-PKG_VERSION:=5
-PKG_RELEASE:=2
+PKG_VERSION:=6
+PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/6to4/files/6to4.sh b/package/6to4/files/6to4.sh
index b8baa1510d..5505d06c55 100755
--- a/package/6to4/files/6to4.sh
+++ b/package/6to4/files/6to4.sh
@@ -64,6 +64,8 @@ set_6to4_radvd_prefix() {
 	local lanif="${2:-lan}"
 	local wanif="${3:-wan}"
 	local prefix="${4:-0:0:0:1::/64}"
+	local vlt="${5:-300}"
+	local plt="${6:-120}"
 	local pfxsection=""
 
 	find_pfxsection() {
@@ -88,8 +90,8 @@ set_6to4_radvd_prefix() {
 		uci_set_state radvd "$pfxsection" prefix               "$prefix"
 		uci_set_state radvd "$pfxsection" AdvOnLink            1
 		uci_set_state radvd "$pfxsection" AdvAutonomous        1
-		uci_set_state radvd "$pfxsection" AdvValidLifetime     300
-		uci_set_state radvd "$pfxsection" AdvPreferredLifetime 120
+		uci_set_state radvd "$pfxsection" AdvValidLifetime     "$vlt"
+		uci_set_state radvd "$pfxsection" AdvPreferredLifetime "$plt"
 		uci_set_state radvd "$pfxsection" Base6to4Interface    "$wanif"
 	}
 }
@@ -200,6 +202,10 @@ setup_interface_6to4() {
 				config_get adv_ifname "${adv_interface:-lan}" ifname
 
 				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)"
 
 					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_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_subnet=$(($adv_subnet + 1))