[Bugfix][T106BUG-469]Fix the bug of probability datacall fail
Only Configure: No
Affected branch: master
Affected module: data
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No
Change-Id: I68fe76cab5fda1061a259ded31de2b6d2c4e6071
diff --git a/ap/app/Script/scripts/wan_ipv4.sh b/ap/app/Script/scripts/wan_ipv4.sh
index 7c0ba39..95b5203 100755
--- a/ap/app/Script/scripts/wan_ipv4.sh
+++ b/ap/app/Script/scripts/wan_ipv4.sh
@@ -116,11 +116,11 @@
pswan_secdns=`nv get $wan_if"_secdns"`
pswan_nm=`nv get $wan_if"_nm"`
- #ifconfig $wan_if down 2>>$test_log
- ifconfig $wan_if $pswan_ip netmask 255.255.255.0 up 2>>$test_log
- if [ $? -ne 0 ];then
- echo "Error: ifconfig $wan_if $pswan_ip up failed." >> $test_log
- fi
+# #ifconfig $wan_if down 2>>$test_log
+# ifconfig $wan_if $pswan_ip netmask 255.255.255.0 up 2>>$test_log
+# if [ $? -ne 0 ];then
+# echo "Error: ifconfig $wan_if $pswan_ip up failed." >> $test_log
+# fi
pswan_pri=`nv get pswan_priority`
rt_num=`expr $pswan_pri \* 10 + $c_id`
@@ -296,4 +296,4 @@
tc_tbf.sh down $def_cid
fi
linkdown $2 $3
-fi
\ No newline at end of file
+fi
diff --git a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
index 36ec590..7e853a8 100755
--- a/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
+++ b/ap/app/zte_comm/zte_mainctrl/netdev_proc.c
@@ -686,6 +686,7 @@
scriptmsg.cid = cid;
scriptmsg.iptype = iptype;
char buffer[128] = {0};
+ char nv_value[16] = {0};
slog(NET_PRINT, SLOG_NORMAL, "$$$$$net_sendmsg_2_atctl cid=%d,iptype=%d\n", cid, iptype);
ret = ipc_send_message(MODULE_ID_MAIN_CTRL, MODULE_ID_AT_CTL, cmd, sizeof(TScriptMSG), &scriptmsg, 0);
@@ -693,10 +694,18 @@
softap_assert("send msg to at_ctl error");
}
snprintf(buffer, sizeof(buffer), "pdp_act_state_%d", cid);
- if(cmd == MSG_CMD_LINKUP_END)
- sc_cfg_set(buffer, "act");
- else if(cmd == MSG_CMD_LINKDOWN_END)
- sc_cfg_set(buffer, "deact");
+ sc_cfg_get(buffer, nv_value, sizeof(nv_value)-1);
+ if(cmd == MSG_CMD_LINKUP_END){
+ if(strcmp(nv_value,"acting") == 0)
+ sc_cfg_set(buffer, "act");
+ else
+ slog(NET_PRINT, SLOG_ERR, "$$$$$net_sendmsg_2_atctl_up 5s=%s\n", buffer, nv_value);
+ }else if(cmd == MSG_CMD_LINKDOWN_END){
+ if(strcmp(nv_value,"deacting") == 0)
+ sc_cfg_set(buffer, "deact");
+ else
+ slog(NET_PRINT, SLOG_ERR, "$$$$$net_sendmsg_2_atctl_down %s=%s\n", buffer, nv_value);
+ }
}
void pdp_wan_config_quick(struct pdp_active_info *actinfo, char *prefix, int prefix_len)