[Feature][ZXW-41] merged 0601 version
Change-Id: I667af6bb09d65581d455b73f8984c160b2c67ad8
diff --git a/ap/app/Script/scripts/defwan_set.sh b/ap/app/Script/scripts/defwan_set.sh
index bac6f8f..40386c8 100644
--- a/ap/app/Script/scripts/defwan_set.sh
+++ b/ap/app/Script/scripts/defwan_set.sh
@@ -35,7 +35,7 @@
if [ "-$ipaddr_type" == "-IPv4" -o "-$ipaddr_type" == "-IPv4v6" -o "-$ipaddr_type" == "-IPV4V6" -o "-$ipaddr_type" == "-" ];then
#ÉèÖÃIPv4µÄĬÈÏÍø¹Ø
route del default
- Flag=`route | grep -w "default"`
+ Flag=`ip route | grep -w "default"`
if [ "-$Flag" != "-" ];then
echo "Error: route del default failed." >> $test_log
fi
diff --git a/ap/app/Script/scripts/ppp_updown.sh b/ap/app/Script/scripts/ppp_updown.sh
index 7425a33..f36ea86 100755
--- a/ap/app/Script/scripts/ppp_updown.sh
+++ b/ap/app/Script/scripts/ppp_updown.sh
@@ -95,7 +95,7 @@
#±¾µØÍøÂçÅäÖÃ
iptables -t nat -I POSTROUTING -s $ps_ip -o $ps_if -j SNAT --to $pdp_ip
- route_info=`route|grep default`
+ route_info=`ip route|grep default`
if [ "$route_info" == "" ];then
route add default dev $ps_if
diff --git a/ap/app/Script/scripts/psext_up.sh b/ap/app/Script/scripts/psext_up.sh
index ecd67ba..7a51bbf 100755
--- a/ap/app/Script/scripts/psext_up.sh
+++ b/ap/app/Script/scripts/psext_up.sh
@@ -46,7 +46,7 @@
echo "Error: ifconfig $ps_if $ps_ip up failed." >> $test_log
fi
nv set default_wan_rel=$ps_if
- nv set default_cid=$c_id
+ #nv set default_cid=$c_id
nv set $ext_br"_ip"=$br_ip
ifconfig $ext_br $br_ip 2>>$test_log
if [ $? -ne 0 ];then
@@ -76,7 +76,7 @@
#±¾µØÍøÂçÅäÖÃ
iptables -t nat -I POSTROUTING -s $ps_ip -o $ps_if -j SNAT --to $pdp_ip
- route_info=`route|grep default`
+ route_info=`ip route|grep default`
if [ "$route_info" == "" ];then
route add default dev $ps_if
diff --git a/ap/app/Script/scripts/psext_updown.sh b/ap/app/Script/scripts/psext_updown.sh
index 7723f5b..890a6f1 100755
--- a/ap/app/Script/scripts/psext_updown.sh
+++ b/ap/app/Script/scripts/psext_updown.sh
@@ -282,7 +282,7 @@
echo "Error: ifconfig $ps_if $ps_ip up failed." >> $test_log
fi
nv set default_wan_rel=$ps_if
- nv set default_cid=$c_id
+ #nv set default_cid=$c_id
nv set $ext_br"_ip"=$br_ip
ifconfig $ext_br $br_ip 2>>$test_log
if [ $? -ne 0 ];then
@@ -312,7 +312,7 @@
#±¾µØÍøÂçÅäÖÃ
iptables -t nat -I POSTROUTING -s $ps_ip -o $ps_if -j SNAT --to $pdp_ip
- route_info=`route|grep default`
+ route_info=`ip route|grep default`
if [ "$route_info" == "" ];then
route add default dev $ps_if
diff --git a/ap/app/Script/scripts/wan_ipv6.sh b/ap/app/Script/scripts/wan_ipv6.sh
index d7045caa..3f4330f 100755
--- a/ap/app/Script/scripts/wan_ipv6.sh
+++ b/ap/app/Script/scripts/wan_ipv6.sh
@@ -328,7 +328,7 @@
#if [ $? -ne 0 ];then
#echo "Error: ip -6 rule del from $wan_addr table $rt_num failed." >> $test_log
#fi
- if [ -n "$default_gw_addr_temp" ] ; then
+ if [ -n "$default_gw_addr_temp" ] && [ "-$default_gw_addr_temp" != "-::" ] ; then
ip -6 route del default via $default_gw_addr_temp dev $wan_if table $rt_num
#if [ $? -ne 0 ];then
#echo "Error: ip -6 route del default via $default_gw_addr_temp dev $wan_if table $rt_num failed." >> $test_log