[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/interface5.0/zte_web_wan.c b/ap/app/goahead/interface5.0/zte_web_wan.c
index 4004b7f..9795296 100755
--- a/ap/app/goahead/interface5.0/zte_web_wan.c
+++ b/ap/app/goahead/interface5.0/zte_web_wan.c
@@ -168,13 +168,13 @@
return;
}
slog(MISC_PRINT, SLOG_NORMAL, T("UFIx User set network %s!\n"), pMccmnc);
- slog(MISC_PRINT, SLOG_DEBUG,"LPC: zte_wan_set_network, pSubType = %s \n", pSubType);
+ slog(MISC_PRINT, SLOG_DEBUG,"LPC: wan_set_network, pSubType = %s \n", pSubType);
(void)zte_web_read("current_rat", curNetType); //0:2G; 2:3G
(void)zte_web_read("str_num_rplmn", curMccmnc);
(void)zte_web_read("current_subrat", curSubType);
if ((0 == strcmp(pMccmnc, curMccmnc)) && (0 == strcmp(pNetType, curNetType)) && (0 == strcmp(pSubType, curSubType))) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_wan_set_network: to set network is equal to registered network."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "wan_set_network: to set network is equal to registered network."); /*lint !e26*/
(void)zte_web_write("manual_netsel_flag", "1");
} else {
(void)zte_web_write("manual_netsel_flag", "");
@@ -183,7 +183,7 @@
(void)zte_web_write("current_rat_tmp", pNetType);
(void)zte_web_write("str_num_rplmn_tmp", pMccmnc);
(void)zte_web_write("current_subrat_tmp", pSubType);
- //slog(MISC_PRINT,SLOG_DEBUG, "zte_wan_set_network send message:ZUFI_MODULE_ID_AT_MAIN MSG_CMD_SET_NETWORK.");
+ //slog(MISC_PRINT,SLOG_DEBUG, "wan_set_network send message:ZUFI_MODULE_ID_AT_MAIN MSG_CMD_SET_NETWORK.");
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NETWORK_SET_REQ, 0, NULL, 0);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -322,7 +322,7 @@
usleep(200000);
}
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wan_network_select: net_select_result = %s \n", select_result);
+ slog(MISC_PRINT, SLOG_DEBUG,"wan_network_select: net_select_result = %s \n", select_result);
if (strcmp("sucess", select_result) == 0) {
zte_write_result_to_web(wp, SUCCESS);
} else {
@@ -347,7 +347,7 @@
slog(MISC_PRINT, SLOG_NORMAL, T("UFIx User scan network!\n"));
(void)zte_web_write("net_select_mode", "manual_select");
- slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_scan_network send message ZUFI_MODULE_ID_AT_MAIN,MSG_CMD_WEB_REQ_NET_SELECT");
+ slog(MISC_PRINT, SLOG_NORMAL, "wan_scan_network send message ZUFI_MODULE_ID_AT_MAIN,MSG_CMD_WEB_REQ_NET_SELECT");
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_NET_SELECT_REQ, 0, NULL, 0);
(void)zte_web_write("m_netselect_status", "manual_selecting");
zte_write_result_to_web(wp, SUCCESS);
@@ -887,7 +887,7 @@
(void)zte_web_write("duraConTime_before_time_modify", "0");
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MMI, MSG_CMD_TRAFFIC_INFO_RESET, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_data_statistics_clear_process: send ZTE_CURR_TOTAL_WIFI_DATA to mc success."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "wan_data_statistics_clear_process: send CURR_TOTAL_WIFI_DATA to mc success."); /*lint !e26*/
zte_write_result_to_web(wp, SUCCESS);
}
@@ -968,7 +968,7 @@
APN_PROFILE newProfile;
zte_web_write("apn_mode", ZTE_WEB_ACT_AUTO);
memset(&newProfile, 0, sizeof(newProfile));
- slog(MISC_PRINT, SLOG_NORMAL,"LPC: zte_wan_auto_apn_set enter! \n");
+ slog(MISC_PRINT, SLOG_NORMAL,"LPC: wan_auto_apn_set enter! \n");
get_autoapn_profile(&newProfile);
set_apn_to_cfg(&newProfile);
//send message to MainControl to infrom modify apn
@@ -1085,7 +1085,7 @@
p_data = websGetVar(wp, T("calibration_way"), NULL);
- slog(MISC_PRINT, SLOG_NORMAL,"zte_wan_data_flow_calibration_manual calibration_way = %s\n", p_data);
+ slog(MISC_PRINT, SLOG_NORMAL,"wan_data_flow_calibration_manual calibration_way = %s\n", p_data);
if (p_data == NULL) {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -1097,7 +1097,7 @@
time = atof(p_data);
sprintf(buf, "%ld", (long)(time * 60 * 60));
sc_cfg_set("monthly_time", buf);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wan_data_flow_calibration_manual time:value = %f, buf = %s\n", time, buf);
+ slog(MISC_PRINT, SLOG_DEBUG,"wan_data_flow_calibration_manual time:value = %f, buf = %s\n", time, buf);
zte_write_result_to_web(wp, SUCCESS);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MMI, MSG_CMD_TRAFFIC_INFO_RESET, 0, NULL, 0);
return;
@@ -1115,7 +1115,7 @@
{
slog(MISC_PRINT, SLOG_ERR,"strtoll errno %d: %s\n", errno, strerror(errno));
}
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wan_data_flow_calibration_manual data:111 data = %lld, %lld\n", data, ret_strtoll);
+ slog(MISC_PRINT, SLOG_DEBUG,"wan_data_flow_calibration_manual data:111 data = %lld, %lld\n", data, ret_strtoll);
sprintf(buf, "%lld", data);
sc_cfg_set("monthly_tx_bytes", "0");
sc_cfg_set("monthly_rx_bytes", buf);