[Feature][T106][task-view-1427] merge ZXW-ipv6 patch
Only Configure: No
Affected branch: master
Affected module: unknow
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: yes
Doc Update: no
Change-Id: I6830bffdff648e9aba4f31c05616a0c8a609961d
diff --git a/ap/app/Script/scripts/psext_down_ipv6.sh b/ap/app/Script/scripts/psext_down_ipv6.sh
index c738a77..9c32c71 100755
--- a/ap/app/Script/scripts/psext_down_ipv6.sh
+++ b/ap/app/Script/scripts/psext_down_ipv6.sh
@@ -3,7 +3,7 @@
if [ "$test_log" == "" ]; then
test_log=`nv get path_log`"te.log"
fi
-echo "Info: psext_updown_ipv6.sh $ps_if $eth_if $br_if start" >> $test_log
+echo "Info: psext_down_ipv6.sh $1 start" >> $test_log
c_id=$1
ps_if=`nv get pswan`$c_id
@@ -15,7 +15,7 @@
{
br_ip=`nv get $br_if"_ipv6_ip"`
ps_ip=`nv get $ps_if"_ipv6_ip"`
- pdp_ip=`nv get ipv6_wan_ipaddr`
+ pdp_ip=`nv get $ps_if"_ipv6_pdp"`
ip6tables -t filter -D FORWARD -p icmpv6 --icmpv6-type 135 -j DROP
@@ -67,7 +67,7 @@
nv set $ps_if"_dhcpv6_end"="::"
#适配页面等其他地方使用老NV
- nv set ipv6_wan_ipaddr="::"
+ nv set $ps_if"_ipv6_pdp"="::"
nv set $ps_if"_ipv6_state"="dead"
local_ipv6_addr_nv="$ps_if""_local_ipv6_addr"
diff --git a/ap/app/Script/scripts/psext_updown_ipv6.sh b/ap/app/Script/scripts/psext_updown_ipv6.sh
index 06bee36..9207f11 100755
--- a/ap/app/Script/scripts/psext_updown_ipv6.sh
+++ b/ap/app/Script/scripts/psext_updown_ipv6.sh
@@ -142,7 +142,7 @@
#pdp 激活的ipv6地址
pdp_ip=$prefix_info_temp$interface_id_temp
#pdp激活地址，适配页面使用
- nv set ipv6_wan_ipaddr="$pdp_ip"
+ nv set $ps_if"_ipv6_pdp"="$pdp_ip"
ipv6_addr_conver $pdp_ip "$ps_if"
@@ -364,7 +364,7 @@
{
br_ip=`nv get $br_if"_ipv6_ip"`
ps_ip=`nv get $ps_if"_ipv6_ip"`
- pdp_ip=`nv get ipv6_wan_ipaddr`
+ pdp_ip=`nv get $ps_if"_ipv6_pdp"`
ip6tables -t filter -D FORWARD -p icmpv6 --icmpv6-type 135 -j DROP
@@ -416,7 +416,7 @@
nv set $ps_if"_dhcpv6_end"="::"
#适配页面等其他地方使用老NV
- nv set ipv6_wan_ipaddr="::"
+ nv set $ps_if"_ipv6_pdp"="::"
nv set $ps_if"_ipv6_state"="dead"
local_ipv6_addr_nv="$ps_if""_local_ipv6_addr"