[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
diff --git a/ap/app/goahead/interface5.0/net/zte_web_net_lan.c b/ap/app/goahead/interface5.0/net/zte_web_net_lan.c
index 7b82e59..d98cead 100644
--- a/ap/app/goahead/interface5.0/net/zte_web_net_lan.c
+++ b/ap/app/goahead/interface5.0/net/zte_web_net_lan.c
@@ -352,9 +352,9 @@
break;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_set_bind_static_address SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "set_bind_static_address SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_BIND_STATIC_ADDRESS, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_set_bind_static_address SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "set_bind_static_address SEND MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
}
@@ -380,9 +380,9 @@
strncpy(static_macip_info.mac, mac,sizeof(static_macip_info.mac)-1);
strncpy(static_macip_info.ip, ip,sizeof(static_macip_info.ip)-1);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_bind_static_address_add SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "bind_static_address_add SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_BIND_STATIC_ADDRESS_ADD, sizeof(struct static_macip_info), (UCHAR *)&static_macip_info, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_bind_static_address_add SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "bind_static_address_add SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -397,9 +397,9 @@
return;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_bind_static_address_del SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "bind_static_address_del SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_BIND_STATIC_ADDRESS_DEL, strlen(mac), (UCHAR *)mac, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_bind_static_address_del SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "bind_static_address_del SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -660,9 +660,9 @@
#endif
free_dhcp_list(&dhcp_info_list);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_add_children_device SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "add_children_device SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_ADD_CHILDREN_DEVICE, sizeof(struct mac_hostname_info), (UCHAR *)&mac_hostname_info, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_add_children_device SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "add_children_device SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -677,9 +677,9 @@
return;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_del_children_device SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "del_children_device SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_DEL_CHILDREN_DEVICE, strlen(mac), (UCHAR *)mac, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_del_children_device SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "del_children_device SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -692,7 +692,7 @@
name = websGetVar(wp, T("name"), T(""));
site = websGetVar(wp, T("site"), T(""));
- slog(NET_PRINT, SLOG_DEBUG, "zte_add_white_site:name= %s, site = %s\n", name, site);
+ slog(NET_PRINT, SLOG_DEBUG, "add_white_site:name= %s, site = %s\n", name, site);
if (!name) {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -705,9 +705,9 @@
strncpy(white_site.name, name, sizeof(white_site.name)-1);
strncpy(white_site.site, site, sizeof(white_site.site)-1);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_add_white_site SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "add_white_site SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_ADD_WHITE_SITE, sizeof(struct white_site_info), (UCHAR *)&white_site, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_add_white_site SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "add_white_site SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -722,16 +722,16 @@
return;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_remove_white_site SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "remove_white_site SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_REMOVE_WHITE_SITE, strlen(ids), (UCHAR *)ids, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_remove_white_site SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "remove_white_site SEND MESSAGE TO MC END"); /*lint !e26*/
Sleep(1);
zte_write_result_to_web(wp, SUCCESS);
}
void zte_get_children_device_list(webs_t wp)
{
- slog(NET_PRINT, SLOG_NORMAL, "zte_get_children_device_list start!\n");
+ slog(NET_PRINT, SLOG_NORMAL, "get_children_device_list start!\n");
FILE *chilren_device_file = NULL;
char line[200] = {0};
char mac[18] = {0};
@@ -783,7 +783,7 @@
void zte_get_white_site_list(webs_t wp)
{
- slog(NET_PRINT, SLOG_ERR, "zte_get_white_site_list start!\n");
+ slog(NET_PRINT, SLOG_ERR, "get_white_site_list start!\n");
FILE *white_site_file = NULL;
char line[600] = {0};
unsigned int id = 1;
@@ -853,7 +853,7 @@
char_t *dev_name = NULL;
LAN_INFO_t lan_info;
- slog(MISC_PRINT, SLOG_NORMAL, "zte_get_lan_dev_info enter \n");
+ slog(MISC_PRINT, SLOG_NORMAL, "get_lan_dev_info enter \n");
//ÏȽèÓÿª»úʱ¼ä°Ñ¿ò¼Ü´îºÃ, elseµÄÆ´½ÓÓÐÎÊÌ⣬ÔÝʱ²»Ìṩwebserver¸ø¿Í»§£¬
//´Ë¹¦ÄÜÓëstation_list/wifi_station_list¹¦ÄÜÓÐÖصþ£¬ºóÐøÓÅ»¯³ÉͳһµÄ
#if 1
@@ -865,10 +865,10 @@
zte_rest_cmd_write_head(wp);
zte_rest_cmd_write_int(wp, "poweron_time", cur_time, 0);
zte_rest_cmd_write_foot(wp);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_get_lan_dev_info cur_time:%lu \n", cur_time);
+ slog(MISC_PRINT, SLOG_DEBUG,"get_lan_dev_info cur_time:%lu \n", cur_time);
#else
dev_name = websGetVar(wp, "dev_name", T(""));
- printf(LOG_INFO, "zte_get_lan_dev_info dev:%s \n", dev_name);
+ printf(LOG_INFO, "get_lan_dev_info dev:%s \n", dev_name);
if ('\0' == (*dev_name)) {
return;
}
@@ -876,8 +876,8 @@
if (get_laninfo_byname(dev_name, &lan_info) == -1)
return;
- printf(LOG_INFO, "zte_get_lan_dev_info mac:%02x:%02x:%02x:%02x:%02x:%02x \n", lan_info.mac[0], lan_info.mac[1], lan_info.mac[2], lan_info.mac[3], lan_info.mac[4], lan_info.mac[5]);
- printf(LOG_INFO, "zte_get_lan_dev_info ip:%lu, host:%s, dev:%s, remain:%d, last:%d \n", lan_info.ip, lan_info.host_name, lan_info.dev_name, lan_info.time_remain, lan_info.time_last);
+ printf(LOG_INFO, "get_lan_dev_info mac:%02x:%02x:%02x:%02x:%02x:%02x \n", lan_info.mac[0], lan_info.mac[1], lan_info.mac[2], lan_info.mac[3], lan_info.mac[4], lan_info.mac[5]);
+ printf(LOG_INFO, "get_lan_dev_info ip:%lu, host:%s, dev:%s, remain:%d, last:%d \n", lan_info.ip, lan_info.host_name, lan_info.dev_name, lan_info.time_remain, lan_info.time_last);
web_feedback_header(wp);
zte_rest_cmd_write_head(wp);
zte_rest_cmd_write_int(wp, "mac", lan_info.mac, 1);
diff --git a/ap/app/goahead/interface5.0/net/zte_web_net_other.c b/ap/app/goahead/interface5.0/net/zte_web_net_other.c
index de459aa..c1b6120 100755
--- a/ap/app/goahead/interface5.0/net/zte_web_net_other.c
+++ b/ap/app/goahead/interface5.0/net/zte_web_net_other.c
@@ -62,8 +62,8 @@
fclose(usb_mac_file);
}
- //printf("zte_is_usb_mac stored usbmac %x %x %x %x %x %x\n",usb_mac[0],usb_mac[1],usb_mac[2],usb_mac[3],usb_mac[4],usb_mac[5]);
- //printf("zte_is_usb_mac lease mac %x %x %x %x %x %x\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
+ //printf("is_usb_mac stored usbmac %x %x %x %x %x %x\n",usb_mac[0],usb_mac[1],usb_mac[2],usb_mac[3],usb_mac[4],usb_mac[5]);
+ //printf("is_usb_mac lease mac %x %x %x %x %x %x\n",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
for (i = 0; i < 6; i++) {
@@ -96,13 +96,13 @@
return;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mtu_set new_mtu= %s\n", new_mtu);
+ slog(MISC_PRINT, SLOG_DEBUG, "mtu_set new_mtu= %s\n", new_mtu);
(void)zte_web_write("mtu", new_mtu);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_mtu_set MESSAGE TO MC START");
+ slog(MISC_PRINT, SLOG_NORMAL, "mtu_set MESSAGE TO MC START");
//zte_send_message(MODULE_ID_MAIN_CTRL, MSG_CMD_NET_MTU, 0, 0);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_MTU, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mtu_set MESSAGE TO MC END");
+ slog(MISC_PRINT, SLOG_DEBUG, "mtu_set MESSAGE TO MC END");
//sc_cfg_save();
@@ -154,7 +154,7 @@
pswan_ipv6_pridns = websGetVar(wp, T("pswan_ipv6_pridns_manual"), T(""));
pswan_ipv6_secdns = websGetVar(wp, T("pswan_ipv6_secdns_manual"), T(""));
- printf("zte_dns_server_set: %s - %s - %s - %s \n", pswan_pridns, pswan_secdns, pswan_ipv6_pridns, pswan_ipv6_secdns);
+ printf("dns_server_set: %s - %s - %s - %s \n", pswan_pridns, pswan_secdns, pswan_ipv6_pridns, pswan_ipv6_secdns);
if ('\0' == (*pswan_pridns) && '\0' == (*pswan_secdns) && '\0' == (*pswan_ipv6_pridns) && '\0' == (*pswan_ipv6_secdns))
{
@@ -197,7 +197,7 @@
mac = websGetVar(wp, T("mac"), T(""));
hostname = websGetVar(wp, T("hostname"), T(""));
- slog(NET_PRINT, SLOG_ERR, "zte_edit_hostname:mac= %s, hostname = %s\n£¬len=%d", mac, hostname, strlen(hostname));
+ slog(NET_PRINT, SLOG_ERR, "edit_hostname:mac= %s, hostname = %s\n£¬len=%d", mac, hostname, strlen(hostname));
if ((strcmp(hostname, "") == 0) || (strlen(mac) != 17)) {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -206,10 +206,10 @@
strncpy(mac_hostname_info.mac, mac,sizeof(mac_hostname_info.mac)-1);
strncpy(mac_hostname_info.hostname, hostname,sizeof(mac_hostname_info.hostname)-1);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_edit_hostname MESSAGE TO MC START");
+ slog(MISC_PRINT, SLOG_NORMAL, "edit_hostname MESSAGE TO MC START");
//zte_send_message(MODULE_ID_MAIN_CTRL, MSG_CMD_NET_GET_HOSTNAME, sizeof(struct mac_hostname_info), (UCHAR *)&mac_hostname_info);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_GET_HOSTNAME, sizeof(struct mac_hostname_info), (UCHAR *)&mac_hostname_info, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_edit_hostname MESSAGE TO MC END");
+ slog(MISC_PRINT, SLOG_DEBUG, "edit_hostname MESSAGE TO MC END");
Sleep(2);
zte_write_result_to_web(wp, SUCCESS);
}
@@ -342,7 +342,7 @@
//means close , if time_limited is not null, means set
#if 0
if (time_limited == NULL || *time_limited == '\0') {
- printf("zte_parent_control_set: invalid input para\n");/*lint !e26*/
+ printf("parent_control_set: invalid input para\n");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -372,7 +372,7 @@
{
unsigned long cur_time;
- slog(MISC_PRINT, SLOG_NORMAL,"zte_get_poweron_time enter \n");
+ slog(MISC_PRINT, SLOG_NORMAL,"get_poweron_time enter \n");
cur_time = time_sec();
@@ -380,6 +380,6 @@
zte_rest_cmd_write_head(wp);
zte_rest_cmd_write_int(wp, "poweron_time", cur_time, 0);
zte_rest_cmd_write_foot(wp);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_get_poweron_time cur_time:%lu \n", cur_time);
+ slog(MISC_PRINT, SLOG_DEBUG,"get_poweron_time cur_time:%lu \n", cur_time);
}
diff --git a/ap/app/goahead/interface5.0/net/zte_web_net_wan.c b/ap/app/goahead/interface5.0/net/zte_web_net_wan.c
index 8cea5ac..6db0229 100755
--- a/ap/app/goahead/interface5.0/net/zte_web_net_wan.c
+++ b/ap/app/goahead/interface5.0/net/zte_web_net_wan.c
@@ -303,9 +303,9 @@
}
//zte_iptables_basic_setting();
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_basic_setting SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_basic_setting SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_fw_basic_setting SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "fw_basic_setting SEND MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
@@ -333,9 +333,9 @@
}
//zte_iptables_basic_setting();
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_forward_setting SEND MESSAGE TO MC START"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_forward_setting SEND MESSAGE TO MC START"); /*lint !e26*/
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FORWARD, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_fw_forward_setting SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "fw_forward_setting SEND MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
@@ -449,7 +449,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_ipport_filter_del SEND MESSAGE TO MC END");/*lint !e26*/ /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_ipport_filter_del SEND MESSAGE TO MC END");/*lint !e26*/ /*lint !e26*/
//sc_cfg_save();
//zte_response_json_for_test(wp,"zte_fw_ipport_filter_del","send message to mc");
@@ -528,7 +528,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FORWARD, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_port_forward_del SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_port_forward_del SEND MESSAGE TO MC END"); /*lint !e26*/
//zte_response_json_for_test(wp,"zte_fw_port_forward_del","send message to mc");
//sc_cfg_save();
@@ -629,7 +629,7 @@
char *portmap_enable = NULL; /* 0: Disabled 1: Enabled */
char portmap_original[2] = {0}; /* 0: Disabled 1: Enabled */
- slog(MISC_PRINT, SLOG_DEBUG, "enter zte_fw_port_map_add.\n");
+ slog(MISC_PRINT, SLOG_DEBUG, "enter fw_port_map_add.\n");
//port_map setting
portmap_enable = websGetVar(wp, T("portMapEnabled"), T("0"));
@@ -699,7 +699,7 @@
fw_port_map.comment);
(void)zte_web_write(PortMapRules_x, PortMapRules);
flag = 1;
- slog(MISC_PRINT, SLOG_DEBUG, "zte_fw_port_map_add %s: %s\n", PortMapRules_x, PortMapRules);
+ slog(MISC_PRINT, SLOG_DEBUG, "fw_port_map_add %s: %s\n", PortMapRules_x, PortMapRules);
break;
}
}
@@ -710,7 +710,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_MAPPING, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_port_map_add MESSAGE TO MC END\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_port_map_add MESSAGE TO MC END\n"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
@@ -728,7 +728,7 @@
int flag = 0;
delete_id = websGetVar(wp, "delete_id", "");
- slog(MISC_PRINT, SLOG_DEBUG, "zte_fw_port_map_del delete_id: %s\n", delete_id);
+ slog(MISC_PRINT, SLOG_DEBUG, "fw_port_map_del delete_id: %s\n", delete_id);
if (*delete_id == '\0') {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -787,7 +787,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_MAPPING, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_port_map_del SEND MESSAGE TO MC END\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_port_map_del SEND MESSAGE TO MC END\n"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
@@ -838,7 +838,7 @@
//zte_iptables_Webs_Filter_Run();
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_URL_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_goform_url_filter_add_process MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "goform_url_filter_add_process MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
@@ -922,7 +922,7 @@
sc_cfg_set("websURLFilters", rules);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_URL_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_goform_url_filter_delete_process MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "goform_url_filter_delete_process MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
@@ -962,7 +962,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_DMZ, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_dmz SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_dmz SEND MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
@@ -978,7 +978,7 @@
&& 0 == strlen(fw_ipport_filter->dip_1)
&& 0 == strlen(fw_ipport_filter->sprf)
&& 0 == strlen(fw_ipport_filter->dprf)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_fw_ipport_filter_add -> No MAC/IP/Port input!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "fw_ipport_filter_add -> No MAC/IP/Port input!"); /*lint !e26*/
return -1;
}
@@ -991,7 +991,7 @@
if (strlen(fw_ipport_filter->sip_1)) {
if (0 == strcmp(ip_version, IP_VERSION_V4)) {
if (!isIpNetmaskValid(fw_ipport_filter->sip_1)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_fw_ipport_filter_add -> src ip is invalid:[%s]", fw_ipport_filter->sip_1); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "fw_ipport_filter_add -> src ip is invalid:[%s]", fw_ipport_filter->sip_1); /*lint !e26*/
return -1;
}
}
@@ -1003,7 +1003,7 @@
if (strlen(fw_ipport_filter->dip_1)) {
if (0 == strcmp(ip_version, IP_VERSION_V4)) {
if (!isIpNetmaskValid(fw_ipport_filter->dip_1)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_fw_ipport_filter_add -> dest ip is invalid:[%s]", fw_ipport_filter->dip_1); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "fw_ipport_filter_add -> dest ip is invalid:[%s]", fw_ipport_filter->dip_1); /*lint !e26*/
return -1;
}
}
@@ -1150,7 +1150,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_ipport_filter_add_v4 SEND MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_ipport_filter_add_v4 SEND MESSAGE TO MC END"); /*lint !e26*/
//zte_response_json_for_test(wp,"zte_fw_ipport_filter_add","send message to mc");
//sc_cfg_save();
@@ -1207,7 +1207,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FILTER, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_ipport_filter_add_v6 MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_ipport_filter_add_v6 MESSAGE TO MC END"); /*lint !e26*/
//zte_response_json_for_test(wp,"zte_fw_ipport_filter_add","send message to mc");
@@ -1348,7 +1348,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_IPPORT_FORWARD, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_port_forward_add MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_port_forward_add MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
}
@@ -1534,7 +1534,7 @@
}
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_NET_UPNP, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_fw_upnp_set MESSAGE TO MC END"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "fw_upnp_set MESSAGE TO MC END"); /*lint !e26*/
//sc_cfg_save();
zte_write_result_to_web(wp, SUCCESS);
}
@@ -1757,7 +1757,7 @@
zte_write_result_to_web(wp, FAILURE);
} else {
zte_write_result_to_web(wp, SUCCESS);
- slog(MISC_PRINT, SLOG_NORMAL,"zte_goform_set_operation_mode: send MSG_CMD_RESTART_REQUEST\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"goform_set_operation_mode: send MSG_CMD_RESTART_REQUEST\n");
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_RESTART_REQUEST, 0, NULL, 0);
}
}
diff --git a/ap/app/goahead/interface5.0/other/zte_web_traffic.c b/ap/app/goahead/interface5.0/other/zte_web_traffic.c
index e476ad1..7c19aa1 100755
--- a/ap/app/goahead/interface5.0/other/zte_web_traffic.c
+++ b/ap/app/goahead/interface5.0/other/zte_web_traffic.c
@@ -156,14 +156,14 @@
//ptm = localtime(&now_time);
localtime_r(&now_time, &ptm);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic]zte_traffic_set_end_time:Y->%d;M->%d;D->%d\n", ptm.tm_year, ptm.tm_mon, ptm.tm_mday);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic]traffic_set_end_time:Y->%d;M->%d;D->%d\n", ptm.tm_year, ptm.tm_mon, ptm.tm_mday);
//if(ptm != NULL)
{
snprintf(buf,50, "%d-%02d-%02d_%02d:%02d:%02d", ptm.tm_year + 1900, ptm.tm_mon + 1, ptm.tm_mday, ptm.tm_hour, ptm.tm_min, ptm.tm_sec);
sc_cfg_set(NV_TRAFFIC_END_TIME, buf);
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_set_end_time = %s\n", buf);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_set_end_time = %s\n", buf);
}
void zte_traffic_set_process_result(int result)
@@ -173,10 +173,10 @@
if (result == TRAFFIC_RESULT_FAIL) {
sc_cfg_set(NV_TRAFFIC_RESULT, "failure");
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_set_process_result = fail \r\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_set_process_result = fail \r\n");
} else {
sc_cfg_set(NV_TRAFFIC_RESULT, "success");
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_set_process_result = success \r\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_set_process_result = success \r\n");
}
time(&now_time);//ÒÔÃëΪµ¥Î»
@@ -302,7 +302,7 @@
{
int i = 0;
int flag = 0;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_isdigit....srcStr =%s \n", srcStr);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_isdigit....srcStr =%s \n", srcStr);
for (i = 0; i < len; i++) {
if (srcStr[i] >= '0' && srcStr[i] <= '9') {
continue;
@@ -313,9 +313,9 @@
}
if (flag == 0) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_isdigit....content_length is digit \n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_isdigit....content_length is digit \n");
} else {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_isdigit....content_length is not digit, error!!!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_isdigit....content_length is not digit, error!!!\n");
}
return flag;
}
@@ -344,15 +344,15 @@
return TRAFFIC_RESULT_FAIL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_parse_content....content_length = %s \n", content_length);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_parse_content....content_length = %s \n", content_length);
p1 = strchr(srcStr, '{');
if (p1 == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_parse_content....not correct ,no { ,fail, return \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_parse_content....not correct ,no { ,fail, return \n");
return TRAFFIC_RESULT_FAIL;
}
int tmplen = atoi(content_length);
if (tmplen >= max_len) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_parse_content....content_length > max_len size\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_parse_content....content_length > max_len size\n");
memcpy(content, p1, max_len - 1);
} else {
memcpy(content, p1, tmplen);
@@ -360,19 +360,19 @@
} else {
p1 = strchr(srcStr, '{');
if (p1 == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_parse_content....not Content-Length and no { ,fail, return \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_parse_content....not Content-Length and no { ,fail, return \n");
return TRAFFIC_RESULT_FAIL;
}
p2 = strrchr(srcStr, '}');
if (p2 == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_parse_content....not Content-Length and no } ,fail, return \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_parse_content....not Content-Length and no } ,fail, return \n");
return TRAFFIC_RESULT_FAIL;
}
len = p2 - p1 + 1;
if (len >= max_len) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_parse_content....len > max_len size\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_parse_content....len > max_len size\n");
memcpy(content, p1, max_len - 1);
} else {
memcpy(content, p1, len);
@@ -423,7 +423,7 @@
return TRAFFIC_RESULT_FAIL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_parse_response_state....state = %s \n", state);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_parse_response_state....state = %s \n", state);
return atoi(state);
}
@@ -446,7 +446,7 @@
if (type == 1) {
sc_cfg_get("sim_imsi", (request->imsi), sizeof(request->imsi));
sc_cfg_get("cr_version", (request->version), sizeof(request->version));
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_get_request_param, imsi = %s, version=%s \n", request->imsi, request->version);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_get_request_param, imsi = %s, version=%s \n", request->imsi, request->version);
}
}
@@ -533,13 +533,13 @@
memset(&traffic_first_parse, 0, sizeof(TRAFFIC_FIRST_PARSE));
root = cJSON_Parse(srcStr);
if (root == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. zte_traffic_first_parse_json, root == NULL fail \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. traffic_first_parse_json, root == NULL fail \n");
return TRAFFIC_RESULT_FAIL;
}
object = cJSON_GetObjectItem(root, "traffic_code");
if (object == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. zte_traffic_first_parse_json, traffic_code == NULL fail \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. traffic_first_parse_json, traffic_code == NULL fail \n");
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -547,7 +547,7 @@
object = cJSON_GetObjectItem(root, "traffic_number");
if (object == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. zte_traffic_first_parse_json, traffic_number == NULL fail \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] first.. traffic_first_parse_json, traffic_number == NULL fail \n");
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -556,11 +556,11 @@
traffic_first_parse.traffic_code[19]=0;
traffic_first_parse.traffic_number[19]=0;
if (strlen(traffic_first_parse.traffic_code) == 0 || strlen(traffic_first_parse.traffic_number) == 0) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_web_traffic_parse_json_first...invalid data fail \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] web_traffic_parse_json_first...invalid data fail \n");
return TRAFFIC_RESULT_FAIL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_parse_json_first....traffic_code = %s \n", traffic_first_parse.traffic_code);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_parse_json_first....traffic_number = %s \n", traffic_first_parse.traffic_number);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_parse_json_first....traffic_code = %s \n", traffic_first_parse.traffic_code);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_parse_json_first....traffic_number = %s \n", traffic_first_parse.traffic_number);
return TRAFFIC_RESULT_OK;
}
@@ -583,22 +583,22 @@
if (state == 302) {
if (g_traffic_302reponse_retry_count < TRAFFIC_MAX_REQUEST) {
g_traffic_302reponse_retry_count ++;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_first_parse_response..state = 302, retry_count = %d, continue\n", g_traffic_302reponse_retry_count);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_first_parse_response..state = 302, retry_count = %d, continue\n", g_traffic_302reponse_retry_count);
return TRAFFIC_RESULT_CONTINUE;
}
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_first_parse_response..state = %d, fail\n", state);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_first_parse_response..state = %d, fail\n", state);
return TRAFFIC_RESULT_FAIL;
}
state = zte_traffic_parse_response_content(srcStr, &data, sizeof(data));
if (state == TRAFFIC_RESULT_FAIL) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_first_parse_response..parse_content fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_first_parse_response..parse_content fail\n");
return TRAFFIC_RESULT_FAIL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_first_parse_response....data = %s \n", data);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_first_parse_response....data = %s \n", data);
return zte_traffic_first_parse_json(&data);
}
@@ -791,11 +791,11 @@
month_used = 0;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_calculate_offset used = %lld\n", used);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_calculate_offset used = %lld\n", used);
offset = used - month_used;
sprintf(buf, "%lld", offset);
sc_cfg_set(NV_TRAFFIC_USED_OFFSET_DATA, buf);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_calculate_offset offset = %s\n", buf);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_calculate_offset offset = %s\n", buf);
//zte_send_message(MODULE_ID_MMI,CB_MSG_MMI_TRAFFIC_INFO_RESET,0, NULL);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MMI, MSG_CMD_TRAFFIC_INFO_RESET, 0, NULL, 0);
}
@@ -898,12 +898,12 @@
sprintf(data, "%d", total);
sc_cfg_set(NV_DATA_TRAFFIC_MONTH_TOTAL, data);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_save_data total = %s\n", data);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_save_data total = %s\n", data);
memset(data, 0, sizeof(data));
sprintf(data, "%f", all_used);
sc_cfg_set(NV_DATA_TRAFFIC_MONTH_USED, data);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_save_data used = %s\n", data);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_save_data used = %s\n", data);
used = all_used * 1024 * 1024;
zte_traffic_calculate_offset(used);
@@ -931,13 +931,13 @@
memset(&traffic_second_parse, 0, sizeof(TRAFFIC_SECOND_PARSE));
root = cJSON_Parse(srcStr);
if (root == NULL) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. zte_traffic_second_parse_json, root == NULL fail \n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. traffic_second_parse_json, root == NULL fail \n");
return TRAFFIC_RESULT_FAIL;
}
object = cJSON_GetObjectItem(root, "code");
if (object == NULL) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. zte_traffic_second_parse_json, code == NULL fail \n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. traffic_second_parse_json, code == NULL fail \n");
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -945,7 +945,7 @@
traffic_second_parse.code[9]='\0';
object = cJSON_GetObjectItem(root, "msg");
if (object == NULL) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. zte_traffic_second_parse_json, msg == NULL fail\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. traffic_second_parse_json, msg == NULL fail\n");
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -956,7 +956,7 @@
slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second...msg = %s \n", traffic_second_parse.msg);
if (atoi(traffic_second_parse.code) != GET_TRAFFIC_SUCCESS) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. zte_traffic_second_parse_json, msg = %s ,not success\n", traffic_second_parse.msg);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. traffic_second_parse_json, msg = %s ,not success\n", traffic_second_parse.msg);
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -964,7 +964,7 @@
//for data
data = cJSON_GetObjectItem(root, "data");
if (data == NULL) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. zte_traffic_second_parse_json, data == NULL fail \n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] second.. traffic_second_parse_json, data == NULL fail \n");
cJSON_Delete(root);
return TRAFFIC_RESULT_FAIL;
}
@@ -1082,16 +1082,16 @@
state = zte_traffic_parse_response_state(srcStr);
if (state != 200) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_parse_response..state != 200 fail\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_parse_response..state != 200 fail\n");
return TRAFFIC_RESULT_FAIL;
}
state = zte_traffic_parse_response_content(srcStr, &data, sizeof(data));
if (state == TRAFFIC_RESULT_FAIL) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_parse_response..parse_content fail\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_parse_response..parse_content fail\n");
return TRAFFIC_RESULT_FAIL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_parse_response....data = %s \n", data);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_parse_response....data = %s \n", data);
return zte_traffic_second_parse_json(&data);
}
@@ -1120,7 +1120,7 @@
g_traffic_sms_body = NULL;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_get_request_data=============================== \n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_get_request_data=============================== \n");
zte_traffic_get_request_param(&request, 1);
@@ -1229,7 +1229,7 @@
if (count == 0) {
return;
}
- slog(MISC_PRINT, SLOG_DEBUG,"zte_traffic_delete_sms_after_process_over str_id = %s.\n", str_id);
+ slog(MISC_PRINT, SLOG_DEBUG,"traffic_delete_sms_after_process_over str_id = %s.\n", str_id);
rec_count = zte_traffic_parse_str_by_separator(str_id, (unsigned char *)rec_separate, 20, SEPARATOR_CHARACTER);
for (i = 0; i < rec_count; i++) {
@@ -1240,14 +1240,14 @@
}
del_req.id[i] = tmp_id;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic]zte_traffic_delete_sms_after_process_over: del_req.id[%d] = %d\n", i, del_req.id[i]);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic]traffic_delete_sms_after_process_over: del_req.id[%d] = %d\n", i, del_req.id[i]);
}
del_req.all_or_count = count;
if (ZTE_MC_OK_S == zte_mc_relay_sms_delete_msg((T_zUfiSms_DelReq*)(&del_req))) {
- slog(MISC_PRINT, SLOG_NORMAL,"[traffic]zte_traffic_delete_sms_after_process_over:send delete sms cmd to mc success.\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"[traffic]traffic_delete_sms_after_process_over:send delete sms cmd to mc success.\n");
} else {
- slog(MISC_PRINT, SLOG_ERR,"[traffic]zte_traffic_delete_sms_after_process_over:send delete sms cmd to mc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic]traffic_delete_sms_after_process_over:send delete sms cmd to mc fail.\n");
}
}
@@ -1257,12 +1257,12 @@
del_req.all_or_count = 1;
del_req.id[0] = id;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic]zte_traffic_delete_sms: id = %d\n", id);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic]traffic_delete_sms: id = %d\n", id);
if (ZTE_MC_OK_S == zte_mc_relay_sms_delete_msg((T_zUfiSms_DelReq*)(&del_req))) {
- slog(MISC_PRINT, SLOG_NORMAL,"[traffic]zte_traffic_delete_recv_sms:send delete sms cmd to mc success.\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"[traffic]traffic_delete_recv_sms:send delete sms cmd to mc success.\n");
} else {
- slog(MISC_PRINT, SLOG_ERR,"[traffic]zte_traffic_delete_recv_sms:send delete sms cmd to mc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic]traffic_delete_recv_sms:send delete sms cmd to mc fail.\n");
}
}
@@ -1279,18 +1279,18 @@
time(&now_time);
offset_time = now_time - g_traffic_last_time;
if (offset_time > 120 || offset_time < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_wait_to_recv_sms wait sms,time arrived, not recv whole sms , stop to recv, fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_wait_to_recv_sms wait sms,time arrived, not recv whole sms , stop to recv, fail\n");
return TRAFFIC_RESULT_FAIL;
}
sc_cfg_get(NV_TRAFFIC_RECV_SMS_ID, buf, sizeof(buf));
if (0 == strcmp(buf, "0")) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_wait_to_recv_sms wait sms contiue\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_wait_to_recv_sms wait sms contiue\n");
return TRAFFIC_RESULT_CONTINUE;
}
id = atol(buf);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_wait_to_recv_sms id=%ld\n", id);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_wait_to_recv_sms id=%ld\n", id);
if (id == 0) {
return TRAFFIC_RESULT_CONTINUE;
@@ -1303,7 +1303,7 @@
memset(g_traffic_sms_body, 0, sizeof(body_size));
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_wait_to_recv_sms id=%d \n", id);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_wait_to_recv_sms id=%d \n", id);
result = zte_libwms_get_traffic_sms_body(id, g_traffic_sms_body);
if (result != 0) {
return TRAFFIC_RESULT_FAIL;
@@ -1314,7 +1314,7 @@
//´Ë´¦Á¢¼´ÖÿÕÊÇÒòΪ±ÜÃâÔÚÿ´ÎÊÕ¶ÌÐÅʱºò¶¼Òª
//½øÐкÅÂëµÄ±È¶Ô
sc_cfg_set(NV_TRAFFIC_SMS_NUMBER, "0");
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_wait_to_recv_sms body=%s\n", g_traffic_sms_body);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_wait_to_recv_sms body=%s\n", g_traffic_sms_body);
return TRAFFIC_RESULT_OK;
}
@@ -1359,13 +1359,13 @@
time(&now_time);
offset_time = now_time - g_traffic_last_time;
if (offset_time > 60 || offset_time < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_send_sms wait sms, time arrived, stop to send sms, fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_send_sms wait sms, time arrived, stop to send sms, fail\n");
return TRAFFIC_RESULT_FAIL;
}
result = zte_traffic_check_can_send_sms();
if (result != TRAFFIC_RESULT_OK) {
- slog(MISC_PRINT, SLOG_ERR,"[traffic] zte_traffic_check_can_send_sms fail \n");
+ slog(MISC_PRINT, SLOG_ERR,"[traffic] traffic_check_can_send_sms fail \n");
return result;
}
@@ -1540,7 +1540,7 @@
zte_traffic_close_socket();
zte_traffic_delete_sms_after_process_over();
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_process, over====================!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_process, over====================!\n");
return;
}
@@ -1550,7 +1550,7 @@
pthread_t traffic_thread_id;
pthread_attr_t attr;
int result = 0;
- slog(MISC_PRINT, SLOG_NORMAL,"[traffic] zte_traffic_start--------!\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"[traffic] traffic_start--------!\n");
if (zte_traffic_get_process_state() != TRAFFIC_STATE_OVER) {
slog(MISC_PRINT, SLOG_DEBUG,"[traffic] already running, can not start now, fail!\n");
@@ -1581,7 +1581,7 @@
sc_cfg_get(NV_DATA_TRAFFIC_SWITCH, traffic_switch, sizeof(traffic_switch));
if (0 != strcmp(traffic_switch, "yes")) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check switch is off , can not start traffic, fail!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check switch is off , can not start traffic, fail!\n");
return TRAFFIC_NOT_ENABLE_SWITCH;
}
@@ -1592,7 +1592,7 @@
sc_cfg_get(NV_DATA_TRAFFIC_SIM_PROVINCE, province, sizeof(province));
if (0 == strlen(&province)) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check province fail!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check province fail!\n");
return TRAFFIC_NOT_SELECT_SIM_PROVINCE;
}
@@ -1609,7 +1609,7 @@
return TRAFFIC_NOT_ENOUGH_SMS_MEMORY;
}
sc_cfg_set("traffic_check", "yes");
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check SUCCESS!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check SUCCESS!\n");
return TRAFFIC_RESULT_OK;
}
@@ -1632,12 +1632,12 @@
interval_time = now_time - last_traffic_over_time;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_exceed_one_day_time, last_traffic_over_time = %d!\n", last_traffic_over_time);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_exceed_one_day_time, interval_time = %d!\n", interval_time);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_exceed_one_day_time, last_traffic_over_time = %d!\n", last_traffic_over_time);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_exceed_one_day_time, interval_time = %d!\n", interval_time);
//ÅжÏÉÏ´ÎУ׼½áÊøµÄʱ¼äÓ뵱ǰʱ¼äµÄ²î¾àÊÇ·ñ´óÓÚ1Ìì
if (interval_time >= TIME_ONE_DAY_INTERVAL || interval_time < 0) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_exceed_one_day_time, interval_time >= TIME_ONE_DAY_INTERVAL !\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_exceed_one_day_time, interval_time >= TIME_ONE_DAY_INTERVAL !\n");
result = 0;
}
@@ -1676,16 +1676,16 @@
// return -1;
//}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_same_day, last_traffic_ptm, tm_year = %d, tm_month=%d, tm_day=%d\n", last_traffic_ptm.tm_year, last_traffic_ptm.tm_mon, last_traffic_ptm.tm_mday);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_same_day, now_ptm, tm_year = %d, tm_month=%d, tm_day=%d\n", now_ptm.tm_year, now_ptm.tm_mon, now_ptm.tm_mday);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_same_day, last_traffic_ptm, tm_year = %d, tm_month=%d, tm_day=%d\n", last_traffic_ptm.tm_year, last_traffic_ptm.tm_mon, last_traffic_ptm.tm_mday);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_same_day, now_ptm, tm_year = %d, tm_month=%d, tm_day=%d\n", now_ptm.tm_year, now_ptm.tm_mon, now_ptm.tm_mday);
if ((now_ptm.tm_year == last_traffic_ptm.tm_year)
&& (now_ptm.tm_mon == last_traffic_ptm.tm_mon)
&& (now_ptm.tm_mday == last_traffic_ptm.tm_mday)) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_same_day, the same day, no need traffic when poweron!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_same_day, the same day, no need traffic when poweron!\n");
return -1;;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_web_traffic_check_if_same_day, not the same day,need traffic when poweron!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] web_traffic_check_if_same_day, not the same day,need traffic when poweron!\n");
return 0;
}
diff --git a/ap/app/goahead/interface5.0/other/zte_web_traffic_util.c b/ap/app/goahead/interface5.0/other/zte_web_traffic_util.c
index 696a569..007712f 100644
--- a/ap/app/goahead/interface5.0/other/zte_web_traffic_util.c
+++ b/ap/app/goahead/interface5.0/other/zte_web_traffic_util.c
@@ -32704,7 +32704,7 @@
}
}
if (!is_find) {
- printf("zte_traffic: data = %d not find in gsmdefault extension table\n", gsmdef[i]);
+ printf("traffic: data = %d not find in gsmdefault extension table\n", gsmdef[i]);
}
} else {
ucs2[k] = zte_traffic_GSMDefault_To_UCS2_Table[j] >> 8;
@@ -32747,7 +32747,7 @@
len = zte_traffic_convert_GSMDefault_to_UCS2(
(const UINT8*)data,
(UINT8*)ascii_content, sms_len);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_ConvertUcs2 len = %d \n", len);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_ConvertUcs2 len = %d \n", len);
(void)zte_traffic_DispatchWtoi((unsigned char*)ascii_content, len, (unsigned char*)out_content);
return len;
}
@@ -32815,15 +32815,15 @@
if (strUnicode == NULL || dstUtf8 == NULL) return;
unicode_len = zte_traffic_string_convert_to_unicode_bytes((unsigned char *)strUnicode, buf_unicode, str_len);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_get_request_data....len = %d \n", unicode_len);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_get_request_data....buf[0] = %x, buf[1] = %x,buf[2] = %x,buf[3] = %x, \n", buf_unicode[0], buf_unicode[1], buf_unicode[unicode_len - 2], buf_unicode[unicode_len - 1]);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_get_request_data....len = %d \n", unicode_len);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_get_request_data....buf[0] = %x, buf[1] = %x,buf[2] = %x,buf[3] = %x, \n", buf_unicode[0], buf_unicode[1], buf_unicode[unicode_len - 2], buf_unicode[unicode_len - 1]);
Ucs2ToUtf8(buf_unicode, unicode_len, utf8_buf, sizeof(utf8_buf));
URLEncode(utf8_buf, strlen(utf8_buf), dstUtf8, dst_len);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_get_request_data....dstUtf8 = %s \n", dstUtf8);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_get_request_data....dstUtf8 = %s \n", dstUtf8);
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_traffic_second_get_request_data....dstUtf8 len = %d \n", strlen(dstUtf8));
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] traffic_second_get_request_data....dstUtf8 len = %d \n", strlen(dstUtf8));
}
diff --git a/ap/app/goahead/interface5.0/wifi/zte_web_lan.c b/ap/app/goahead/interface5.0/wifi/zte_web_lan.c
index f0dd1c3..4f63fd8 100755
--- a/ap/app/goahead/interface5.0/wifi/zte_web_lan.c
+++ b/ap/app/goahead/interface5.0/wifi/zte_web_lan.c
@@ -244,7 +244,7 @@
zte_web_write("user_initiate_disconnect", "0"); //Óû§Ö÷¶¯Á¬½Ó״̬£¬Í˳ö¸ÉԤģʽ
zte_web_write("manual_d_wifi", "0");
- slog(MISC_PRINT, SLOG_NORMAL,"[zte_lan_stop_apsta]MSG_CMD_WIFI_STATION_CLOSE_OPEN_MSSID\n", 0, NULL);
+ slog(MISC_PRINT, SLOG_NORMAL,"[lan_stop_apsta]MSG_CMD_WIFI_STATION_CLOSE_OPEN_MSSID\n", 0, NULL);
//zte_send_message(MODULE_ID_WIFI, MSG_CMD_WIFI_STATION_CLOSE_OPEN_MSSID, 0, NULL);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_WIFI, MSG_CMD_WIFI_STATION_CLOSE_OPEN_MSSID, 0, NULL, 0);
@@ -282,7 +282,7 @@
/*lint -e717*/
//#define NV_WRITE(nv_name, str, ret) do{ ret = zte_web_write(nv_name, (char *)str);}while(0)
- slog(WIFI_PRINT, SLOG_ERR, "zte_wlan_basic_set enter \n");
+ slog(WIFI_PRINT, SLOG_ERR, "wlan_basic_set enter \n");
//reset wifi_set_flags
(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, "");
@@ -545,7 +545,7 @@
//cov m
#define NV_READ(nv_name, str, ret) do{ret = zte_web_read(nv_name, nv_basic); str = nv_basic;}while(0)
#define NV_READ_MAC(nv_name, str, ret) do{ret = zte_web_read(nv_name, nv_mac); str = nv_mac;}while(0)
- slog(MISC_PRINT, SLOG_DEBUG,"[%s:%s]zte_wlan_mac_filter_set.\n", __FILE__, __FUNCTION__); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[%s:%s]wlan_mac_filter_set.\n", __FILE__, __FUNCTION__); /*lint !e26*/
memset(nv_basic, 0, sizeof(nv_basic));
NV_READ("ACL_mode", old_ACL_mode, nv_ret);
ACL_mode = websGetVar(wp, T("ACL_mode"), T(""));
@@ -667,14 +667,14 @@
slog(MISC_PRINT, SLOG_DEBUG,"[%s][%s] wifi_wps_index = %s\n", __FILE__, __FUNCTION__, wifi_wps_index);
if (('\0' == *wps_mode) || ('\0' == *WPS_SSID)) {
- slog(MISC_PRINT, SLOG_ERR,"[%s:%s]zte_lan_wps_set:invalid input para.\n wps_mode is [%s]\n WPS_SSID is [%s]", __FILE__, __FUNCTION__, wps_mode, WPS_SSID); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[%s:%s]lan_wps_set:invalid input para.\n wps_mode is [%s]\n WPS_SSID is [%s]", __FILE__, __FUNCTION__, wps_mode, WPS_SSID); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
(void) zte_web_read(NV_WIFI_WPS_STATE, wps_state);
if (0 == strcmp(wps_state, "1")) {
- slog(MISC_PRINT, SLOG_ERR,"zte_lan_wps_set:invalid operate, wps in processing..");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"lan_wps_set:invalid operate, wps in processing..");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -692,7 +692,7 @@
return;
}
- //printf(" ---- zte_wlan_wps_mode_set len is %s\n", wps_pin);
+ //printf(" ---- wlan_wps_mode_set len is %s\n", wps_pin);
if (wps_pin == NULL) {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -758,22 +758,22 @@
(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, "");
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_web_ssid1_set:+++++++++++++++++======\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_web_ssid1_set:+++++++++++++++++======\n");
if (FALSE == zte_wlan_ssid1_basic_set(wp, &wifi_set_flags)) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_web_ssid1_set: zte_wlan_ssid1_basic_set failure .\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_web_ssid1_set: wlan_ssid1_basic_set failure .\n");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
if (-1 == zte_lan_ssid1_security_set(wp, &wifi_set_flags)) {
- slog(MISC_PRINT, SLOG_ERR,"call zte_lan_ssid1_security_set failure .\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"call lan_ssid1_security_set failure .\n");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
(void)snprintf(wifi_set_flags_str, sizeof(wifi_set_flags_str) - 1, "%u", wifi_set_flags);
(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, wifi_set_flags_str);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_web_ssid1_set: wifi_set_flags [%u] to [%s].\n", wifi_set_flags, wifi_set_flags_str); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_web_ssid1_set: wifi_set_flags [%u] to [%s].\n", wifi_set_flags, wifi_set_flags_str); /*lint !e26*/
if (0 != wifi_set_flags) {
slog(MISC_PRINT, SLOG_NORMAL,"send wifi para to wlan-server@ssid1\n");/*lint !e26*/
@@ -797,20 +797,20 @@
(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, "");
if (FALSE == zte_wlan_ssid2_basic_set(wp, &wifi_set_flags)) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid2_set: zte_wlan_ssid2_basic_set failure .");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid2_set: wlan_ssid2_basic_set failure .");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
if (-1 == zte_lan_ssid2_security_set(wp, &wifi_set_flags)) {
- slog(MISC_PRINT, SLOG_ERR,"call zte_lan_ssid2_security_set fail.\n .");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"call lan_ssid2_security_set fail.\n .");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
(void)snprintf(wifi_set_flags_str, sizeof(wifi_set_flags_str) - 1, "%u", wifi_set_flags);
(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, wifi_set_flags_str);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid2_set: wifi_set_flags [%u] to [%s].", wifi_set_flags, wifi_set_flags_str);
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid2_set: wifi_set_flags [%u] to [%s].", wifi_set_flags, wifi_set_flags_str);
if (0 != wifi_set_flags) {
slog(MISC_PRINT, SLOG_NORMAL,"send wifi para to wlan-server@ssid2");/*lint !e26*/
@@ -843,8 +843,8 @@
unsigned int wifi_set_flags = 0;
char wifi_set_flags_str[NV_ITEM_STRING_LEN_20] = {0};
- slog(MISC_PRINT, SLOG_DEBUG,"[%s][%s]zte_wlan_sleep_set.", __FILE__, __FUNCTION__); /*lint !e26*/
- //printf("zhouti zte_wlan_sleep_set------------------------\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[%s][%s]wlan_sleep_set.", __FILE__, __FUNCTION__); /*lint !e26*/
+ //printf("zhouti wlan_sleep_set------------------------\n");
sleepMode = websGetVar(wp, T("sysIdleTimeToSleep"), T(""));
if (NULL == sleepMode || '\0' == *sleepMode) {
@@ -852,7 +852,7 @@
zte_write_result_to_web(wp, FAILURE);
return;
}
- //printf("zhouti zte_wlan_sleep_set sleepMode is %s\n", sleepMode);
+ //printf("zhouti wlan_sleep_set sleepMode is %s\n", sleepMode);
(void)zte_web_write("Sleep_interval", sleepMode);
// (void)zte_web_write("wifi_mac_black_list", wifi_mac_black_list);
// (void)zte_web_write("wifi_hostname_black_list", wifi_hostname_black_list);
@@ -902,8 +902,8 @@
char_t old_wifi_coverage[WIFI_COVERAGE_LEN + 1] = {0};
unsigned int wifi_set_flags = 0;
char wifi_set_flags_str[NV_ITEM_STRING_LEN_20] = {0};
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_coverage_set.");
- //printf("zhouti zte_wlan_coverage_set------------------------\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_coverage_set.");
+ //printf("zhouti wlan_coverage_set------------------------\n");
wifi_coverage = websGetVar(wp, T(NV_WIFI_COVERAGE), T(""));
if (NULL == wifi_coverage || '\0' == *wifi_coverage) {
@@ -975,7 +975,7 @@
status = zte_web_write("SSID1", ssid);
wlan_set_change_ssid_key_status();
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_DEBUG,"[%s:%s]zte_wlan_ssid1_basic_set: write nv [SSID1] fail.", __FILE__, __FUNCTION__); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[%s:%s]wlan_ssid1_basic_set: write nv [SSID1] fail.", __FILE__, __FUNCTION__); /*lint !e26*/
return FALSE;
}
}
@@ -992,7 +992,7 @@
*wifi_set_flags |= ZTE_WLAN_BROADCAST_SET;
status = zte_web_write("HideSSID", broadcastssid);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid1_basic_set: write nv [HideSSID] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid1_basic_set: write nv [HideSSID] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1009,7 +1009,7 @@
*wifi_set_flags |= ZTE_WLAN_AP_ISOLATION_SET;
status = zte_web_write("NoForwarding", NoForwarding);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid1_basic_set: write nv [NoForwarding] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid1_basic_set: write nv [NoForwarding] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1039,7 +1039,7 @@
if (0 != strcmp(show_qrcode_flag, nv_tmp)) {
status = zte_web_write("show_qrcode_flag", show_qrcode_flag);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid1_basic_set: write nv [show_qrcode_flag] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid1_basic_set: write nv [show_qrcode_flag] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1059,7 +1059,7 @@
*wifi_set_flags |= ZTE_WLAN_WIRELESS_MODE_SET;
status = zte_web_write("WirelessMode", wirelessmode);
if (ZTE_NVIO_DONE != status) {
- printf("zte_wlan_ssid1_basic_set: write nv [WirelessMode] fail.");/*lint !e26*/
+ printf("wlan_ssid1_basic_set: write nv [WirelessMode] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1075,7 +1075,7 @@
*wifi_set_flags |= ZTE_WLAN_COUNTRY_SET;
status = zte_web_write("CountryCode", countrycode);
if (ZTE_NVIO_DONE != status) {
- printf("[%s][%s]zte_wlan_ssid1_basic_set: write nv [CountryCode] fail.", __FILE__, __FUNCTION__); /*lint !e26*/
+ printf("[%s][%s]wlan_ssid1_basic_set: write nv [CountryCode] fail.", __FILE__, __FUNCTION__); /*lint !e26*/
return FALSE;
}
}
@@ -1091,7 +1091,7 @@
*wifi_set_flags |= ZTE_WLAN_CHANNEL_SET;
status = zte_web_write("Channel", channel);
if (ZTE_NVIO_DONE != status) {
- printf("zte_wlan_ssid1_basic_set: write nv [Channel] fail.");/*lint !e26*/
+ printf("wlan_ssid1_basic_set: write nv [Channel] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1107,7 +1107,7 @@
*wifi_set_flags |= ZTE_WLAN_WIFI_BAND_SET;
status = zte_web_write("wifi_band", channel);
if (ZTE_NVIO_DONE != status) {
- printf("zte_wlan_ssid1_basic_set: write nv [wifi_band] fail.");/*lint !e26*/
+ printf("wlan_ssid1_basic_set: write nv [wifi_band] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1123,13 +1123,13 @@
*wifi_set_flags |= ZTE_WLAN_WIRELESS_MODE_SET;
status = zte_web_write("wifi_11n_cap", wifi_11n_cap);
if (ZTE_NVIO_DONE != status) {
- printf("zte_wlan_ssid1_basic_set: write nv [wifi_11n_cap] fail.");/*lint !e26*/
+ printf("wlan_ssid1_basic_set: write nv [wifi_11n_cap] fail.");/*lint !e26*/
return FALSE;
}
}
}
#endif
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid1_basic_set: wifi basic setup success.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid1_basic_set: wifi basic setup success.");/*lint !e26*/
return TRUE;
}
@@ -1172,7 +1172,7 @@
status = zte_web_write("m_SSID", ssid);
wlan_set_change_ssid_key_status();//added by dujiajiao
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid2_basic_set: write nv [m_SSID] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid2_basic_set: write nv [m_SSID] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1188,7 +1188,7 @@
*wifi_set_flags |= ZTE_WLAN_SET_AP_MSSID;
status = zte_web_write("m_HideSSID", broadcastssid);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid2_basic_set: write nv [m_HideSSID] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid2_basic_set: write nv [m_HideSSID] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1205,7 +1205,7 @@
*wifi_set_flags |= ZTE_WLAN_SET_AP_MSSID;
status = zte_web_write("m_NoForwarding", NoForwarding);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid1_basic_set: write nv [m_NoForwarding] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid1_basic_set: write nv [m_NoForwarding] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1221,7 +1221,7 @@
*wifi_set_flags |= ZTE_WLAN_SET_AP_MSSID;
status = zte_web_write("m_MAX_Access_num", MAX_Access_num);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid2_basic_set: write nv [MAX_Access_num] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid2_basic_set: write nv [MAX_Access_num] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1236,7 +1236,7 @@
if (0 != strcmp(show_qrcode_flag, nv_tmp)) {
status = zte_web_write("m_show_qrcode_flag", show_qrcode_flag);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_ssid2_basic_set: write nv [show_qrcode_flag] fail.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_ssid2_basic_set: write nv [show_qrcode_flag] fail.");/*lint !e26*/
return FALSE;
}
}
@@ -1244,7 +1244,7 @@
- slog(MISC_PRINT, SLOG_DEBUG,"zte_wlan_ssid2_basic_set: wifi basic setup success.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"wlan_ssid2_basic_set: wifi basic setup success.");/*lint !e26*/
return TRUE;
}
@@ -1456,7 +1456,7 @@
#else
pass_phrase_str_decode = (char*)zte_base64_decode((const unsigned char *)pass_phrase_str, strlen(pass_phrase_str), (unsigned int*)&pass_phrase_str_decode_length);
#endif
- slog(MISC_PRINT, SLOG_DEBUG,"[%s][%s]login2 -> zte_password:%s.\n", __FILE__, __FUNCTION__, pass_phrase_str_decode); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[%s][%s]login2 -> password:%s.\n", __FILE__, __FUNCTION__, pass_phrase_str_decode); /*lint !e26*/
if (NULL == pass_phrase_str_decode) {
slog(MISC_PRINT, SLOG_DEBUG,"pass_phrase_str_decode: psw is empty.\n");/*lint !e26*/
@@ -1467,7 +1467,7 @@
snprintf(zte_pass_phrase_str,zte_pass_phrase_len+1,"%s",pass_phrase_str_decode);
//strncpy(zte_pass_phrase_str, pass_phrase_str_decode, zte_pass_phrase_len);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG,"login3 -> zte_psw_admin:%s.\n", zte_pass_phrase_str); //cov m
+ slog(MISC_PRINT, SLOG_DEBUG,"login3 -> psw_admin:%s.\n", zte_pass_phrase_str); //cov m
#ifdef WEBS_SECURITY
if(zte_pass_phrase_str && !check_web_input_wifi(zte_pass_phrase_str,strlen(zte_pass_phrase_str)))
{
@@ -1716,7 +1716,7 @@
snprintf(zte_pass_phrase_str,zte_pass_phrase_len+1,"%s",pass_phrase_str_decode);
//strncpy(zte_pass_phrase_str, pass_phrase_str_decode, zte_pass_phrase_len);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG,"login3 -> zte_pass_phrase_str:%s.\n", zte_pass_phrase_str); //cov m
+ slog(MISC_PRINT, SLOG_DEBUG,"login3 -> pass_phrase_str:%s.\n", zte_pass_phrase_str); //cov m
#ifdef WEBS_SECURITY
if(zte_pass_phrase_str && !check_web_input_wifi(zte_pass_phrase_str,strlen(zte_pass_phrase_str)))
{
@@ -1787,14 +1787,14 @@
//check the param: openEnable & closeEnable
if (NULL == openEnable || '\0' == *openEnable || NULL == closeEnable || '\0' == *closeEnable) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_set_tsw: **open/close**invalid input para.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_set_tsw: **open/close**invalid input para.\n");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
//if swtich is open , then check the param: openTime & closeTime
if (strcmp(openEnable, "1") == 0) {
if (NULL == openTime || '\0' == *openTime || NULL == closeTime || '\0' == *closeTime) {
- slog(MISC_PRINT, SLOG_ERR,"zte_wlan_set_tsw: **open**invalid input para:openTime /closeTime.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"wlan_set_tsw: **open**invalid input para:openTime /closeTime.\n");/*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
diff --git a/ap/app/goahead/interface5.0/wifi/zte_web_mgmt_wifi.c b/ap/app/goahead/interface5.0/wifi/zte_web_mgmt_wifi.c
index 6677f54..89b9248 100755
--- a/ap/app/goahead/interface5.0/wifi/zte_web_mgmt_wifi.c
+++ b/ap/app/goahead/interface5.0/wifi/zte_web_mgmt_wifi.c
@@ -137,7 +137,7 @@
#else
pass_phrase_str_decode = zte_base64_decode((const unsigned char *)pass_phrase_str, strlen(pass_phrase_str), &pass_phrase_str_decode_length);
#endif
- slog(MISC_PRINT, SLOG_DEBUG, "login2 -> zte_password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login2 -> password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
if (NULL == pass_phrase_str_decode) {
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str_decode: psw is empty.\n"); /*lint !e26*/
@@ -150,7 +150,7 @@
else
snprintf(zte_pass_phrase_str,pass_phrase_str_decode_length+1,"%s",pass_phrase_str_decode);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG, "login3 -> zte_psw_admin:%s.\n", zte_pass_phrase_str); //cov m
+ slog(MISC_PRINT, SLOG_DEBUG, "login3 -> psw_admin:%s.\n", zte_pass_phrase_str); //cov m
#ifdef WEBS_SECURITY
pass_phrase_b64_encode = zte_base64_encode(zte_pass_phrase_str, strlen(zte_pass_phrase_str));
@@ -178,7 +178,7 @@
#else
pass_phrase_str_decode = zte_base64_decode((const unsigned char *)pass_phrase_str, strlen(pass_phrase_str), &pass_phrase_str_decode_length);
#endif
- slog(MISC_PRINT, SLOG_DEBUG, "login2 -> zte_password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login2 -> password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
if (NULL == pass_phrase_str_decode) {
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str_decode: psw is empty.\n"); /*lint !e26*/
@@ -191,7 +191,7 @@
else
snprintf(zte_pass_phrase_str,pass_phrase_str_decode_length+1,"%s",pass_phrase_str_decode);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG, "login3 -> zte_psw_admin:%s.\n", zte_pass_phrase_str); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login3 -> psw_admin:%s.\n", zte_pass_phrase_str); /*lint !e26*/
#ifdef WEBS_SECURITY
pass_phrase_b64_encode = zte_base64_encode(zte_pass_phrase_str, strlen(zte_pass_phrase_str));
@@ -218,7 +218,7 @@
/*TBD:notify wifi module to make parameters go into effect*/
//(void)snprintf(wifi_set_flags_str,sizeof(wifi_set_flags_str)-1,"%u",wifi_set_flags);
//(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, wifi_set_flags_str);
- //slog(MISC_PRINT,SLOG_DEBUG,"zte_wlan_ssid1_set: wifi_set_flags [%u] to [%s].", wifi_set_flags,wifi_set_flags_str);/*lint !e26*/
+ //slog(MISC_PRINT,SLOG_DEBUG,"wlan_ssid1_set: wifi_set_flags [%u] to [%s].", wifi_set_flags,wifi_set_flags_str);/*lint !e26*/
//printf(" deal_quick_setup_wifi_security------------------------- 11111\n");
sc_cfg_get("wifi_cur_state", wifi_cur_state, sizeof(wifi_cur_state));
@@ -336,7 +336,7 @@
pass_phrase_str = websGetVar(wp, T("passphrase"), T(""));
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str:%s.\n", pass_phrase_str); /*lint !e26*/
pass_phrase_str_decode = zte_base64_decode((const unsigned char *)pass_phrase_str, strlen(pass_phrase_str), &pass_phrase_str_decode_length);
- slog(MISC_PRINT, SLOG_DEBUG, "login2 -> zte_password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login2 -> password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
if (NULL == pass_phrase_str_decode) {
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str_decode: psw is empty.\n"); /*lint !e26*/
@@ -349,7 +349,7 @@
else
snprintf(zte_pass_phrase_str,pass_phrase_str_decode_length+1,"%s",pass_phrase_str_decode);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG, "login3 -> zte_psw_admin:%s.\n", zte_pass_phrase_str); //cov m
+ slog(MISC_PRINT, SLOG_DEBUG, "login3 -> psw_admin:%s.\n", zte_pass_phrase_str); //cov m
#ifdef WEBS_SECURITY
pass_phrase_b64_encode = zte_base64_encode(zte_pass_phrase_str, strlen(zte_pass_phrase_str));
@@ -371,7 +371,7 @@
pass_phrase_str = websGetVar(wp, T("passphrase"), T(""));
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str:%s.\n", pass_phrase_str); /*lint !e26*/
pass_phrase_str_decode = zte_base64_decode((const unsigned char *)pass_phrase_str, strlen(pass_phrase_str), &pass_phrase_str_decode_length);
- slog(MISC_PRINT, SLOG_DEBUG, "login2 -> zte_password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login2 -> password:%s.\n", pass_phrase_str_decode); /*lint !e26*/
if (NULL == pass_phrase_str_decode) {
slog(MISC_PRINT, SLOG_DEBUG, "pass_phrase_str_decode: psw is empty.\n"); /*lint !e26*/
@@ -384,7 +384,7 @@
else
snprintf(zte_pass_phrase_str,pass_phrase_str_decode_length+1,"%s",pass_phrase_str_decode);
free(pass_phrase_str_decode);
- slog(MISC_PRINT, SLOG_DEBUG, "login3 -> zte_psw_admin:%s.\n", zte_pass_phrase_str); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "login3 -> psw_admin:%s.\n", zte_pass_phrase_str); /*lint !e26*/
#ifdef WEBS_SECURITY
pass_phrase_b64_encode = zte_base64_encode(zte_pass_phrase_str, strlen(zte_pass_phrase_str));
@@ -409,7 +409,7 @@
/*TBD:notify wifi module to make parameters go into effect*/
//(void)snprintf(wifi_set_flags_str,sizeof(wifi_set_flags_str)-1,"%u",wifi_set_flags);
//(void)zte_web_write(WIFI_NV_ITEM_WIFI_SET_FLAGS, wifi_set_flags_str);
- //slog(MISC_PRINT,SLOG_DEBUG,"zte_wlan_ssid1_set: wifi_set_flags [%u] to [%s].", wifi_set_flags,wifi_set_flags_str);/*lint !e26*/
+ //slog(MISC_PRINT,SLOG_DEBUG,"wlan_ssid1_set: wifi_set_flags [%u] to [%s].", wifi_set_flags,wifi_set_flags_str);/*lint !e26*/
//printf(" deal_quick_setup_wifi_security------------------------- 11111\n");
sc_cfg_get("wifi_cur_state", wifi_cur_state, sizeof(wifi_cur_state));
diff --git a/ap/app/goahead/interface5.0/wifi/zte_web_wlan_station.c b/ap/app/goahead/interface5.0/wifi/zte_web_wlan_station.c
index 63b8dd0..baf3515 100755
--- a/ap/app/goahead/interface5.0/wifi/zte_web_wlan_station.c
+++ b/ap/app/goahead/interface5.0/wifi/zte_web_wlan_station.c
@@ -771,7 +771,7 @@
//²ÎÊýºÏ·¨ÐÔ¼ì²é
- slog(WIFI_PRINT, SLOG_DEBUG,"[%s]zte_wlan_station_set !\n", __FILE__);
+ slog(WIFI_PRINT, SLOG_DEBUG,"[%s]wlan_station_set !\n", __FILE__);
if (check_set_value(wifi_sta_connection) == FALSE) {
zte_write_result_to_web(wp, FAILURE);
@@ -818,10 +818,10 @@
lRet = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_WIFI, MSG_CMD_WIFI_STATION_CLOSE, 0, NULL, 0);
if (lRet != 0) {
//zte_web_write("RadioOff", "1");
- slog(WIFI_PRINT, SLOG_ERR,"[%s]zte_wlan_station_set MSG_CMD_WIFI_STATION_CLOSE failed\n", __FILE__);
+ slog(WIFI_PRINT, SLOG_ERR,"[%s]wlan_station_set MSG_CMD_WIFI_STATION_CLOSE failed\n", __FILE__);
} else {
- slog(WIFI_PRINT, SLOG_NORMAL,"[%s]zte_wlan_station_set MSG_CMD_WIFI_STATION_CLOSE!\n", __FILE__);
+ slog(WIFI_PRINT, SLOG_NORMAL,"[%s]wlan_station_set MSG_CMD_WIFI_STATION_CLOSE!\n", __FILE__);
}
} else if (strcmp(wifi_sta_connection, "1") == 0) { //¹¦ÄÜ¿ªÆô
@@ -835,12 +835,12 @@
if(strcmp(ap_station_mode, WEB_WLAN_STATION_MODE_WIFI_PREF) == 0)
{
// zte_send_message(MODULE_ID_BLC_RCV, MSG_CMD_BLC_SET_WIFISTATION_PRE, 0, NULL);
- wf_log("[%s]zte_wlan_station_set WIFISTATION_PRE!\n",__FILE__);
+ wf_log("[%s]wlan_station_set WIFISTATION_PRE!\n",__FILE__);
}
else if(strcmp(ap_station_mode, WEB_WLAN_STATION_MODE_DIAL_PREF) == 0)
{
//zte_send_message(MODULE_ID_BLC_RCV, MSG_CMD_BLC_SET_MODEM_PRE, 0, NULL);
- wf_log("[%s]zte_wlan_station_set MODEM_PRE!\n",__FILE__);
+ wf_log("[%s]wlan_station_set MODEM_PRE!\n",__FILE__);
}
**********/
@@ -854,15 +854,15 @@
lRet = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_WIFI, MSG_CMD_WIFI_STATION_OPEN, 0, NULL, 0);
if (lRet != 0) {
//zte_web_write("RadioOff", "1");
- slog(WIFI_PRINT, SLOG_ERR,"[%s]zte_wlan_station_set MSG_CMD_WIFI_STATION_OPEN failed\n", __FILE__);
+ slog(WIFI_PRINT, SLOG_ERR,"[%s]wlan_station_set MSG_CMD_WIFI_STATION_OPEN failed\n", __FILE__);
} else {
- slog(WIFI_PRINT, SLOG_NORMAL,"[%s]zte_wlan_station_set MSG_CMD_WIFI_STATION_OPEN!\n", __FILE__);
+ slog(WIFI_PRINT, SLOG_NORMAL,"[%s]wlan_station_set MSG_CMD_WIFI_STATION_OPEN!\n", __FILE__);
}
}
}
- slog(WIFI_PRINT, SLOG_DEBUG,"zte_wlan_station_set SUCCESS!\n");//cov m
+ slog(WIFI_PRINT, SLOG_DEBUG,"wlan_station_set SUCCESS!\n");//cov m
zte_write_result_to_web(wp, SUCCESS);
}
@@ -1219,7 +1219,7 @@
EX_WPAPSK1 = websGetVar(wp, T("EX_WPAPSK1"), T(""));
EX_wifi_profile = websGetVar(wp, T("EX_wifi_profile"), T(""));
EX_mac = websGetVar(wp, T("EX_mac"), T(""));
- slog(WIFI_PRINT, SLOG_NORMAL,"-----zte_wlan_station_connect-----EX_AuthMode is %s\n", EX_AuthMode);
+ slog(WIFI_PRINT, SLOG_NORMAL,"-----wlan_station_connect-----EX_AuthMode is %s\n", EX_AuthMode);
//²ÎÊýºÏ·¨ÐÔ¼ì²é
if (check_connect_value(EX_SSID1, EX_AuthMode, EX_EncrypType, EX_DefaultKeyID, EX_wifi_profile, EX_WEPKEY, EX_WPAPSK1) == FALSE) {
zte_write_result_to_web(wp, FAILURE);
diff --git a/ap/app/goahead/interface5.0/zte_web_get_fw_para.c b/ap/app/goahead/interface5.0/zte_web_get_fw_para.c
index 47df969..716dd4c 100755
--- a/ap/app/goahead/interface5.0/zte_web_get_fw_para.c
+++ b/ap/app/goahead/interface5.0/zte_web_get_fw_para.c
@@ -616,7 +616,7 @@
fp = popen("cat /sys/class/android_usb/android0/debug_enable", "r");
if (NULL == fp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_device_mode: get read fp failed."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_device_mode: get read fp failed."); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return ;
}
@@ -658,14 +658,14 @@
}
status = zte_web_read(NV_LOGINFO, loginfo);
if (ZTE_NVIO_DONE != status) {
- slog(MISC_PRINT, SLOG_ERR,"zte_get_loginfo: read the nv [loginfo] fail.");
+ slog(MISC_PRINT, SLOG_ERR,"get_loginfo: read the nv [loginfo] fail.");
return ;
}
//get request ip addr
ip_address = websGetRequestIpaddr(wp);
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH wp->ipaddr ipaddr is array, it's address can not be NULL
if (NULL == ip_address) {
- slog(MISC_PRINT, SLOG_ERR,"zte_get_loginfo: ip_address is null.");
+ slog(MISC_PRINT, SLOG_ERR,"get_loginfo: ip_address is null.");
return ;
}
#endif
@@ -682,7 +682,7 @@
strncpy(login_status, "ok", NV_ITEM_STRING_LEN_20);
} else {
strncpy(login_status, "", NV_ITEM_STRING_LEN_20);
- //slog(MISC_PRINT, SLOG_DEBUG,"zte_get_login loginfo:%s,ip:%s,nv:%s,cookie:%s,nv:%s,buf:%s!\n",loginfo,ip_address,nv_ipaddr,wp->cookie,cook_id,buf);
+ //slog(MISC_PRINT, SLOG_DEBUG,"get_login loginfo:%s,ip:%s,nv:%s,cookie:%s,nv:%s,buf:%s!\n",loginfo,ip_address,nv_ipaddr,wp->cookie,cook_id,buf);
}
}
/******************************************************
diff --git a/ap/app/goahead/interface5.0/zte_web_httpshare.c b/ap/app/goahead/interface5.0/zte_web_httpshare.c
index e77e0db..6d1f382 100644
--- a/ap/app/goahead/interface5.0/zte_web_httpshare.c
+++ b/ap/app/goahead/interface5.0/zte_web_httpshare.c
@@ -20,10 +20,10 @@
int zte_httpshare_call_system(char * cmd)
{
if (NULL == cmd) {
- slog(MISC_PRINT,SLOG_DEBUG,"[httpshare]zte_httpshare_call_system: NULL-------------------------------\n");
+ slog(MISC_PRINT,SLOG_DEBUG,"[httpshare]httpshare_call_system: NULL-------------------------------\n");
return -1;
}
- slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]zte_httpshare_call_system: [%s] \n", cmd);
+ slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]httpshare_call_system: [%s] \n", cmd);
#if 0
return system(cmd);
#else
@@ -34,10 +34,10 @@
static int zte_httpshare_call_system_echo(char * cmd)
{
if (NULL == cmd) {
- slog(MISC_PRINT,SLOG_DEBUG,"[httpshare]zte_httpshare_call_system_echo: NULL-------------------------------\n");
+ slog(MISC_PRINT,SLOG_DEBUG,"[httpshare]httpshare_call_system_echo: NULL-------------------------------\n");
return -1;
}
- slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]zte_httpshare_call_system_echo: [%s] \n", cmd);
+ slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]httpshare_call_system_echo: [%s] \n", cmd);
return soft_system(cmd);
}
@@ -51,7 +51,7 @@
char *newenviron[] = { NULL };
// cmd array's size is unknown
-// slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]zte_httpshare_call_zte_system: [%s %s %s] \n", cmd[0],cmd[1],cmd[2]);
+// slog(MISC_PRINT,SLOG_NORMAL,"[httpshare]httpshare_call_system: [%s %s %s] \n", cmd[0],cmd[1],cmd[2]);
pid = fork();
if (pid == -1) {
@@ -82,14 +82,14 @@
int rc = 0;
if (NULL == db) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_open:invalide inputs.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_open:invalide inputs.\n");
return ZTE_HTTPSHARE_DB_ERROR_INVAILD_PTR;
}
rc = sqlite3_open(ZTE_HTTPSHARE_DB_PATH, &tmp_db);
if (rc) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_open:can not open db,sqlite3_errmsg:%s\n", sqlite3_errmsg(tmp_db));
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_open:can not open db,sqlite3_errmsg:%s\n", sqlite3_errmsg(tmp_db));
(void)sqlite3_close(tmp_db);
return ZTE_HTTPSHARE_DB_ERROR_NOT_OPEN_DB;
}
@@ -102,12 +102,12 @@
int rc = 0;
if (NULL == db) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_close:invalide inputs.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_close:invalide inputs.\n");
return ZTE_HTTPSHARE_DB_ERROR_INVAILD_PTR;
}
rc = sqlite3_close(db);
if (rc) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_close:can not close db.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_close:can not close db.\n");
return ZTE_HTTPSHARE_DB_ERROR;
}
return ZTE_HTTPSHARE_DB_OK;
@@ -118,18 +118,18 @@
int rc = 0;
if (NULL == sql) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_exec_sql:invalide inputs.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_exec_sql:invalide inputs.\n");
return ZTE_HTTPSHARE_DB_ERROR_INVAILD_PTR;
}
if (0 != zte_httpshare_db_open(&db)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_exec_sql:open httpshare.db failed.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_exec_sql:open httpshare.db failed.\n");
return ZTE_HTTPSHARE_DB_ERROR_NOT_OPEN_DB;
}
rc = sqlite3_exec(db, sql, callback, fvarg, NULL);
- slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]zte_httpshare_db_exec_sql:%s rc=%d\n", sql, rc);
+ slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]httpshare_db_exec_sql:%s rc=%d\n", sql, rc);
if (rc) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_db_exec_sql:can not exec sql,sqlite3_errmsg:%s.\n", sqlite3_errmsg(db));
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_db_exec_sql:can not exec sql,sqlite3_errmsg:%s.\n", sqlite3_errmsg(db));
(void)zte_httpshare_db_close(db);
return ZTE_HTTPSHARE_DB_ERROR;
}
@@ -157,14 +157,14 @@
int zte_check_download_file(char *path)//0: ²»´æÔڼǼ 1:¼Ç¼´æÔÚ
{
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_check_download_file:path->%s\n", path);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_check_download_file:download_file->%s\n", download_file);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]check_download_file:path->%s\n", path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]check_download_file:download_file->%s\n", download_file);
if (!strncmp(path, download_file, strlen(path))) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_check_download_file:find used file->%s\n", path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]check_download_file:find used file->%s\n", path);
return 1;
} else {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_download_file:not find file->%s\n", path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_download_file:not find file->%s\n", path);
return 0;
}
}
@@ -193,14 +193,14 @@
//char *cmd = NULL;
if (!path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_file null\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_file null\n");
return 0;
}
/*
cmd = (char *)malloc(strlen(path) + 10);
//char cmd[4*ZTE_HTTPSHARE_FILE_NAME_MAX_LEN+1] = {0};
if (NULL == cmd) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_file malloc error!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_file malloc error!\n");
return 0;
}
snprintf(cmd, strlen(path) + 10, "rm -rf \"%s\"", path);
@@ -349,11 +349,11 @@
sleep(2);
return 1;
}
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_mount_sd %s error!\n", sd_path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_mount_sd %s error!\n", sd_path);
}
if (0 != zte_system(cmd1)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_mount_sd %s error!\n", USB_DEV_SDCARD_PATH_BACK);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_mount_sd %s error!\n", USB_DEV_SDCARD_PATH_BACK);
return 0;
}
sleep(2);
@@ -367,20 +367,20 @@
int cdrom = -1;
cdrom = zte_get_cdrom();
- slog(MISC_PRINT, SLOG_ERR,"zte_mount_httpshare:cdrom=%d\n",cdrom);
+ slog(MISC_PRINT, SLOG_ERR,"mount_httpshare:cdrom=%d\n",cdrom);
if(cdrom == 0)
{
memset(cmd, 0, sizeof(cmd));
zte_httpshare_call_system_echo("/bin/echo NULL > /sys/devices/platform/zx29_hsotg.0/gadget/lun0/file");
if (-1 == access(SD_CARD_PATH, F_OK)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_mount_httpshare mmc2 no exist!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]mount_httpshare mmc2 no exist!\n");
if(mkdir(SD_CARD_PATH, 0777) < 0)
{
slog(MISC_PRINT, SLOG_ERR,"[httpshare]mkdir(%s) fail!\n", SD_CARD_PATH);
}
return zte_httpshare_mount_sd();
} else {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_mount_httpshare %s exist\n", SD_CARD_PATH);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]mount_httpshare %s exist\n", SD_CARD_PATH);
return zte_httpshare_mount_sd();
}
}
@@ -389,13 +389,13 @@
memset(cmd, 0, sizeof(cmd));
zte_httpshare_call_system_echo("/bin/echo NULL > /sys/devices/platform/zx29_hsotg.0/gadget/lun1/file");
if (-1 == access(SD_CARD_PATH, F_OK)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_mount_httpshare mmc2 no exist!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]mount_httpshare mmc2 no exist!\n");
if(mkdir(SD_CARD_PATH, 0777) < 0){
slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]mkdir fail %s exist\n", SD_CARD_PATH);
}
return zte_httpshare_mount_sd();
} else {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_mount_httpshare %s exist\n", SD_CARD_PATH);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]mount_httpshare %s exist\n", SD_CARD_PATH);
return zte_httpshare_mount_sd();
}
}
@@ -417,8 +417,8 @@
(void)zte_web_read(NV_HTTPSHARE_WR_AUTH, HTTP_SHARE_WR_AUTH);
(void)zte_web_read(NV_HTTPSHARE_FILE, HTTP_SHARE_FILE);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_write_auth_to_web: value is [%s]\n", HTTP_SHARE_WR_AUTH);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_write_auth_to_web: value is [%s]\n", HTTP_SHARE_FILE);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]write_auth_to_web: value is [%s]\n", HTTP_SHARE_WR_AUTH);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]write_auth_to_web: value is [%s]\n", HTTP_SHARE_FILE);
web_feedback_header(wp);
(void)websWrite(wp, T("{\"HTTP_SHARE_WR_AUTH\":\"%s\",\"HTTP_SHARE_FILE\":\"%s\"}"),
HTTP_SHARE_WR_AUTH, HTTP_SHARE_FILE);
@@ -503,13 +503,13 @@
zte_httpshare_return_e_type zte_httpshare_check_and_creat_dir(char *path)
{
if (!path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_check_and_creat_dir: check dir path null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_check_and_creat_dir: check dir path null.\n");
return ZTE_HTTPSHARE_FAILURE;
}
if (-1 == access(path, F_OK)) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpshare_check_and_creat_dir:%s does not exist,socreate it.\n", ZTE_HTTPSHARE_DB_DIR);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpshare_check_and_creat_dir:%s does not exist,socreate it.\n", ZTE_HTTPSHARE_DB_DIR);
if (-1 == mkdir(path, 0777)) { /*lint !e1055*/
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_check_and_creat_dir:failed to create db dir.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_check_and_creat_dir:failed to create db dir.\n");
return ZTE_HTTPSHARE_FAILURE;
}
}
@@ -524,7 +524,7 @@
result = zte_httpshare_db_exec_sql(ZTE_CREATE_TABLE_HTTPSHARE_SQL, NULL, NULL);
if (ZTE_HTTPSHARE_DB_OK != result) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_create_table:create httpshare table result is %d\n", result);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_create_table:create httpshare table result is %d\n", result);
return result;
}
return result;
@@ -535,16 +535,16 @@
{
if (!path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_file_exist:file path null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_file_exist:file path null.\n");
return 0;
}
if (-1 == access(path, F_OK)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_file_exist path=%s (file not exist)\n", path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_file_exist path=%s (file not exist)\n", path);
return 0;
} else {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_check_file_exist path=%s (file exist)\n", path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]check_file_exist path=%s (file exist)\n", path);
return 1;
}
}
@@ -562,16 +562,16 @@
if(access("/sys/kernel/debug/mmc1/present", R_OK) != 0)
{
- slog(MISC_PRINT, SLOG_ERR, "[httpshare] zte_check_sdcard_exist file not exist!\n");
+ slog(MISC_PRINT, SLOG_ERR, "[httpshare] check_sdcard_exist file not exist!\n");
return ret;
}
//fd = popen("cat /proc/proc_sd/size","r");
fd = popen("cat /sys/kernel/debug/mmc1/present", "r");
- //printf("[httpshare]zte_check_sdcard_exist cat /sys/kernel/debug/mmc1/present\n");
+ //printf("[httpshare]check_sdcard_exist cat /sys/kernel/debug/mmc1/present\n");
if (fd == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_sdcard_exist popen file = NULL\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_sdcard_exist popen file = NULL\n");
return ret;
}
if (!feof(fd) && fgets(size_sd, sizeof(size_sd), fd) != NULL) {
@@ -580,7 +580,7 @@
pclose(fd);
- //printf("[httpshare]zte_check_sdcard_exist :get size data = %d\n",ret);
+ //printf("[httpshare]check_sdcard_exist :get size data = %d\n",ret);
return ret;
}
@@ -611,7 +611,7 @@
(void)zte_web_write(STR_SDCARD_MODE_OPT, "0");
cdrom = zte_get_cdrom();
- slog(MISC_PRINT, SLOG_ERR,"zte_mount_httpshare:cdrom=%d\n",cdrom);
+ slog(MISC_PRINT, SLOG_ERR,"mount_httpshare:cdrom=%d\n",cdrom);
if(cdrom == 0)
zte_httpshare_call_system_echo("/bin/echo dev/mmcblk0 > /sys/devices/platform/zx29_hsotg.0/gadget/lun0/file");
else if(cdrom == 1)
@@ -657,11 +657,11 @@
(void)zte_del_file(ZTE_HTTPSHARE_DB_PATH);
if (ZTE_HTTPSHARE_SUCCESS != zte_httpshare_check_and_creat_dir(ZTE_HTTPSHARE_DB_DIR)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_init:zte_httpshare_check_and_creat_dir ZTE_HTTPSHARE_DB_DIR fail!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_init:httpshare_check_and_creat_dir HTTPSHARE_DB_DIR fail!\n");
return;
}
if (ZTE_HTTPSHARE_DB_OK != zte_httpshare_create_table()) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_init:zte_httpshare_create_table fail!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_init:httpshare_create_table fail!\n");
return;
}
@@ -716,7 +716,7 @@
int zte_httpshare_db_id_cb(void *fvarg, int line, char **zresult, char **lname)
{
if (1 > line) {
- printf("[httpshare]zte_httpshare_db_id_cb:record no data.\n");
+ printf("[httpshare]httpshare_db_id_cb:record no data.\n");
return -1;
}
*(int*)fvarg = atoi(zresult[0]);
@@ -727,7 +727,7 @@
int zte_httpshare_check_record(char *ip)
{
if (!ip) {
- printf("[httpshare]zte_httpshare_check_record:para null.\n");
+ printf("[httpshare]httpshare_check_record:para null.\n");
return -1;
}
@@ -741,7 +741,7 @@
result = zte_httpshare_db_exec_sql(sql, zte_httpshare_db_id_cb, &id);
(void)sleep(2);
if (ZTE_HTTPSHARE_DB_OK != result) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_check_record:result %d\n", result);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_check_record:result %d\n", result);
}
return id;
@@ -753,7 +753,7 @@
{
if ((!ip) || (!path)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_update_record:para null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_update_record:para null.\n");
return ZTE_HTTPSHARE_DB_ERROR;
}
@@ -764,7 +764,7 @@
result = zte_httpshare_db_exec_sql(sql, NULL, NULL);
if (ZTE_HTTPSHARE_DB_OK != result) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_update_record:update record result %d\n", result);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_update_record:update record result %d\n", result);
return result;
}
@@ -781,7 +781,7 @@
zte_httpshare_db_result_e_type zte_httpshare_get_record(char *ip, char *path)
{
if ((!ip) || (!path)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_get_record:para null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_get_record:para null.\n");
return ZTE_HTTPSHARE_DB_ERROR;
}
zte_httpshare_db_result_e_type result = ZTE_HTTPSHARE_DB_OK;
@@ -792,7 +792,7 @@
result = zte_httpshare_db_exec_sql(sql, zte_httpshare_getpath_cb, path);
(void)sleep(1);
if (ZTE_HTTPSHARE_DB_OK != result) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_get_record:update record result %d\n", result);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_get_record:update record result %d\n", result);
return result;
}
@@ -804,7 +804,7 @@
{
if ((!ip) || (!path)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_insert_path_to_db:para null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_insert_path_to_db:para null.\n");
return ZTE_HTTPSHARE_DB_ERROR;
}
@@ -816,7 +816,7 @@
result = zte_httpshare_db_exec_sql(sql, NULL, NULL);
if (ZTE_HTTPSHARE_DB_OK != result) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_insert_path_to_db:result %d\n", result);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_insert_path_to_db:result %d\n", result);
return result;
}
return result;
@@ -830,13 +830,13 @@
int i = 0;
struct utimbuf times;
if ((!new_time) || (!path_source)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_change_file_time src==NULL\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]change_file_time src==NULL\n");
return;
}
if ((!strlen(path_source)) || (!strlen(new_time))) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_change_file_time src==empty\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]change_file_time src==empty\n");
return;
}
@@ -890,7 +890,7 @@
if (n < 3) {
(void)websWrite(wp, T("],\"totalRecord\":\"%d\"}}"), file_count);
if (n <= 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort: scandir n=%d.\n", n);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort: scandir n=%d.\n", n);
free(namelist);
return 1;
}
@@ -904,7 +904,7 @@
char *file_path = NULL;
file_path = (char*)malloc(ZTE_HTTPSHARE_PATH_NAME_MAX_LEN + 1);
if (!file_path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort, malloc error!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort, malloc error!\n");
(void)websWrite(wp, T("],\"totalRecord\":\"%d\"}}"), file_count);
while (n--) {
slog(MISC_PRINT, SLOG_DEBUG,"namelist[%d]:%s\n", n, namelist[n]->d_name);
@@ -925,8 +925,8 @@
errno = 0;
if (stat(file_path, &fileinfo) < 0) {
- //printf("[httpshare]zte_write_filerecord_alphasort stat < 0\n");
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort stat : %s[%s]\n", strerror(errno),file_path);
+ //printf("[httpshare]write_filerecord_alphasort stat < 0\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort stat : %s[%s]\n", strerror(errno),file_path);
continue;
}
file_count++;
@@ -952,7 +952,7 @@
free(file_path);
file_path = NULL;
while (n--) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_write_filerecord_alphasort:namelist[%d]->%s\n", n, namelist[n]->d_name);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]write_filerecord_alphasort:namelist[%d]->%s\n", n, namelist[n]->d_name);
free(namelist[n]);
}
free(namelist);
@@ -982,7 +982,7 @@
(void)websWrite(wp, T("],\"totalRecord\":\"%d\"}}"), file_count);
if (n <= 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort_page scandir n=%d.\n", n);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort_page scandir n=%d.\n", n);
free(namelist);
return 1;
}
@@ -995,7 +995,7 @@
}
file_path = (char*)malloc(ZTE_HTTPSHARE_PATH_NAME_MAX_LEN + 1);
if (!file_path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort_page:list file memory fail!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort_page:list file memory fail!\n");
(void)websWrite(wp, T("],\"totalRecord\":\"%d\"}}"), file_count);
while (n--) free(namelist[n]);
free(namelist);
@@ -1020,7 +1020,7 @@
memset(file_path, 0, ZTE_HTTPSHARE_PATH_NAME_MAX_LEN + 1);
snprintf(file_path, ZTE_HTTPSHARE_PATH_NAME_MAX_LEN + 1, "%s/%s", path, namelist[i]->d_name);
if (stat(file_path, &fileinfo) < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort_page stat %s[%s]\n", strerror(errno),file_path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort_page stat %s[%s]\n", strerror(errno),file_path);
continue;
}
@@ -1046,7 +1046,7 @@
free(file_path);
file_path = NULL;
while (n--) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_write_filerecord_alphasort_page:namelist[%d]->%s\n", n, namelist[n]->d_name);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]write_filerecord_alphasort_page:namelist[%d]->%s\n", n, namelist[n]->d_name);
free(namelist[n]);
}
free(namelist);
@@ -1060,13 +1060,13 @@
int zte_create_document(char* path)
{
if (!path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_create_document:path is null\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]create_document:path is null\n");
return 0;
}
- slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]zte_create_document:create new folder->%s\n", path);
+ slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]create_document:create new folder->%s\n", path);
if (-1 == mkdir(path, 0777)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_create_documentcreate new folder->%s failed\n", path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]create_documentcreate new folder->%s failed\n", path);
return 0;
}
@@ -1086,12 +1086,12 @@
char *name = NULL;
absolute_path = (char*)malloc(ZTE_HTTPSHARE_PATH_NAME_MAX_LEN + 1);
if (!absolute_path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_multi_file_record:multi del abusolute path malloc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_multi_file_record:multi del abusolute path malloc fail.\n");
return 0;
}
name = (char*)malloc(strlen(path1) + 1);
if (!name) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_multi_file_record:multi del name malloc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_multi_file_record:multi del name malloc fail.\n");
free(absolute_path);
absolute_path = NULL;
return 0;
@@ -1107,7 +1107,7 @@
} else {
//·¾¶Ãû³Æ³¤¶È<4096 ; ÎļþÃû³¤¶È<255
if ((strlen(name) > 255) || ((strlen(name) + strlen(path)) > 4095)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_multi_file_record:filename/path too long\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_multi_file_record:filename/path too long\n");
free(name);
free(absolute_path);
@@ -1119,7 +1119,7 @@
// added by fenglei for security begin 20141029
if (zte_httpshare_check_patch_inlegal(absolute_path)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_multi_file_record:check del path is legal or not %s\n", absolute_path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_multi_file_record:check del path is legal or not %s\n", absolute_path);
free(name);
free(absolute_path);
name = absolute_path = NULL;
@@ -1131,10 +1131,10 @@
(void)zte_del_file(absolute_path);
}
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_del_multi_file_record:check result->%d.\n", check_result);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]del_multi_file_record:check result->%d.\n", check_result);
if (access(absolute_path, F_OK) == 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_del_multi_file_record:del file fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]del_multi_file_record:del file fail.\n");
if (0 == check_result) { //²»´æÔڼǼ£¬É¾³ýʧ°Ü£¬·µ»Øʧ°Ü
del_res = 0;
} else {
@@ -1194,7 +1194,7 @@
void zte_httpShare_getcard_value(webs_t wp)
{
if (!sd_card_isExist()) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_getcard_value no sdcard.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_getcard_value no sdcard.\n");
zte_write_result_to_web(wp, NO_SDCARD);
return;
}
@@ -1241,14 +1241,14 @@
{
char *mode = websGetVar(wp, "mode_set", T(""));
- //printf("[httpshare]zte_httpShare_modeset:set to mode->%s\n", mode);
+ //printf("[httpshare]httpShare_modeset:set to mode->%s\n", mode);
if (!sd_card_isExist()) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_modeset:no sdcard.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_modeset:no sdcard.\n");
zte_write_result_to_web(wp, NO_SDCARD);
return;
}
- //printf("[httpshare]zte_httpShare_modeset:sdcard exist.\n");
+ //printf("[httpshare]httpShare_modeset:sdcard exist.\n");
if ((0 != strcmp("http_share_mode", mode)) && (0 != strcmp("usb_mode", mode))) {
zte_write_result_to_web(wp, FAILURE);
return;
@@ -1285,7 +1285,7 @@
char *path_web = neutralize(path_web_tmp);
if(path_web == NULL){
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_enterFold fail %s.\n", path_web_tmp);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_enterFold fail %s.\n", path_web_tmp);
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1295,7 +1295,7 @@
path_source = (char *)malloc(path_source_len); //²âÊÔ:SD_CARD_PATH_PR=/mnt/jffs2
if (!path_source) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_enterFold malloc fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_enterFold malloc fail\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1313,7 +1313,7 @@
char * ip = websGetRequestIpaddr(wp);
memset(path_source, 0, path_source_len);
snprintf(path_source, path_source_len, "%s%s", SD_CARD_PATH_PR, path_web);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_enterFold: path->%s, page_index->%d, ip->%s.\n", path_source, page_index, ip);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_enterFold: path->%s, page_index->%d, ip->%s.\n", path_source, page_index, ip);
if (!sd_card_isExist()) {
zte_write_result_to_web(wp, NO_SDCARD);
@@ -1321,14 +1321,14 @@
}
if (!zte_check_file_exist(path_source)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_enterFold path inexist\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_enterFold path inexist\n");
zte_write_result_to_web(wp, FAILURE);
goto end;
//return;
}
//added by fenglei for security begin 20141029
if (zte_httpshare_check_patch_inlegal(path_source)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_enterFold path %s inlegal\n", path_source);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_enterFold path %s inlegal\n", path_source);
zte_write_result_to_web(wp, FAILURE);
goto end;
}
@@ -1377,7 +1377,7 @@
char *path_source = NULL;
char *path_web = neutralize(path_web_tmp);
if(path_web == NULL){
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_new fail %s.\n", path_web_tmp);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_new fail %s.\n", path_web_tmp);
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1387,7 +1387,7 @@
path_source = (char *)malloc(path_source_len);
if (!path_source) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_new malloc fail\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_new malloc fail\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1448,18 +1448,18 @@
char *root_web = neutralize(root_web_tmp);
if(root_web == NULL){
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_del fail %s.\n", root_web_tmp);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_del fail %s.\n", root_web_tmp);
zte_write_result_to_web(wp, FAILURE);
return;
}
int root_path_len = strlen(root_web) + 30;
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_del:dele_path->%s, name->%s.\n", root_web, del_path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_del:dele_path->%s, name->%s.\n", root_web, del_path);
// root_path = (char *)malloc(strlen(root_web)+5);
root_path = (char *)malloc(root_path_len);
if (!root_path) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_del malloc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_del malloc fail.\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1471,7 +1471,7 @@
}
//added by fenglei for security begin 20141029
if (zte_httpshare_check_patch_inlegal(del_path)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_del path is inlegal %s\n", del_path);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_del path is inlegal %s\n", del_path);
zte_write_result_to_web(wp, FAILURE);
goto end;
}
@@ -1514,7 +1514,7 @@
char *rw_auth = websGetVar(wp, "HTTP_SHARE_WR_AUTH", T(""));
char *file_name = websGetVar(wp, "HTTP_SHARE_FILE", T(""));
char *httpshare_status = websGetVar(wp, NV_HTTPSHARE_STATUS, T(""));
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_auth_set:HTTP_SHARE_STATUS->%s, HTTP_SHARE_WR_AUTH->%s, HTTP_SHARE_FILE->%s\n", httpshare_status, rw_auth, file_name);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_auth_set:HTTP_SHARE_STATUS->%s, HTTP_SHARE_WR_AUTH->%s, HTTP_SHARE_FILE->%s\n", httpshare_status, rw_auth, file_name);
if (!strcmp(httpshare_status, "Disabled")) {
(void)zte_web_write(NV_HTTPSHARE_STATUS, httpshare_status);
@@ -1556,23 +1556,23 @@
int fd = -1;
if(old_file_web == NULL || new_file_web == NULL){
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename fail %s %s.\n", old_file_web_tmp, new_file_web_tmp);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename fail %s %s.\n", old_file_web_tmp, new_file_web_tmp);
zte_write_result_to_web(wp, FAILURE);
return;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_rename:old name->%s\n", old_file_web);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_rename:new name->%s\n", new_file_web);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_rename:old name->%s\n", old_file_web);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_rename:new name->%s\n", new_file_web);
// old_file_name= (char *)malloc(strlen(old_file_web)+5);
old_file_name = (char *)malloc(strlen(old_file_web) + 30);
if (!old_file_name) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename malloc fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename malloc fail\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
new_file_name = (char *)malloc(strlen(new_file_web) + 30);
if (!new_file_name) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename malloc fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename malloc fail\n");
zte_write_result_to_web(wp, FAILURE);
goto end2;
}
@@ -1594,23 +1594,23 @@
if ((check_result = zte_check_download_file(old_file_name))) { //ÎÞÏÂÔؼǼ
zte_write_result_to_web(wp, PROCESSING);
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename:path is using\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename:path is using\n");
goto end;
}
//added by fenglei for security end 20141029
fd = rename(old_file_name, new_file_name);
if (fd < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename:rename fail fd->%d\n", fd);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename:rename fail fd->%d\n", fd);
zte_write_result_to_web(wp, FAILURE);
} else {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_rename:rename success, fd->%d\n", fd);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_rename:rename success, fd->%d\n", fd);
zte_httpshare_call_system("/bin/sync"); //write new file from momeroy to sdcard on time
zte_write_result_to_web(wp, SUCCESS);
}
end:
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_httpShare_rename:end2\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]httpShare_rename:end2\n");
free(new_file_name);
new_file_name = NULL;
@@ -1640,7 +1640,7 @@
char *path_source = NULL;
char *path_web = neutralize(path_web_tmp);
if(path_web == NULL){
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_check_file fail %s.\n", path_web_tmp);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_check_file fail %s.\n", path_web_tmp);
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1652,7 +1652,7 @@
}
path_source = (char *)malloc(path_source_len);
if (!path_source) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpShare_check_file malloc fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpShare_check_file malloc fail\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -1766,12 +1766,12 @@
char *ptr = NULL;
if (wp->url == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_path_check error1\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]path_check error1\n");
return 0;
}
if (strlen(wp->url) == 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_path_check error2\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]path_check error2\n");
return 0;
}
snprintf(path_temp, ZTE_HTTPSHARE_FILE_NAME_MAX_LEN, "%s", wp->url);
@@ -1780,10 +1780,10 @@
ptr += strlen("/cgi-bin/httpshare")+1;//ptrÖ¸ÏòÃû³ÆÊ××Öĸ
if (strstr(ptr, "/") != NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_path_check error\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]path_check error\n");
return 0;
}
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_path_check upload name:%s\n", ptr);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]path_check upload name:%s\n", ptr);
return 1;
}
@@ -1820,7 +1820,7 @@
int zte_reset_cgi_state(webs_t wp)
{
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_reset_cgi_state.\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]reset_cgi_state.\n");
#if 0 // kw 3
if (!zte_malloc_cgi_buff()) {
slog(MISC_PRINT, SLOG_ERR,"[httpshare]malloc failed.\n");
@@ -1983,7 +1983,7 @@
zte_del_file(name);
zte_del_file(TCARD_UPLOAD_FILE);
if ((access(name, F_OK) == 0) || (access(TCARD_UPLOAD_FILE, F_OK) == 0)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_check_upload_file del upload file fail!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_check_upload_file del upload file fail!\n");
}
memset(file_buf_memory, 0, FILE_BUFFER_LEN);
memset(&pp_header, 0, sizeof(USER_COMMON_INFOR));
@@ -2003,8 +2003,8 @@
//snprintf(URL,sizeof(URL),"%s",wp->url);
//printf("[iphone]zte_get_upload_filename URL:%s\n",URL);
- slog(MISC_PRINT, SLOG_DEBUG,"[iphone]zte_get_upload_filename url:%s\n", wp->url);
- slog(MISC_PRINT, SLOG_DEBUG,"[iphone]zte_get_upload_filename path:%s\n", wp->path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[iphone]get_upload_filename url:%s\n", wp->url);
+ slog(MISC_PRINT, SLOG_DEBUG,"[iphone]get_upload_filename path:%s\n", wp->path);
if ((wp->path == NULL) || (wp->url == NULL)) {
return -1;
@@ -2012,7 +2012,7 @@
websDecodeUrl(URL, wp->url, gstrlen(wp->url));
- slog(MISC_PRINT, SLOG_DEBUG,"[iphone]zte_get_upload_filename URL:%s\n", URL);
+ slog(MISC_PRINT, SLOG_DEBUG,"[iphone]get_upload_filename URL:%s\n", URL);
if (strlen(URL) <= 0) {
return -1;
@@ -2021,24 +2021,24 @@
temp_name = strstr(URL, "cgi-bin/httpshare");
if (temp_name == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[iphone]zte_get_upload_filename url strstr cgi == NULL\n");
+ slog(MISC_PRINT, SLOG_ERR,"[iphone]get_upload_filename url strstr cgi == NULL\n");
return -1;
}
temp_name += strlen("cgi-bin/httpshare")+1;
- slog(MISC_PRINT, SLOG_DEBUG,"[iphone]zte_get_upload_filename temp:%s\n", temp_name);
+ slog(MISC_PRINT, SLOG_DEBUG,"[iphone]get_upload_filename temp:%s\n", temp_name);
// if (temp_name != NULL) {
if (strlen(temp_name) == 0) {
- slog(MISC_PRINT, SLOG_ERR,"[iphone]zte_get_upload_filename url name == NULL,get name from file header\n");
+ slog(MISC_PRINT, SLOG_ERR,"[iphone]get_upload_filename url name == NULL,get name from file header\n");
return 0;
}
if (strstr(temp_name, "#") != NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[iphone]zte_get_upload_filename url name have #,get name from file header\n");
+ slog(MISC_PRINT, SLOG_ERR,"[iphone]get_upload_filename url name have #,get name from file header\n");
return 0;
}
// }else {
-// slog(MISC_PRINT, SLOG_ERR,"[iphone]zte_get_upload_filename temp == NULL\n");
+// slog(MISC_PRINT, SLOG_ERR,"[iphone]get_upload_filename temp == NULL\n");
// return -1;
// }
@@ -2046,7 +2046,7 @@
memset(pp_current->file_name, 0, sizeof(pp_current->file_name));
snprintf(pp_current->file_name, ZTE_HTTPSHARE_FILE_NAME_MAX_LEN, "%s", temp_name);
- slog(MISC_PRINT, SLOG_DEBUG,"[iphone]zte_get_upload_filename url:%s, temp:%s, pp_header:%s\n", URL, temp_name, pp_current->file_name);
+ slog(MISC_PRINT, SLOG_DEBUG,"[iphone]get_upload_filename url:%s, temp:%s, pp_header:%s\n", URL, temp_name, pp_current->file_name);
return 1;
}
@@ -2062,7 +2062,7 @@
int name_head ;
sp_name = "filename=";
if (NULL == text) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_get_cgi_filename text is null.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]get_cgi_filename text is null.\n");
return NULL;
}
if (!strlen(pp_current->UnixYMDTime)) {
@@ -2075,11 +2075,11 @@
}
pp_current->UnixYMDTime[k] = '\0';
}
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_get_cgi_filename UnixYMDTime is %s.\n", pp_current->UnixYMDTime);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]get_cgi_filename UnixYMDTime is %s.\n", pp_current->UnixYMDTime);
}
name_head = zte_str_index(text, sp_name); //find 'filename='
- //printf("[httpshare]zte_get_cgi_filename head is %d.\n",name_head);
+ //printf("[httpshare]get_cgi_filename head is %d.\n",name_head);
if (name_head > 0) {
for (i = name_head; * (text + i) != '\0'; i++) { //ÕÒµ½filename="test.doc"µÄµÚÒ»¸öÒýºÅλÖÃ
if (*(text + i) == '"') {
@@ -2127,7 +2127,7 @@
{
char *fdindex = NULL;
if (!buf) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_cgi_parse_file_head file head is null\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]cgi_parse_file_head file head is null\n");
return NULL;
}
@@ -2169,7 +2169,7 @@
user->infor.file_head = ZTE_CGI_PARSE_FINDE_FILE_HEAD;
user->infor.file_head_len++;
fdindex++;
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_cgi_parse_file_head file_head_len %d.\n", user->infor.file_head_len);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]cgi_parse_file_head file_head_len %d.\n", user->infor.file_head_len);
return fdindex;//Êý¾ÝÆðʼ
} else {
user->infor.file_head = ZTE_CGI_PARSE_FILE_HEAD_BEGIN;
@@ -2186,7 +2186,7 @@
{
char *fdindex = NULL;
if (!buf) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_cgi_parse_file_tail_address file tail is null\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]cgi_parse_file_tail_address file tail is null\n");
return NULL;
}
@@ -2215,7 +2215,7 @@
if ((*fdindex) == 13) {
user->infor.file_tail_addres = ZTE_CGI_PARSE_FINDE_FILE_TAIL_ADD;
user->infor.file_tail_len++;
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_cgi_parse_file_tail_address found file tail,file_tail_len->%d.\n", user->infor.file_tail_len);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]cgi_parse_file_tail_address found file tail,file_tail_len->%d.\n", user->infor.file_tail_len);
return fdindex;//file_tail start
} else {
user->infor.file_tail_addres = ZTE_CGI_PARSE_FILE_TAIL_ADD_BEGIN;
@@ -2244,12 +2244,12 @@
slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]file info: tail len->%d.\n", pp_current->infor.file_tail_len);
if (file_tail) {
pp_current->infor.file_tail_len = strlen(file_tail);
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_cgi_parse_file_tail file tail len is %d\n", pp_current->infor.file_tail_len);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]cgi_parse_file_tail file tail len is %d\n", pp_current->infor.file_tail_len);
slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]file info: tail->%s.\n", file_tail);
pp_current->infor.file_tail = ZTE_CGI_PARSE_FINDE_TAIL_IN_FILE;
return file_tail;
} else {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_cgi_parse_file_tail file_tail not found\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]cgi_parse_file_tail file_tail not found\n");
return NULL;
}
} else {
@@ -2290,15 +2290,15 @@
boolean zte_bufer_combination(char *buf, int size)
{
if ((tcard_file_size + size) < FILE_BUFFER_LEN - WEBS_SOCKET_BUFSIZ) {
- //printf("[httpshare]zte_bufer_combination tcard_file_size->%d,size->%d.\n",tcard_file_size,size);
- //printf("[httpshare]zte_bufer_combination FILE_BUFFER_LEN->%d,WEBS_SOCKET_BUFSIZ->%d.\n",FILE_BUFFER_LEN,WEBS_SOCKET_BUFSIZ);
+ //printf("[httpshare]bufer_combination tcard_file_size->%d,size->%d.\n",tcard_file_size,size);
+ //printf("[httpshare]bufer_combination FILE_BUFFER_LEN->%d,WEBS_SOCKET_BUFSIZ->%d.\n",FILE_BUFFER_LEN,WEBS_SOCKET_BUFSIZ);
memcpy(file_buf_memory_ptr, buf, size);
file_buf_memory_ptr = file_buf_memory_ptr + size;
tcard_file_size = tcard_file_size + size;
- //printf("[httpshare]zte_bufer_combination tcard_file_size->%d,size->%d.\n",tcard_file_size,size);
+ //printf("[httpshare]bufer_combination tcard_file_size->%d,size->%d.\n",tcard_file_size,size);
return FALSE;
} else {
- //printf("[httpshare]zte_bufer_combination begin to write file \n");
+ //printf("[httpshare]bufer_combination begin to write file \n");
memcpy(file_buf_memory_ptr, buf, size);
file_buf_memory_ptr = file_buf_memory_ptr + size;
@@ -2319,17 +2319,17 @@
//}
if (NULL == pp_current) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_write:zte_get_user_position failed\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_write:get_user_position failed\n");
return -1;
}
if (1 != zte_check_sdcard_exist()) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_write:zte_get_user_position failed\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_write:get_user_position failed\n");
return -1;
}
file_handler = open(pp_current->path, O_CREAT | O_WRONLY | O_APPEND, 0666);
if (file_handler < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_write zte write file open file failed\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_write write file open file failed\n");
return -1;
} else {
(void)write(file_handler, file_buf_memory, tcard_file_size);
@@ -2338,7 +2338,7 @@
tcard_file_size = 0;
file_close = close(file_handler);
if (file_close < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_httpshare_write zte write file close file failed\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]httpshare_write write file close file failed\n");
return -1;
}
@@ -2376,7 +2376,7 @@
left_size = zte_clen - nbytes;
if (left_size < ZTE_PARSE_CGI_TAIL_LEN) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_process_cgi_write left_size->%d.nbytes->%d\n", left_size, nbytes);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]process_cgi_write left_size->%d.nbytes->%d\n", left_size, nbytes);
file_tail = zte_cgi_parse_file_tail(pp_current, left_size, text, nbytes); //ÕÒµ½tail λÖÃ
slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]file_tail->%-*.*s.\n", pp_current->infor.file_tail_len, pp_current->infor.file_tail_len, file_tail);
}
@@ -2388,19 +2388,19 @@
}
if (pp_current->infor.file_tail == ZTE_CGI_PARSE_FINDE_TAIL_IN_FILE) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_process_cgi_write ZTE_CGI_PARSE_FINDE_TAIL_IN_FILE.\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]process_cgi_write CGI_PARSE_FINDE_TAIL_IN_FILE.\n");
if (file_tail == file_head) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_write it is a null file\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_write it is a null file\n");
file_close = close(open(pp_current->path, O_CREAT, 0666));
if (file_close < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_write zte write file close file failed\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_write write file close file failed\n");
}
return -1;
}
if (file_tail - file_head < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_write file_tail-file_head = %d < 0\n", file_tail - file_head);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_write file_tail-file_head = %d < 0\n", file_tail - file_head);
return -1;
}
slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]file_tail-file_head->%d.\n", file_tail - file_head);
@@ -2408,7 +2408,7 @@
} else if (pp_current->infor.file_tail == ZTE_CGI_PARSE_FINDE_TAIL_IN_POOL) {
(void)zte_write_file(wp, pp_current->infor.file_tail_pool, (file_tail - pp_current->infor.file_tail_pool));
} else {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_write some erro happened\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_write some erro happened\n");
}
} else {
@@ -2420,7 +2420,7 @@
pp_current->infor.data_no = ZTE_CGI_WRITE_THE_SEC_DATA;
- printf("[httpshare]zte_process_cgi_write file head len-> %d\n", pp_current->infor.file_head_len);
+ printf("[httpshare]process_cgi_write file head len-> %d\n", pp_current->infor.file_head_len);
} else {
(void)zte_write_file(wp, file_head, nbytes);
}
@@ -2455,20 +2455,20 @@
}
if (pp_current->infor.file_tail == ZTE_CGI_PARSE_FINDE_TAIL_IN_FILE) {
- printf("[httpshare]zte_process_cgi_write ZTE_CGI_PARSE_FINDE_TAIL_IN_FILE.\n");
+ printf("[httpshare]process_cgi_write CGI_PARSE_FINDE_TAIL_IN_FILE.\n");
//if(file_tail==file_head)
//{
- // printf("[httpshare]zte_process_cgi_write it is a null file\n");
+ // printf("[httpshare]process_cgi_write it is a null file\n");
// file_close=close(open(pp_current->path, O_CREAT,0666 ));
// if(file_close<0)
// {
- // printf("[httpshare]zte_process_cgi_write zte write file close file failed\n");
+ // printf("[httpshare]process_cgi_write write file close file failed\n");
// return -1;
// }
//}
if (file_tail - file_head < 0) {
- printf("[httpshare]zte_process_cgi_write file_tail-file_head = %d < 0\n", file_tail - file_head);
+ printf("[httpshare]process_cgi_write file_tail-file_head = %d < 0\n", file_tail - file_head);
return -1;
}
@@ -2478,7 +2478,7 @@
file_end = TRUE;
ret = zte_write_file(wp, pp_current->infor.file_tail_pool, (file_tail - pp_current->infor.file_tail_pool), pp_current);
} else {
- printf("[httpshare]zte_process_cgi_write some erro happened\n");
+ printf("[httpshare]process_cgi_write some erro happened\n");
ret = 0;
}
@@ -2495,7 +2495,7 @@
}
}
}
- //printf("[zyl]zte_process_cgi_write:ret->%d\n",ret);
+ //printf("[zyl]process_cgi_write:ret->%d\n",ret);
return ret;
}
@@ -2513,7 +2513,7 @@
//pp_current = zte_get_user_position(wp);
// if (NULL == pp_current || NULL == text) { // kw 3 pp_current point to pp_aheader's address, can not be NULL
if (NULL == text) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_begin recv failed.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_begin recv failed.\n");
return -1;
}
if (pp_current->card_full) {
@@ -2531,10 +2531,10 @@
return 1;
}
#endif
- //printf("[httpshare]file info: zte_clen->%d.\n",zte_clen);
+ //printf("[httpshare]file info: clen->%d.\n",zte_clen);
if (pp_current->infor.file_head != ZTE_CGI_PARSE_FINDE_FILE_HEAD) {
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte upload to fild head.\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]upload to fild head.\n");
file_head = zte_cgi_parse_file_head(zte_get_cgi_filename(wp, text, pp_current), pp_current);
//ÕÒµ½Êý¾ÝÆðʼλfile_head
@@ -2572,13 +2572,13 @@
struct stat statbuf;
if (!temp_file_name) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_file_complete:path NULL\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_file_complete:path NULL\n");
return 0;
}
if (!strlen(temp_file_name)) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_file_complete:strlen(path)==0\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_file_complete:strlen(path)==0\n");
return 0;
}
@@ -2592,7 +2592,7 @@
//slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]ret is %d\n", ret);
if (stat(temp_file_name, &statbuf) < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_check_file_complete stat : %s[%s]\n", strerror(errno),temp_file_name);
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]check_file_complete stat : %s[%s]\n", strerror(errno),temp_file_name);
return 0;
}
file_should_size = user->infor.file_raw_size - user->infor.file_head_len - user->infor.file_tail_len;
@@ -2643,7 +2643,7 @@
{
websDone(wp, 200);
sleep(1);
- slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]zte_process_cgi_end websDone\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"[httpshare]process_cgi_end websDone\n");
zte_remove_user();
return 1;
}
@@ -2653,12 +2653,12 @@
USER_COMMON_INFOR *pp_current = &pp_header;
#if 0 // kw 3 pp_current points to pp_haader' address, can not be null
if (NULL == pp_current) {
- slog(MISC_PRINT, SLOG_ERR,"[httpshare]zte_process_cgi_end pp_current NULL.\n");
+ slog(MISC_PRINT, SLOG_ERR,"[httpshare]process_cgi_end pp_current NULL.\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
#endif
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_process_cgi_end path =%s\n", pp_current->path);
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]process_cgi_end path =%s\n", pp_current->path);
if (pp_current->card_full) {
unlink(pp_current->path);
zte_write_httpShare_upload_result_to_web(wp, FAILURE, "space_not_enough");
@@ -2668,7 +2668,7 @@
if (!zte_check_file_complete(pp_current->path, pp_current)) {
unlink(pp_current->path);
zte_write_httpShare_upload_result_to_web(wp, FAILURE, "data_lost");
- slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]zte_process_cgi_end data_lost.\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[httpshare]process_cgi_end data_lost.\n");
return;
} else {
(void)zte_httpshare_call_system("/bin/sync"); //write new file from momeroy to sdcard on time
diff --git a/ap/app/goahead/interface5.0/zte_web_mc.c b/ap/app/goahead/interface5.0/zte_web_mc.c
index 908dc61..dcd26c4 100644
--- a/ap/app/goahead/interface5.0/zte_web_mc.c
+++ b/ap/app/goahead/interface5.0/zte_web_mc.c
@@ -36,7 +36,7 @@
/*check the input param*/
if (msg_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_send_msg fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_send_msg fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -47,18 +47,18 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_SendReq) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_send_msg_ui_req_info_s_type is more than the msg buf , sizeof(zte_sms_send_msg_ui_req_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_send_msg_ui_req_info_s_type is more than the msg buf , sizeof(sms_send_msg_ui_req_info_s_type) = %d!"
, sizeof(T_zUfiSms_SendReq));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, msg_ptr, sizeof(T_zUfiSms_SendReq));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms send msg start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms send msg start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SEND_SMS, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SEND_SMS, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms send msg end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms send msg end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send msg fail"); /*lint !e26*/
@@ -98,17 +98,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_ModifyFlag) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_mc_relay_sms_modify_s_type is more than the msg buf , sizeof(zte_mc_relay_sms_modify_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of mc_relay_sms_modify_s_type is more than the msg buf , sizeof(mc_relay_sms_modify_s_type) = %d!"
, sizeof(T_zUfiSms_ModifyFlag));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, modify_info_tmp, sizeof(T_zUfiSms_ModifyFlag));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms modify tag start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms modify tag start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SMS_MODIFY_TAG, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SMS_MODIFY_TAG, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms modify tag end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms modify tag end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send modify tag msg fail"); /*lint !e26*/
@@ -138,7 +138,7 @@
/*check the input param*/
if (msg_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_write_msg fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_write_msg fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -149,17 +149,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_SaveReq) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_write_msg_info_s_type is more than the msg buf , sizeof(zte_sms_write_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_write_msg_info_s_type is more than the msg buf , sizeof(sms_write_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_SaveReq));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, msg_ptr, sizeof(T_zUfiSms_SaveReq));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms write msg start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms write msg start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_DRAFTS_SAVE,sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_DRAFTS_SAVE, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms write msg end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms write msg end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send write msg fail"); /*lint !e26*/
@@ -189,14 +189,14 @@
/*check the input param*/
if (del_info_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"the zte_mc_relay_sms_delete_msg fun's input param is valid!");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"the mc_relay_sms_delete_msg fun's input param is valid!");/*lint !e26*/
return -1;
}
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_DelReq) > MSG_DATA_MAX_LEN) {
- slog(MISC_PRINT, SLOG_ERR,"the size of zte_sms_delete_msg_info_s_type is more than the msg buf , sizeof(zte_sms_delete_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR,"the size of sms_delete_msg_info_s_type is more than the msg buf , sizeof(sms_delete_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_DelReq));/*lint !e26*/
return -1;
}
@@ -207,7 +207,7 @@
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL, MSG_CMD_DEL_SMS_BY_INDEX, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_INDEX, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr, 0);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_send_message sms delete msg end!");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"send_message sms delete msg end!");/*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR,"mc lib relay sms send delete msg fail");/*lint !e26*/
return -1;
@@ -233,26 +233,26 @@
/*check the input param*/
if (del_info_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_move_to_sim_msg fun's input param is valid!");
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_move_to_sim_msg fun's input param is valid!");
return -1;
}
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_DelReq) > MSG_DATA_MAX_LEN) {
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_delete_msg_info_s_type is more than the msg buf , sizeof(zte_sms_delete_msg_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_delete_msg_info_s_type is more than the msg buf , sizeof(sms_delete_msg_info_s_type) = %d!"
, sizeof(T_zUfiSms_DelReq));
return -1;
}
#endif
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms move to sim msg start!");
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms move to sim msg start!");
//slog(MISC_PRINT,SLOG_DEBUG,"del_info_ptr->db is %d\n",del_info_ptr->db);
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL, MSG_CMD_COPY_SMS, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_COPY_SMS, sizeof(T_zUfiSms_DelReq), (char *)del_info_ptr, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms move to sim msg end!");
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms move to sim msg end!");
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms send move to sim msg fail");
return -1;
@@ -279,7 +279,7 @@
/*check the input param*/
if (parameter_ptr == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_sms_set_parameter fun's input param is valid!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_sms_set_parameter fun's input param is valid!"); /*lint !e26*/
return -1;
}
@@ -290,17 +290,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(T_zUfiSms_ParaInfo) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_sms_parameter_info_s_type is more than the msg buf , sizeof(zte_sms_parameter_info_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of sms_parameter_info_s_type is more than the msg buf , sizeof(sms_parameter_info_s_type) = %d!"
, sizeof(T_zUfiSms_ParaInfo));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, parameter_ptr, sizeof(T_zUfiSms_ParaInfo));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message sms set parameter( start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message sms set parameter( start!"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,MSG_CMD_SMS_LOCATION_SET, sizeof(send_msg), (char*)&send_msg);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_SMS_LOCATION_SET, sizeof(send_msg), (char*)&send_msg, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message sms set parameter( end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message sms set parameter( end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay sms set parameter msg fail"); /*lint !e26*/
@@ -332,11 +332,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_create_modify_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_create_modify_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_create_modify_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_create_modify_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -345,17 +345,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_create_ext_record_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_create_ext_record_s_type is more than the msg buf , sizeof(zte_pbm_create_ext_record_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_create_ext_record_s_type is more than the msg buf , sizeof(pbm_create_ext_record_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_create_ext_record_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM create modify record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM create modify record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM create modify record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM create modify record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm send create modify record fail"); /*lint !e26*/
@@ -386,11 +386,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_one_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_one_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -399,17 +399,17 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
#endif
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del one record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del one record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del one record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del one record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del one record msg fail"); /*lint !e26*/
@@ -438,11 +438,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_multi_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_multi_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_multi_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -451,7 +451,7 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
@@ -459,10 +459,10 @@
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del multi record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del multi record start!"); /*lint !e26*/
#if 0 // cov M when zte_send_message is commented, ret_code!= OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del multi record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del multi record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del multi record msg fail"); /*lint !e26*/
@@ -492,11 +492,11 @@
/*check the input param*/
if (pbm_recv_record == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "the zte_mc_relay_pbm_del_all_record fun's input is NULL "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "the mc_relay_pbm_del_all_record fun's input is NULL "); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG, "enter the zte_mc_relay_pbm_del_all_record fun "); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "enter the mc_relay_pbm_del_all_record fun "); /*lint !e26*/
/*set the value*/
send_msg.msg_hdr.type = ZTE_PBM_RELAY_TYPE;
@@ -505,7 +505,7 @@
#if 0 // kw 3 INVARIANT_CONDITION.UNREACH
/*check the length before memcpy for safe*/
if (sizeof(zte_pbm_del_multi_records_s_type) > ZTE_MODEM_RELAY_MSGBUF_MAX_LEN) { /*lint !e506*/
- slog(MISC_PRINT, SLOG_ERR, "the size of zte_pbm_del_multi_records_s_type is more than the msg buf , sizeof(zte_pbm_del_multi_records_s_type) = %d!"
+ slog(MISC_PRINT, SLOG_ERR, "the size of pbm_del_multi_records_s_type is more than the msg buf , sizeof(pbm_del_multi_records_s_type) = %d!"
, sizeof(zte_pbm_create_ext_record_s_type));/*lint !e26*/
return -1;
}
@@ -513,10 +513,10 @@
memcpy(send_msg.msg_data, pbm_recv_record, sizeof(zte_pbm_del_multi_records_s_type));
- slog(MISC_PRINT, SLOG_NORMAL, "zte_send_message PBM del all record start!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "send_message PBM del all record start!"); /*lint !e26*/
#if 0 // cov M // when zte_send_message is commented, ret_code != OK is unreachable
//ret_code = zte_send_message(ZTE_SOCKET_PATH_MAIN_CONTROL, sizeof(send_msg), (char*)&send_msg);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_send_message PBM del all record end!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "send_message PBM del all record end!"); /*lint !e26*/
if (ret_code != OK) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm del all record msg fail"); /*lint !e26*/
diff --git a/ap/app/goahead/interface5.0/zte_web_mgmt.c b/ap/app/goahead/interface5.0/zte_web_mgmt.c
index a4e1311..37b1c15 100755
--- a/ap/app/goahead/interface5.0/zte_web_mgmt.c
+++ b/ap/app/goahead/interface5.0/zte_web_mgmt.c
@@ -147,9 +147,9 @@
psw_check_result_type_t psw_cheak_result = PSW_EMPTY;
char buf[CONFIG_DEFAULT_LENGTH] = {0};
- slog(MISC_PRINT, SLOG_DEBUG,"[login] zte_mgmt_login enter====\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[login] mgmt_login enter====\n");
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login: wp is null.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login: wp is null.");/*lint !e26*/
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
@@ -158,13 +158,13 @@
user = websGetVar(wp, T("username"), NULL);
if ('\0' == (*psw)) {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login: psw is empty.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login: psw is empty.");/*lint !e26*/
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
if (user != NULL) {
- slog(MISC_PRINT, SLOG_DEBUG," zte_mgmt_login user = %s\n", user);
+ slog(MISC_PRINT, SLOG_DEBUG," mgmt_login user = %s\n", user);
pUser = (char *)zte_base64_decode((const unsigned char *)user, strlen(user), (unsigned int*)&user_name_len);
if (NULL == pUser) {
zte_write_result_to_web(wp, LOGIN_FAIL);
@@ -178,25 +178,25 @@
snprintf(user_name,sizeof(user_name),"%s",pUser);
free(pUser);
- slog(MISC_PRINT, SLOG_DEBUG," zte_mgmt_login user_name = %s\n", user_name);
+ slog(MISC_PRINT, SLOG_DEBUG," mgmt_login user_name = %s\n", user_name);
sc_cfg_get("admin_user", buf, sizeof(buf));
if (0 != strcmp(user_name, buf)) {
- slog(MISC_PRINT, SLOG_ERR," zte_mgmt_login user_name fail \n");
+ slog(MISC_PRINT, SLOG_ERR," mgmt_login user_name fail \n");
zte_write_result_to_web(wp, LOGIN_USER_NAME_NOT_EXSIT);
return;
}
- slog(MISC_PRINT, SLOG_DEBUG," zte_mgmt_login uername correct \n");
+ slog(MISC_PRINT, SLOG_DEBUG," mgmt_login uername correct \n");
}
- slog(MISC_PRINT, SLOG_DEBUG,"[login] login1 -> zte_password_encode:%s.\n", psw); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[login] login1 -> password_encode:%s.\n", psw); /*lint !e26*/
#ifdef WEBS_SECURITY
zte_password = js_aes_decode(psw, strlen(psw), (unsigned int*)&zte_password_len);
#else
zte_password = (char *)zte_base64_decode((const unsigned char *)psw, strlen(psw), (unsigned int*)&zte_password_len);
#endif
- slog(MISC_PRINT, SLOG_DEBUG,"[login] login2 -> zte_password:%s.\n", zte_password); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[login] login2 -> password:%s.\n", zte_password); /*lint !e26*/
if (NULL == zte_password) {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login: psw is empty.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login: psw is empty.\n");/*lint !e26*/
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
@@ -207,11 +207,11 @@
snprintf(zte_psw_admin,sizeof(zte_psw_admin),"%s",zte_password);
//strncpy(zte_psw_admin, zte_password, zte_password_len);
free(zte_password);
- slog(MISC_PRINT, SLOG_DEBUG,"[login] login3 -> zte_psw_admin:%s.\n", zte_psw_admin); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[login] login3 -> psw_admin:%s.\n", zte_psw_admin); /*lint !e26*/
psw_cheak_result = zte_password_check(wp, zte_psw_admin);
if (psw_cheak_result != PSW_OK) {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login psw_cheak_result != PSW_OK\n");
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login psw_cheak_result != PSW_OK\n");
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
@@ -220,7 +220,7 @@
ip_address = websGetRequestIpaddr(wp);
#if 0 // kw 3
if (NULL == ip_address) {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login: ip_address is null.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login: ip_address is null.\n");/*lint !e26*/
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
@@ -235,7 +235,7 @@
}
} else {
zte_reduct_login_times();
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login: error pass.");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login: error pass.");/*lint !e26*/
zte_write_result_to_web(wp, LOGIN_BAD_PASSWORD);
security_log(MODULE_ID_WEB_CGI,"web login err pwd ip=%s",ip_address);
return;
@@ -283,7 +283,7 @@
security_log(MODULE_ID_WEB_CGI,"web login suc ip=%s",ip_address);
return;
} else {
- slog(MISC_PRINT, SLOG_ERR,"[login] zte_mgmt_login_timemark_set fail\n");
+ slog(MISC_PRINT, SLOG_ERR,"[login] mgmt_login_timemark_set fail\n");
zte_write_result_to_web(wp, LOGIN_FAIL);
return;
}
@@ -339,7 +339,7 @@
luser_login_timemark = atol(user_login_timemark);
if(luser_login_timemark < 0 || luser_login_timemark > LONG_MAX-1){
luser_login_timemark = LONG_MAX;
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mgmt_login_timemark_check: user_login_timemark is out of range [0, LONG_MAX).");
+ slog(MISC_PRINT, SLOG_DEBUG, "mgmt_login_timemark_check: user_login_timemark is out of range [0, LONG_MAX).");
}
sem_id = get_sem(TIME_SEM_KEY_2);
@@ -353,7 +353,7 @@
}
if ((time_now - luser_login_timemark) > LOGIN_TIMEOUT) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mgmt_login_timemark_check: the login is timeout .");
+ slog(MISC_PRINT, SLOG_DEBUG, "mgmt_login_timemark_check: the login is timeout .");
(void)zte_web_write(NV_USER_IP_ADDR, "");
(void)zte_web_write(NV_LOGINFO, "timeout");
(void)zte_web_write(NV_COOKIE_ID, "");
@@ -420,7 +420,7 @@
//sc_cfg_save();
if ('\0' == (*language)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_set_language: web para:[language] is empty string.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_set_language: web para:[language] is empty string.\n"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -456,20 +456,20 @@
{
/* if(verify_device_key(auth,strlen(auth),SEED,strlen(SEED)) != 1)
{
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_set_devicemode: auth %s fail.\n",auth);
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_set_devicemode: auth %s fail.\n",auth);
zte_write_result_to_web(wp, "set_devicemode fail:auth fail!");
return;
}*/
}
if ('\0' == (*debug_enable)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_set_devicemode: web para:[debug_enable] is empty string.\n");
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_set_devicemode: web para:[debug_enable] is empty string.\n");
zte_write_result_to_web(wp, "set_devicemode fail:parameter debug_enable is empty!");
return;
}
if (atoi(debug_enable) < 0 || atoi(debug_enable) > 3) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_set_devicemode: web para:[debug_enable] is illegal string.\n");
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_set_devicemode: web para:[debug_enable] is illegal string.\n");
zte_write_result_to_web(wp, "set_devicemode fail:parameter debug_enable is illegal!");
return;
}
@@ -595,7 +595,7 @@
void zte_goform_mgmt_syslog_process(webs_t wp)
{
- slog(MISC_PRINT, SLOG_DEBUG, "zte_goform_mgmt_syslog_process coming\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "goform_mgmt_syslog_process coming\n"); /*lint !e26*/
char_t *syslog_mode = NULL;
/* get value from web page */
syslog_mode = websGetVar(wp, T("syslog_mode"), T("all"));
@@ -788,7 +788,7 @@
slog(MISC_PRINT, SLOG_DEBUG, "current_psw or new_psw is NULL\n"); /*lint !e26*/
return -1;
}
- slog(MISC_PRINT, SLOG_NORMAL,"zte_mgmt_check_password old_psw:%s!\n", old_psw);
+ slog(MISC_PRINT, SLOG_NORMAL,"mgmt_check_password old_psw:%s!\n", old_psw);
if(old_psw_len < sizeof(old_psw_admin))
snprintf(old_psw_admin,old_psw_len+1,"%s",old_psw);
else
@@ -797,7 +797,7 @@
free(old_psw);
if (DATA_NO_SAFE == zte_Safe_noSpecialChar(old_psw_admin)) {
- slog(MISC_PRINT, SLOG_ERR,"zte_mgmt_check_password old_psw_admin Get Data is no Safe!\n");
+ slog(MISC_PRINT, SLOG_ERR,"mgmt_check_password old_psw_admin Get Data is no Safe!\n");
sc_cfg_set("data_safe", "failed");
return -1;
}
@@ -812,7 +812,7 @@
sc_cfg_set(NV_WEB_TOKEN, "");
security_log(MODULE_ID_WEB_CGI,"web checkpwd fail logout");
#endif
- slog(MISC_PRINT, SLOG_ERR,"zte_mgmt_check_password admin_Password fail!\n");
+ slog(MISC_PRINT, SLOG_ERR,"mgmt_check_password admin_Password fail!\n");
return -1;
}
}
@@ -851,8 +851,8 @@
return -1;
}
- slog(MISC_PRINT, SLOG_DEBUG,"zte_mgmt_handle_account new_psw:%s!\n", new_psw);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_mgmt_handle_account new_user:%s!\n", new_user);
+ slog(MISC_PRINT, SLOG_DEBUG,"mgmt_handle_account new_psw:%s!\n", new_psw);
+ slog(MISC_PRINT, SLOG_DEBUG,"mgmt_handle_account new_user:%s!\n", new_user);
if(new_psw_len < sizeof(new_psw_admin))
snprintf(new_psw_admin,new_psw_len+1,"%s",new_psw);
else
@@ -867,20 +867,20 @@
free(new_user);
if (LOGIN_PSW_MIN_LEN > new_psw_len || LOGIN_PSW_MAX_LEN < new_psw_len) {
- slog(MISC_PRINT, SLOG_ERR,"zte_mgmt_handle_account new_psw_len is too long!\n");
+ slog(MISC_PRINT, SLOG_ERR,"mgmt_handle_account new_psw_len is too long!\n");
sc_cfg_set("data_safe", "failed");
return -1;
}
if (LOGIN_PSW_MIN_LEN > new_user_len || LOGIN_PSW_MAX_LEN < new_user_len) {
- slog(MISC_PRINT, SLOG_ERR,"zte_mgmt_handle_account new_user_len is too long!\n");
+ slog(MISC_PRINT, SLOG_ERR,"mgmt_handle_account new_user_len is too long!\n");
sc_cfg_set("data_safe", "failed");
return -1;
}
if (DATA_NO_SAFE == zte_Safe_noSpecialChar(new_psw_admin)
|| DATA_NO_SAFE == zte_Safe_noSpecialChar(new_user_admin)) {
- slog(MISC_PRINT, SLOG_ERR,"zte_mgmt_handle_account Get Data is no Safe!\n");
+ slog(MISC_PRINT, SLOG_ERR,"mgmt_handle_account Get Data is no Safe!\n");
sc_cfg_set("data_safe", "failed");
return -1;
}
@@ -903,13 +903,13 @@
system("smbd -D");
system("nmbd -D");
*/
- slog(MISC_PRINT, SLOG_DEBUG,"zte_mgmt_handle_account success!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"mgmt_handle_account success!\n");
return 0;
}
void zte_mgmt_change_account(webs_t wp)
{
- slog(MISC_PRINT, SLOG_NORMAL,"zte_mgmt_change_account ====================!\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"mgmt_change_account ====================!\n");
if (0 != zte_mgmt_check_password(wp)) {
zte_write_result_to_web(wp, FAILURE);
@@ -1112,7 +1112,7 @@
slog(MISC_PRINT, SLOG_NORMAL, T("UFIx User disable pin!\n"));
(void)zte_web_write("pin_manage_process", "begin");
- slog(MISC_PRINT, SLOG_NORMAL, "zte_goform_mgmt_pin_mgmt_process send message: ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE");
+ slog(MISC_PRINT, SLOG_NORMAL, "goform_mgmt_pin_mgmt_process send message: ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE");
ret = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_PIN_MANAGE_REQ, sizeof(T_zAt_PinManage), (UCHAR *)¶, 0);
if (0 != ret) {
sc_cfg_set("pin_manage_process", "");
@@ -1184,7 +1184,7 @@
slog(MISC_PRINT, SLOG_NORMAL, T("UFIx User enable pin!\n"));
(void)zte_web_write("pin_manage_process", "begin");
- slog(MISC_PRINT, SLOG_NORMAL, "zte_mgmt_enable_pin send message : ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE.");
+ slog(MISC_PRINT, SLOG_NORMAL, "mgmt_enable_pin send message : ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE.");
ret = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_PIN_MANAGE_REQ, sizeof(T_zAt_PinManage), (UCHAR *)¶, 0);
if (0 != ret) {
sc_cfg_set("pin_manage_process", "");
@@ -1246,7 +1246,7 @@
strncpy(para.oldPin, pOldPin,sizeof(para.oldPin)-1);
strncpy(para.newPin, pNewPin,sizeof(para.newPin)-1);
(void)zte_web_write("pin_manage_process", "begin");
- slog(MISC_PRINT, SLOG_NORMAL, "zte_mgmt_modify_pin send message : ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE.");
+ slog(MISC_PRINT, SLOG_NORMAL, "mgmt_modify_pin send message : ZUFI_MODULE_ID_AT_MAIN, MSG_CMD_WEB_REQ_PIN_MANAGE.");
ret = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_PIN_MANAGE_REQ, sizeof(T_zAt_PinManage), (UCHAR *)¶, 0);
if (0 != ret) {
sc_cfg_set("pin_manage_process", "");
@@ -1432,7 +1432,7 @@
zte_write_result_to_web(wp, FAILURE);
} else {
if (!zte_mgmt_login_timemark_set()) {
- slog(MISC_PRINT, SLOG_ERR, "[ERROR]zte_goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "[ERROR]goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
}
@@ -1474,7 +1474,7 @@
zte_write_result_to_web(wp, FAILURE);
} else {
if (!zte_mgmt_login_timemark_set()) {
- slog(MISC_PRINT, SLOG_ERR, "[ERROR]zte_goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "[ERROR]goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
}
@@ -2651,7 +2651,7 @@
if (0 == strcmp(update_action, FOTA_ACTION_CONFIRM_DOWNLOAD)) {
zte_web_write(NV_FOTA_UPGRADE_SELECTOR, "accept");
//zte_web_write(NV_FOTA_NEED_USER_CONFIRM,"0");
- slog(MISC_PRINT, SLOG_DEBUG,"web :zte_fota_update. update_action = FOTA_ACTION_CONFIRM_DOWNLOAD, set NV_FOTA_UPGRADE_SELECTOR accept!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"web :fota_update. update_action = FOTA_ACTION_CONFIRM_DOWNLOAD, set NV_FOTA_UPGRADE_SELECTOR accept!\n");
//zte_fota_SendMsg2DM(MSG_CMD_FOTA_WEBUI_START_DOWNLOAD);
//ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_DM_WEBUI_AT,MSG_CMD_FOTA_WEBUI_START_DOWNLOAD, 2, "1", 0);
iDlPara = 1;
@@ -2661,11 +2661,11 @@
zte_web_write(NV_FOTA_NEW_VERSION_STATE, IDLE);
zte_web_write(NV_FOTA_CURR_UPGRADE_STATE, IDLE);
- slog(MISC_PRINT, SLOG_DEBUG,"web :zte_fota_update. update_action = FOTA_ACTION_CANCEL_DOWNLOAD, set NV_FOTA_UPGRADE_SELECTOR cancel!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"web :fota_update. update_action = FOTA_ACTION_CANCEL_DOWNLOAD, set NV_FOTA_UPGRADE_SELECTOR cancel!\n");
zte_write_result_to_web(wp, SUCCESS);
return; //no need to send msg to ota module
} else if (0 == strcmp(update_action, "check")) {
- slog(MISC_PRINT, SLOG_DEBUG,"goahead :zte_fota_update. begin to check!!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"goahead :fota_update. begin to check!!\n");
zte_fota_SendMsg2DM(MSG_CMD_FOTA_WEBUI_START_FOTA);
}
@@ -2696,8 +2696,8 @@
updateMode = websGetVar(wp, T("UpgMode"), T(""));
allowRoamingUpdate = websGetVar(wp, T("UpgRoamPermission"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG,"zte_fota_settings web para:[updateMode] is [%s].\n", updateMode);
- slog(MISC_PRINT, SLOG_DEBUG,"zte_fota_settings web para:[allowRoamingUpdate] is [%s].\n", allowRoamingUpdate);
+ slog(MISC_PRINT, SLOG_DEBUG,"fota_settings web para:[updateMode] is [%s].\n", updateMode);
+ slog(MISC_PRINT, SLOG_DEBUG,"fota_settings web para:[allowRoamingUpdate] is [%s].\n", allowRoamingUpdate);
if ('\0' == (*updateMode)) {
zte_write_result_to_web(wp, FAILURE);
@@ -2759,9 +2759,9 @@
return;
}
- WEBLOG("zte_get_fota_settings:[updateMode] is [%s].\n", updateMode);
- WEBLOG("zte_get_fota_settings:[updateIntervalDay] is [%s].\n", updateIntervalDay);
- WEBLOG("zte_get_fota_settings:[allowRoamingUpdate] is [%s].\n", allowRoamingUpdate);
+ WEBLOG("get_fota_settings:[updateMode] is [%s].\n", updateMode);
+ WEBLOG("get_fota_settings:[updateIntervalDay] is [%s].\n", updateIntervalDay);
+ WEBLOG("get_fota_settings:[allowRoamingUpdate] is [%s].\n", allowRoamingUpdate);
web_feedback_header(wp);
zte_rest_cmd_write_head(wp);
@@ -2808,7 +2808,7 @@
void zte_wan_lock_frequency_process(webs_t wp)
{
- slog(MISC_PRINT, SLOG_NORMAL, "zte_wan_lock_frequency_process coming");
+ slog(MISC_PRINT, SLOG_NORMAL, "wan_lock_frequency_process coming");
CHAR *actionlte = NULL;
CHAR *uarfcnlte = NULL;
CHAR *cellParaIdlte = NULL;
@@ -2889,35 +2889,35 @@
int check_lock = 0;
if (NULL == psw) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mgmt_login: psw is empty.");
+ slog(MISC_PRINT, SLOG_DEBUG, "mgmt_login: psw is empty.");
return PSW_EMPTY;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mgmt_login:psw:%s", psw);
+ slog(MISC_PRINT, SLOG_DEBUG, "mgmt_login:psw:%s", psw);
//don't foget add the nv psw_fail_num_str
zte_web_read("psw_fail_num_str", psw_fail_num_str);
psw_fail_num = atoi(psw_fail_num_str);
psw_len = strlen(psw);
if (0 == psw_len) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_login: psw is empty.");
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_login: psw is empty.");
return PSW_EMPTY;
}
if (psw_fail_num <= 0) {
check_lock = zte_checkLoginTime(); // check the current time if it is time out
if (check_lock < 0) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_login: psw number use out.");
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_login: psw number use out.");
return PSW_TIME_OUT;
// } else if (check_lock > 0) { // kw 3
}else{
- slog(MISC_PRINT, SLOG_DEBUG, "zte_mgmt_login: login time out, can login.");
+ slog(MISC_PRINT, SLOG_DEBUG, "mgmt_login: login time out, can login.");
(void)zte_web_write("psw_fail_num_str", LOGIN_FAIL_TIMES);
}
}
zte_setLastLoginTime(); //record current time to nv
if (LOGIN_PSW_MIN_LEN > psw_len || LOGIN_PSW_MAX_LEN < psw_len) {
- slog(MISC_PRINT, SLOG_ERR, "zte_mgmt_login: psw is too long.");
+ slog(MISC_PRINT, SLOG_ERR, "mgmt_login: psw is too long.");
return PSW_TOO_LONG;
} else {
return PSW_OK;
@@ -2974,10 +2974,10 @@
char_t *work_type = NULL;
work_type = websGetVar(wp, T("work_type"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG,"[zyl]zte_goform_set_work_type:work_type->%s\n", work_type);
+ slog(MISC_PRINT, SLOG_DEBUG,"[zyl]goform_set_work_type:work_type->%s\n", work_type);
if (work_type == NULL) {
- slog(MISC_PRINT, SLOG_ERR,"[zyl]zte_goform_set_work_type:empty!\n");
+ slog(MISC_PRINT, SLOG_ERR,"[zyl]goform_set_work_type:empty!\n");
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -2988,13 +2988,13 @@
return zte_write_result_to_web(wp, SUCCESS);
}
(void)zte_web_write("LanEnable", work_type);
- slog(MISC_PRINT, SLOG_DEBUG,"[zyl]zte_goform_set_work_type:work_type->%s\n", work_type);
+ slog(MISC_PRINT, SLOG_DEBUG,"[zyl]goform_set_work_type:work_type->%s\n", work_type);
ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_MAIN_CTRL, MSG_CMD_RESTART_REQUEST, 0, NULL, 0);
- slog(MISC_PRINT, SLOG_NORMAL,"[zyl]zte_goform_set_work_type:device reboot now\n");
+ slog(MISC_PRINT, SLOG_NORMAL,"[zyl]goform_set_work_type:device reboot now\n");
zte_write_result_to_web(wp, SUCCESS);
return;
} else {
- slog(MISC_PRINT, SLOG_ERR,"[zyl]zte_goform_set_work_type:work_type->%s error!\n", work_type);
+ slog(MISC_PRINT, SLOG_ERR,"[zyl]goform_set_work_type:work_type->%s error!\n", work_type);
zte_write_result_to_web(wp, FAILURE);
return;
}
diff --git a/ap/app/goahead/interface5.0/zte_web_pbm.c b/ap/app/goahead/interface5.0/zte_web_pbm.c
index f73b8ba..c97a1e1 100755
--- a/ap/app/goahead/interface5.0/zte_web_pbm.c
+++ b/ap/app/goahead/interface5.0/zte_web_pbm.c
@@ -28,10 +28,10 @@
(void)zte_web_read(ZTE_PBM_NV, flag);
if (0 == strcmp(flag, PBM_OPRATING)) {
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_check_can_process flag=%s, not can process.\n", flag);
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_check_can_process flag=%s, not can process.\n", flag);
return 0;
} else {
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_check_can_process flag=%s, can process.\n", flag);
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_check_can_process flag=%s, can process.\n", flag);
return -1;
}
}
@@ -84,11 +84,11 @@
//add by liuyingnan for server safe end
/*LOG*/
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm->zte_web_pbm_contact_saveto_sim()."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm->web_pbm_contact_saveto_sim()."); /*lint !e26*/
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_goform_pbm_contact_add_process(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->goform_pbm_contact_add_process(): invalid input.."); /*lint !e26*/
return;
}
@@ -132,11 +132,11 @@
} else {
sim_contact_add.zte_pbm_type = ZTE_WEB_PBM_NUMBER_TYPE_2;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm_contact_saveto_sim:send messsage to mc start"); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.zte_pbm_id:%d", sim_contact_add.zte_pbm_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm_contact_saveto_sim:send messsage to mc start"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.pbm_id:%d", sim_contact_add.zte_pbm_id); /*lint !e26*/
slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.name:%s", sim_contact_add.zte_pbm_name); /*lint !e26*/
slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.mobilephone_num:%s", sim_contact_add.zte_pbm_number); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.zte_pbm_type:%d", sim_contact_add.zte_pbm_type); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.pbm_type:%d", sim_contact_add.zte_pbm_type); /*lint !e26*/
/*send msg to mc*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,ZTE_PBM_WRITE_REC_MSG, sizeof(sim_contact_add), (char*)&sim_contact_add);
@@ -149,7 +149,7 @@
return;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_pbm_contact_saveto_sim:send messsage to mc end"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_pbm_contact_saveto_sim:send messsage to mc end"); /*lint !e26*/
/*goto web page*/
zte_write_result_to_web(wp, "success");
return;
@@ -175,17 +175,17 @@
char* pbm_mobilephone_num = NULL;
//add by liuyingnan for server safe end
/*LOG*/
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm->zte_web_pbm_contact_saveto_pc()."); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_contact_saveto_pc entry\n");
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm->web_pbm_contact_saveto_pc()."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_contact_saveto_pc entry\n");
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_saveto_pc(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_saveto_pc(): invalid input.."); /*lint !e26*/
return;
}
//add by liuyingnan for server safe for xss attack start
pbm_name = websGetVar(wp, T("name"), T(""));
pbm_mobilephone_num = websGetVar(wp, T("mobilephone_num"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_contact_saveto_pc entry1\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_contact_saveto_pc entry1\n");
if (PBM_MAX_TEXT_LENGTH < strlen(pbm_name) || PBM_MAX_NUM_LENGTH < strlen(pbm_mobilephone_num)
||DATA_NO_SAFE == zte_Safe_noSpecialChar_ucs2(pbm_name)
|| DATA_NO_SAFE == zte_Safe_noSpecialChar(pbm_mobilephone_num)
@@ -196,7 +196,7 @@
return;
}
//add by liuyingnan for server safe for xss attack end
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_contact_saveto_pc entry2\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_contact_saveto_pc entry2\n");
/*init contact_add*/
memset(&pc_contact_add, 0, sizeof(pc_contact_add));
/*set struct value*/
@@ -224,12 +224,12 @@
} else {
pc_contact_add.zte_pbm_type = ZTE_WEB_PBM_NUMBER_TYPE_2;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm_contact_saveto_pc:send messsage to mc start"); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.zte_pbm_id:%d", pc_contact_add.zte_pbm_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm_contact_saveto_pc:send messsage to mc start"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.pbm_id:%d", pc_contact_add.zte_pbm_id); /*lint !e26*/
slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.name:%s", pc_contact_add.zte_pbm_name); /*lint !e26*/
slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.mobilephone_num:%s", pc_contact_add.zte_pbm_number); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.zte_pbm_type:%d", pc_contact_add.zte_pbm_type); /*lint !e26*/
- printf("[PB] zte_web_pbm_contact_saveto_pc entry3\n");
+ slog(MISC_PRINT, SLOG_DEBUG, "sim_contact_add.pbm_type:%d", pc_contact_add.zte_pbm_type); /*lint !e26*/
+ printf("[PB] web_pbm_contact_saveto_pc entry3\n");
/*send msg to mc*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,ZTE_PBM_WRITE_REC_MSG, sizeof(pc_contact_add), (char*)&pc_contact_add);
(void)zte_web_write(ZTE_PBM_NV, PBM_OPRATING);
@@ -240,8 +240,8 @@
zte_write_result_to_web(wp, FAILURE);
return;
}
- printf("zte_web_pbm_contact_saveto_pc:%d,%d,%d,%d\n", ret_code, MODULE_ID_WEB_CGI, MODULE_ID_PB, MSG_CMD_WRITE_PB);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_pbm_contact_saveto_pc:send messsage to mc end"); /*lint !e26*/
+ printf("web_pbm_contact_saveto_pc:%d,%d,%d,%d\n", ret_code, MODULE_ID_WEB_CGI, MODULE_ID_PB, MSG_CMD_WRITE_PB);
+ slog(MISC_PRINT, SLOG_NORMAL, "web_pbm_contact_saveto_pc:send messsage to mc end"); /*lint !e26*/
/*goto web page*/
zte_write_result_to_web(wp, "success");
}
@@ -269,7 +269,7 @@
/*check input*/
if (NULL == input || NULL == output || srcLen == 0 || destLen == 0) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_utils_parseStr():invalid input."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_utils_parseStr():invalid input."); /*lint !e26*/
return 0;
}
@@ -277,7 +277,7 @@
for (input_ind = 0; input_ind < srcLen; input_ind++) {
//kw
if (all_ind > destLen) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_utils_parseStr():invalid param."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_utils_parseStr():invalid param."); /*lint !e26*/
return 0;
}
@@ -330,7 +330,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_part(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_part(): invalid input.."); /*lint !e26*/
return;
}
@@ -344,7 +344,7 @@
memcpy(del_index, websGetVar(wp, T("delete_id"), T("")), sizeof(del_index));
sendto_data.zte_del_pbm_total = zte_web_pbm_utils_parseStr(del_index, (char *)split_index,
(int)ZTE_PB_INDEX_MAX, (int)ZTE_WEB_PBM_REC_LEN, (char)ZTE_WEB_PBM_INDEX_SPLIT_FLAG);
- slog(MISC_PRINT, SLOG_DEBUG,"liuyingnan sendto_data.zte_del_pbm_total:%d", sendto_data.zte_del_pbm_total); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"liuyingnan sendto_data.del_pbm_total:%d", sendto_data.zte_del_pbm_total); /*lint !e26*/
/*del one contact*/
if (ZTE_WEB_PBM_DEL_MULT_OR_ONE_FLAG == sendto_data.zte_del_pbm_total) {
@@ -352,15 +352,15 @@
#if 0
if (-1 == zte_mc_relay_pbm_del_one_record(&sendto_data)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_part():delete one contact failed."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_part():delete one contact failed."); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
#endif
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_pbm_contact_del_part:send messsage start"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_pbm_contact_del_part:send messsage start"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,ZTE_PBM_DEL_A_REC_MSG, sizeof(sendto_data), (char*)&sendto_data);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_PB, MSG_CMD_DEL_A_PB, sizeof(sendto_data), (char*)&sendto_data, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm_contact_del_part:send messsage end"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm_contact_del_part:send messsage end"); /*lint !e26*/
if (ret_code != 0) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm send DEL A record fail"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
@@ -370,13 +370,13 @@
/*handler*/
for (num_ind = 0; num_ind < sendto_data.zte_del_pbm_total; num_ind ++) {
sendto_data.zte_del_pbm_id[num_ind] = atoi(split_index[num_ind]);
- printf("zte_web_pbm->zte_web_pbm_contact_del_part():split_index=[%d]", sendto_data.zte_del_pbm_id[num_ind]); /*lint !e26*/
+ printf("web_pbm->web_pbm_contact_del_part():split_index=[%d]", sendto_data.zte_del_pbm_id[num_ind]); /*lint !e26*/
}
/*handler*/
#if 0
if (-1 == zte_mc_relay_pbm_del_multi_record(&sendto_data)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_part():delete mult contact failed."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_part():delete mult contact failed."); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
return;
}
@@ -414,7 +414,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_all(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_all(): invalid input.."); /*lint !e26*/
return;
}
@@ -423,14 +423,14 @@
/*set data struct*/
sendto_data.zte_del_pbm_location = atoi(websGetVar(wp, T("del_all_location"), T("")));
- slog(MISC_PRINT, SLOG_DEBUG, "liuyingnan sendto_data.zte_del_pbm_location:%d", sendto_data.zte_del_pbm_location); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "liuyingnan sendto_data.del_pbm_location:%d", sendto_data.zte_del_pbm_location); /*lint !e26*/
/*handler del all*/
//(void)zte_mc_relay_pbm_del_all_record(&sendto_data);
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_pbm_contact_del_all:send messsage start"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_pbm_contact_del_all:send messsage start"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,ZTE_PBM_DEL_ALL_REC_MSG, sizeof(sendto_data), (char*)&sendto_data);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_PB, MSG_CMD_DEL_ALL_PB, sizeof(sendto_data), (char*)&sendto_data, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm_contact_del_all:send messsage end"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm_contact_del_all:send messsage end"); /*lint !e26*/
if (ret_code != 0) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm send DEL ALL record fail"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
@@ -461,7 +461,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_by_group(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_by_group(): invalid input.."); /*lint !e26*/
return;
}
@@ -478,7 +478,7 @@
/*set data struct*/
sendto_data.zte_del_pbm_location = atoi(websGetVar(wp, T("del_all_location"), T("0")));
- slog(MISC_PRINT, SLOG_DEBUG, "liuyingnan sendto_data.zte_del_pbm_location:%d", sendto_data.zte_del_pbm_location); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "liuyingnan sendto_data.del_pbm_location:%d", sendto_data.zte_del_pbm_location); /*lint !e26*/
if (ZTE_NVIO_DONE != zte_web_write("pbm_group", group)) {
slog(MISC_PRINT, SLOG_ERR, "write the nv [pbm_group] failure.\n"); /*lint !e26*/
@@ -490,16 +490,16 @@
#if 0
if (ZTE_MC_OK_S != zte_mc_relay_pbm_del_all_record(&sendto_data)) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_mc_relay_pbm_del_all_record fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call mc_relay_pbm_del_all_record fail.\n"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
} else {
zte_write_result_to_web(wp, SUCCESS);
}
#endif
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_pbm_contact_del_by_group:send messsage start"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_pbm_contact_del_by_group:send messsage start"); /*lint !e26*/
//ret_code = zte_send_message(ZUFI_MODULE_ID_AT_LOCAL,ZTE_PBM_DEL_ALL_REC_MSG, sizeof(sendto_data), (char*)&sendto_data);
ret_code = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_PB, MSG_CMD_DEL_ALL_PB, sizeof(sendto_data), (char*)&sendto_data, 0);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_pbm_contact_del_by_group:send messsage end"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_pbm_contact_del_by_group:send messsage end"); /*lint !e26*/
if (ret_code != 0) {
slog(MISC_PRINT, SLOG_ERR, "mc lib relay pbm send DEL record by group fail"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
@@ -528,7 +528,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_goform_pbm_contact_add_process(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->goform_pbm_contact_add_process(): invalid input.."); /*lint !e26*/
return;
}
@@ -539,22 +539,22 @@
/*get the saved mem*/
contact_location = atoi(websGetVar(wp, T("location"), T("")));
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_check_can_process contact_location=%d, can process.\n", contact_location);
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_check_can_process contact_location=%d, can process.\n", contact_location);
/*goto different mem handler*/
switch (contact_location) {
case ZTE_WEB_PBM_CONTACT_SIM: { /*goto sim mem handler*/
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_check_can_process sim=%d, can process.\n", ZTE_WEB_PBM_CONTACT_SIM);
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_check_can_process sim=%d, can process.\n", ZTE_WEB_PBM_CONTACT_SIM);
zte_web_pbm_contact_saveto_sim(wp, ZTE_WEB_PBM_CONTACT_SIM);
break;
}
case ZTE_WEB_PBM_CONTACT_PC: { /*goto pc mem handler*/
- slog(MISC_PRINT, SLOG_DEBUG,"[PB] zte_web_pbm_check_can_process pc=%d, can process.\n", ZTE_WEB_PBM_CONTACT_PC);
+ slog(MISC_PRINT, SLOG_DEBUG,"[PB] web_pbm_check_can_process pc=%d, can process.\n", ZTE_WEB_PBM_CONTACT_PC);
zte_web_pbm_contact_saveto_pc(wp, ZTE_WEB_PBM_CONTACT_PC);
break;
}
default: { /*unknown mem*/
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_goform_pbm_contact_add_process():unknown pbm mem."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->goform_pbm_contact_add_process():unknown pbm mem."); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
}
}
@@ -564,7 +564,7 @@
{
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_web_pbm_contact_del_all(): invalid input.."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->web_pbm_contact_del_all(): invalid input.."); /*lint !e26*/
return;
}
@@ -588,7 +588,7 @@
}
else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_pbm->zte_goform_pbm_contact_del_process():unknown pbm del."); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_pbm->goform_pbm_contact_del_process():unknown pbm del."); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
}
@@ -623,7 +623,7 @@
mem_store = websGetVar(wp, "mem_store", T(""));
if (('\0' == *page) || ('\0' == *data_per_page) || ('\0' == *mem_store)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_pbm_data: invalid web para.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_pbm_data: invalid web para.\n"); /*lint !e26*/
zte_web_pbm_feed_back_empty(wp);
return ;
}
@@ -633,7 +633,7 @@
if((tmp_page < 0 || tmp_page > 255)
||(tmp_num_per_page < 0 || tmp_num_per_page > 255)
||(location < PBM_LOCATION_SIM || location > PBM_LOCATION_MAX)){
- slog(MISC_PRINT, SLOG_ERR, "zte_get_pbm_data:err[%d,%d,%d]\n", tmp_page,tmp_num_per_page,location); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_pbm_data:err[%d,%d,%d]\n", tmp_page,tmp_num_per_page,location); /*lint !e26*/
zte_web_pbm_feed_back_empty(wp);
return ;
}
@@ -657,7 +657,7 @@
slog(MISC_PRINT, SLOG_DEBUG, "GET PBM DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libpbm_get_rec_data fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call libpbm_get_rec_data fail.\n"); /*lint !e26*/
zte_web_pbm_feed_back_empty(wp);
//free
// if (NULL != p_pbm_query_result) { // kw 3
@@ -744,7 +744,7 @@
pbm_group = websGetVar(wp, "pbm_group", T("")); //not to check whether is empty
if (('\0' == *page) || ('\0' == *data_per_page) || ('\0' == *mem_store)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_pbm_data: invalid web para.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_pbm_data: invalid web para.\n"); /*lint !e26*/
zte_web_pbm_feed_back_empty(wp);
return ;
}
@@ -918,7 +918,7 @@
result = zte_libpbm_get_capability(&pbm_para_query_info, &pbm_sim_capability_s, &pbm_device_capability_s);
slog(MISC_PRINT, SLOG_DEBUG, "GET PBM DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libpbm_get_capability fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call libpbm_get_capability fail.\n"); /*lint !e26*/
zte_web_pbm_feed_back_empty(wp);
return ;
}
diff --git a/ap/app/goahead/interface5.0/zte_web_rest.c b/ap/app/goahead/interface5.0/zte_web_rest.c
index 95b1f8f..44455c1 100644
--- a/ap/app/goahead/interface5.0/zte_web_rest.c
+++ b/ap/app/goahead/interface5.0/zte_web_rest.c
@@ -45,22 +45,22 @@
char_t *action = NULL;
char_t *zte_goform_id = NULL;
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>wp->path]:%s\n", wp->query); /*lint !e26 !e1013*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>wp->path]:%s\n", wp->query); /*lint !e26 !e1013*/
zte_goform_id = websGetVar(wp, T("goformId"), T(""));
action = websGetVar(wp, T("action_process"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>test websGetVar]:%s\n", zte_goform_id); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler>>action]:%s\n", action); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>test websGetVar]:%s\n", zte_goform_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler>>action]:%s\n", action); /*lint !e26*/
if (0 == strcmp(action, "get")) {
zte_goform_get_cmd_process(wp,T(""),T("")); /*lint !e1013*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:get action end\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:get action end\n"); /*lint !e26*/
return;
} else if (0 == strcmp(action, "set")) {
zte_goform_set_cmd_process(wp,T(""),T(""));/*lint !e1013*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:set action end\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:set action end\n"); /*lint !e26*/
return;
} else {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_xml_switch_handler]:Can not find action\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[xml_switch_handler]:Can not find action\n"); /*lint !e26*/
return;
}
@@ -80,17 +80,17 @@
xml = & (root->xml);
if(xml == NULL)
return;
- //slog(MISC_PRINT,SLOG_DEBUG,"[zte_change_wp_query_new]:xml->name:%s",xml->name);/*lint !e26*/
+ //slog(MISC_PRINT,SLOG_DEBUG,"[change_wp_query_new]:xml->name:%s",xml->name);/*lint !e26*/
action_tag = xml->child;
if (! action_tag) {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:action_tag is NULL or the xml_str is not full!"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:action_tag is NULL or the xml_str is not full!"); /*lint !e26*/
//zte_write_result_to_web(wp,"action_tag is NULL!");
return;
} else {
while (action_tag) {
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:name:%s", action_tag->name); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "[zte_change_wp_query_new]:text:%s", action_tag->txt); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:name:%s", action_tag->name); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "[change_wp_query_new]:text:%s", action_tag->txt); /*lint !e26*/
websSetVar(wp, action_tag->name, action_tag->txt);
action_tag = action_tag->sibling;
}
@@ -341,7 +341,7 @@
void zte_rest_get_sms_data(webs_t wp, zte_sms_query_result *p_sms_query_result, int i, int tag)
{
if (wp->flags & WEBS_XML_CLIENT_REQUEST) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_rest_get_sms_data WEBS_XML_CLIENT_REQUEST");
+ slog(MISC_PRINT, SLOG_DEBUG, "rest_get_sms_data WEBS_XML_CLIENT_REQUEST");
char *tmp_num = NULL;
char pbm_name[100] = {0};
int len = 0;
diff --git a/ap/app/goahead/interface5.0/zte_web_sms.c b/ap/app/goahead/interface5.0/zte_web_sms.c
index 23b544e..d27e610 100755
--- a/ap/app/goahead/interface5.0/zte_web_sms.c
+++ b/ap/app/goahead/interface5.0/zte_web_sms.c
@@ -99,7 +99,7 @@
if ((0 != strcmp(buf1, "yes"))
|| (0 == strcmp(buf2, "no"))
|| (0 == strcmp(buf3, "0"))) {
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_sms_check_can_send_sms, no need to check!\n");
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] sms_check_can_send_sms, no need to check!\n");
return 0;
}
@@ -214,7 +214,7 @@
}
- slog(MISC_PRINT, SLOG_DEBUG,"zte_sms_send_msg_process:year is [%s];"\
+ slog(MISC_PRINT, SLOG_DEBUG,"sms_send_msg_process:year is [%s];"\
"month is [%s];day is [%s];hour is [%s];minute is [%s];second is [%s];timezone is [%s].\n", \
MSG_SEND_ST.date.year, MSG_SEND_ST.date.month, MSG_SEND_ST.date.day, \
MSG_SEND_ST.date.hour, MSG_SEND_ST.date.min, MSG_SEND_ST.date.sec, \
@@ -269,11 +269,11 @@
/* mc interface */
zte_sms_handle_DB_status_whenSend(WMS_CMD_PROCESSING);
if (ZTE_MC_OK_S == zte_mc_relay_sms_send_msg((T_zUfiSms_SendReq*)(&MSG_SEND_ST))) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_sms_send_msg_process:Send message to mc successful!\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "sms_send_msg_process:Send message to mc successful!\n"); /*lint !e26*/
zte_write_result_to_web(wp, SUCCESS);
} else {
zte_sms_handle_DB_status_whenSend(WMS_CMD_FAILED);
- slog(MISC_PRINT, SLOG_ERR, "zte_sms_send_msg_process:Send message to mc fail!\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "sms_send_msg_process:Send message to mc fail!\n"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
}
@@ -366,7 +366,7 @@
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_sms_save_msg_process:year is [%s];"\
+ slog(MISC_PRINT, SLOG_DEBUG, "sms_save_msg_process:year is [%s];"\
"month is [%s];day is [%s];hour is [%s];minute is [%s];second is [%s];timezone is [%s].\n", \
MSG_SAVE_ST.date.year, MSG_SAVE_ST.date.month, MSG_SAVE_ST.date.day, \
MSG_SAVE_ST.date.hour, MSG_SAVE_ST.date.min, MSG_SAVE_ST.date.sec, \
@@ -468,16 +468,16 @@
}
for (j = 0; j < msg_id_count; j++) {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_sms_delete_msg_process:delete msg number:[%lu]\n", del_sms_setting.id[j]);/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"sms_delete_msg_process:delete msg number:[%lu]\n", del_sms_setting.id[j]);/*lint !e26*/
}
/* mc interface */
zte_sms_handle_DB_status(WMS_SMS_CMD_MSG_DELETE, WMS_CMD_PROCESSING);
if (ZTE_MC_OK_S == zte_mc_relay_sms_delete_msg((T_zUfiSms_DelReq*)(&del_sms_setting))) {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_sms_delete_msg_process:send delete sms cmd to mc success.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"sms_delete_msg_process:send delete sms cmd to mc success.\n");/*lint !e26*/
zte_write_result_to_web(wp, SUCCESS);
} else {
- slog(MISC_PRINT, SLOG_DEBUG,"zte_sms_delete_msg_process:send delete sms cmd to mc fail.\n");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG,"sms_delete_msg_process:send delete sms cmd to mc fail.\n");/*lint !e26*/
zte_sms_handle_DB_status(WMS_SMS_CMD_MSG_DELETE, WMS_CMD_FAILED);
zte_write_result_to_web(wp, FAILURE);
}
@@ -510,19 +510,19 @@
del_sms_setting.id[i] = atoi(msg_id_separate[i]);
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_sms_move_to_sim_msg_process:del_sms_setting.all_or_count is [%lu]\n", del_sms_setting.all_or_count);
+ slog(MISC_PRINT, SLOG_DEBUG, "sms_move_to_sim_msg_process:del_sms_setting.all_or_count is [%lu]\n", del_sms_setting.all_or_count);
for (j = 0; j < msg_id_count; j++) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_sms_move_to_sim_msg_process:move msg number:[%lu]\n", del_sms_setting.id[j]);
+ slog(MISC_PRINT, SLOG_DEBUG, "sms_move_to_sim_msg_process:move msg number:[%lu]\n", del_sms_setting.id[j]);
}
/* mc interface */
if (ZTE_MC_OK_S == zte_mc_relay_sms_move_to_sim_msg((T_zUfiSms_DelReq*)(&del_sms_setting))) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_sms_move_to_sim_msg_process:send move sms cmd to mc success.\n");
+ slog(MISC_PRINT, SLOG_NORMAL, "sms_move_to_sim_msg_process:send move sms cmd to mc success.\n");
zte_write_result_to_web(wp, SUCCESS);
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_sms_move_to_sim_msg_process:send move sms cmd to mc fail.\n");
+ slog(MISC_PRINT, SLOG_ERR, "sms_move_to_sim_msg_process:send move sms cmd to mc fail.\n");
zte_write_result_to_web(wp, FAILURE);
}
@@ -555,7 +555,7 @@
MSG_DEL_TYPE_ST.eLocation = SMS_LOCATION_ME;
MSG_DEL_TYPE_ST.eBoxName = SMS_DRAFTBOX;
}
- slog(MISC_PRINT, SLOG_NORMAL, "zte_goform_sms_alldel_msg_process send message: MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_TYPE");/*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "goform_sms_alldel_msg_process send message: MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_TYPE");/*lint !e26*/
//ret = zte_send_message(MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_TYPE,sizeof(WEB_DEL_SMS_BY_TYPE),(UCHAR *)&MSG_DEL_TYPE_ST); /*lint !e26 !e55*/
ret = ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_SMS, MSG_CMD_DEL_SMS_BY_TYPE, sizeof(WEB_DEL_SMS_BY_TYPE), (UCHAR *)&MSG_DEL_TYPE_ST, 0);
if (0 != ret) {
@@ -610,7 +610,7 @@
} else if (!strcmp(mem_store, "sim_card")) {
sms_setting_st.mem_store = 0;
} else {
- slog(MISC_PRINT, SLOG_ERR,"zte_sms_set_message_center: invalid mem_store.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR,"sms_set_message_center: invalid mem_store.\n"); /*lint !e26*/
sms_setting_st.mem_store = 1;
}
slog(MISC_PRINT, SLOG_DEBUG, "sms_setting_st.mem_store=%d", sms_setting_st.mem_store); /*lint !e26*/
@@ -626,19 +626,19 @@
} else if (0 == strcmp(validity_period, "cdma_largest")) {
sms_setting_st.tp_validity_period = 244;
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_sms_set_message_center: invalid validity_period.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "sms_set_message_center: invalid validity_period.\n"); /*lint !e26*/
sms_setting_st.tp_validity_period = 255;
}
slog(MISC_PRINT, SLOG_DEBUG, " sms_setting_st.tp_validity_period=%d", sms_setting_st.tp_validity_period); /*lint !e26*/
- slog(MISC_PRINT, SLOG_DEBUG, "zte_sms_set_message_center:The center number is:[%s].\n", sms_setting_st.sca); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "sms_set_message_center:The center number is:[%s].\n", sms_setting_st.sca); /*lint !e26*/
/* mc interface */
if (ZTE_MC_OK_S == zte_mc_relay_sms_set_parameter((T_zUfiSms_ParaInfo*)(&sms_setting_st))) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_sms_set_message_center: send msg to mc success.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "sms_set_message_center: send msg to mc success.\n"); /*lint !e26*/
zte_write_result_to_web(wp, SUCCESS);
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_sms_set_message_center: send msg to mc fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "sms_set_message_center: send msg to mc fail.\n"); /*lint !e26*/
zte_write_result_to_web(wp, FAILURE);
}
//zte_write_result_to_web(wp,SUCCESS);
@@ -764,7 +764,7 @@
order_by = websGetVar(wp, "order_by", T(""));
if (('\0' == *page) || ('\0' == *data_per_page) || ('\0' == *mem_store) || ('\0' == *tags) || ('\0' == *order_by)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_sms_data: invalid input.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_sms_data: invalid input.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
return ;
}
@@ -815,7 +815,7 @@
slog(MISC_PRINT, SLOG_DEBUG, "SMS_DATA GET DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_wms_db_get_sms_data fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call wms_db_get_sms_data fail.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
//free
// if (NULL != p_sms_query_result) { // kw 3
@@ -928,7 +928,7 @@
order_by = websGetVar(wp, "order_by", T(""));
if (('\0' == *page) || ('\0' == *data_per_page) || ('\0' == *mem_store) || ('\0' == *tags) || ('\0' == *order_by)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_sms_data: invalid input.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_sms_data: invalid input.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
return ;
}
@@ -1115,7 +1115,7 @@
result = zte_libwms_get_parameter(&sms_parameter_info);
slog(MISC_PRINT, SLOG_DEBUG, "SMS_PARAMETER_INFO GET DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libwms_get_parameter fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call libwms_get_parameter fail.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
return ;
}
@@ -1172,7 +1172,7 @@
result = zte_libwms_get_cmd_status(&cmd_status_info);
slog(MISC_PRINT, SLOG_DEBUG, "sms_cmd_status_info GET DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libwms_get_cmd_status fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call libwms_get_cmd_status fail.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
return ;
}
@@ -1205,7 +1205,7 @@
//¿¨²à¿Õ¼äÊÇ·ñ³ä×ãÄܽÓÊÕÁ÷Á¿Ð£×¼¶ÌÐŵÄÅжÏ
//½»ÓÉÐÒéÕ»Åжϴ¦Àí
sms_remain = 10;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_get_sms_remain_capacity, default_store = %s, total = %d!\n", default_store, sms_sim_total);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] get_sms_remain_capacity, default_store = %s, total = %d!\n", default_store, sms_sim_total);
} else {
sms_nv_total = zte_libwms_get_sms_capability(1);//nv
sms_nv_rev_total = zte_libwms_get_sms_used(1, 0); //nv rev read
@@ -1219,9 +1219,9 @@
}
sms_remain = sms_nv_total - sms_nv_rev_total - sms_nv_send_total - sms_nv_draftbox_total;
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_get_sms_remain_capacity, default_store = %s, total = %d, rev= %d, send= %d, draft= %d!\n", default_store, sms_nv_total, sms_nv_rev_total, sms_nv_send_total, sms_nv_draftbox_total);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] get_sms_remain_capacity, default_store = %s, total = %d, rev= %d, send= %d, draft= %d!\n", default_store, sms_nv_total, sms_nv_rev_total, sms_nv_send_total, sms_nv_draftbox_total);
}
- slog(MISC_PRINT, SLOG_DEBUG,"[traffic] zte_get_sms_remain_capacity, default_store = %s, sms_remain = %d!\n", default_store, sms_remain);
+ slog(MISC_PRINT, SLOG_DEBUG,"[traffic] get_sms_remain_capacity, default_store = %s, sms_remain = %d!\n", default_store, sms_remain);
return sms_remain;
}
@@ -1322,7 +1322,7 @@
data_per_page = websGetVar(wp, "data_per_page", T(""));
if (('\0' == *page) || ('\0' == *data_per_page)) {
- slog(MISC_PRINT, SLOG_ERR, "zte_get_sms_data: invalid input.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "get_sms_data: invalid input.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
return ;
}
@@ -1352,7 +1352,7 @@
result = zte_libwms_get_sms_report(&sms_query_req, p_sms_query_result);
slog(MISC_PRINT, SLOG_DEBUG, "sms_status_rpt_data GET DATA FROM DB END.\n"); /*lint !e26*/
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libwms_get_sms_report fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call libwms_get_sms_report fail.\n"); /*lint !e26*/
zte_web_feed_back_empty(wp);
//free
// if (NULL != p_sms_query_result) { // kw 3
@@ -1668,14 +1668,14 @@
int result = 0;
- slog(MISC_PRINT, SLOG_NORMAL, "zte_get_boradcast_data GET DATA FROM DB START.\n");
+ slog(MISC_PRINT, SLOG_NORMAL, "get_boradcast_data GET DATA FROM DB START.\n");
p_bro_query_result = (zte_wms_cell_bro_s_type*)malloc(1 + sizeof(zte_wms_cell_bro_s_type));
if(p_bro_query_result == NULL) return;
result = zte_libwms_get_cell_bro(p_bro_query_result);
- slog(MISC_PRINT, SLOG_DEBUG, "zte_get_boradcast_data GET DATA FROM DB END.\n");
+ slog(MISC_PRINT, SLOG_DEBUG, "get_boradcast_data GET DATA FROM DB END.\n");
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_libwms_get_cell_bro fail.\n");
+ slog(MISC_PRINT, SLOG_ERR, "call libwms_get_cell_bro fail.\n");
zte_web_feed_back_empty(wp);
//cov
free(p_bro_query_result);
diff --git a/ap/app/goahead/interface5.0/zte_web_ussd.c b/ap/app/goahead/interface5.0/zte_web_ussd.c
index e65ab24..215adc1 100644
--- a/ap/app/goahead/interface5.0/zte_web_ussd.c
+++ b/ap/app/goahead/interface5.0/zte_web_ussd.c
@@ -61,7 +61,7 @@
char_t *ussd_operator = NULL;
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd-> invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd-> invalid input..\n"); /*lint !e26*/
return;
}
@@ -100,7 +100,7 @@
unsigned char *ussd_send_number = NULL;
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_send: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_send: invalid input..\n"); /*lint !e26*/
return;
}
@@ -123,9 +123,9 @@
/*handler to mc*/
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_SET_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_send: successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_send: successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_send: failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_send: failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
@@ -145,7 +145,7 @@
{
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_cancel invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_cancel invalid input..\n"); /*lint !e26*/
return;
}
@@ -155,9 +155,9 @@
/*handler to mc*/
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_CANCEL_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_cancel: zte_topsw_mc_ussd_send successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_cancel: topsw_mc_ussd_send successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_cancel: zte_topsw_mc_ussd_send failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_cancel: topsw_mc_ussd_send failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
@@ -177,7 +177,7 @@
{
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_over invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_over invalid input..\n"); /*lint !e26*/
return;
}
@@ -202,7 +202,7 @@
/*check input*/
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_reply: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_reply: invalid input..\n"); /*lint !e26*/
return;
}
@@ -216,9 +216,9 @@
(void)zte_web_write("ussd_operater", "send");
if (0 == ipc_send_message(MODULE_ID_WEB_CGI, MODULE_ID_AT_CTL, MSG_CMD_USSD_SET_REQ, 0, NULL, 0)) {
- slog(MISC_PRINT, SLOG_NORMAL, "zte_web_ussd_reply: successful.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_NORMAL, "web_ussd_reply: successful.\n"); /*lint !e26*/
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd_reply: failed.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd_reply: failed.\n"); /*lint !e26*/
}
zte_write_result_to_web(wp, SUCCESS);
}
@@ -237,10 +237,10 @@
void zte_web_ussd(webs_t wp)
{
if (NULL == wp) {
- slog(MISC_PRINT, SLOG_ERR, "zte_web_ussd: invalid input..\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "web_ussd: invalid input..\n"); /*lint !e26*/
return;
}
- slog(MISC_PRINT, SLOG_DEBUG, "zte_web_ussd: ok\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "web_ussd: ok\n"); /*lint !e26*/
(void)zte_web_write(ZTE_USSD_NV, USSD_FIRST_CANCEL);
zte_write_result_to_web(wp, SUCCESS);
@@ -290,7 +290,7 @@
result = zte_ussd_get_to_web_data(&ussd_data_info);
#if 0 // kw 3 return -1 branch is unreachable
if (-1 == result) {
- slog(MISC_PRINT, SLOG_ERR, "call zte_ussd_get_to_web_data fail.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "call ussd_get_to_web_data fail.\n"); /*lint !e26*/
web_feedback_header(wp);
(void)websWrite(wp, T("[]"));
return ;
diff --git a/ap/app/goahead/interface5.0/zte_web_util.c b/ap/app/goahead/interface5.0/zte_web_util.c
index a4c0056..b696002 100755
--- a/ap/app/goahead/interface5.0/zte_web_util.c
+++ b/ap/app/goahead/interface5.0/zte_web_util.c
@@ -343,7 +343,7 @@
ip_address = websGetRequestIpaddr(wp);
#if 0 // kw 3 NVARIANT_CONDITION.UNREACH
if (NULL == ip_address) {
- slog(MISC_PRINT, SLOG_ERR, "zte_goform_whitelist_check: ip_address is null.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "goform_whitelist_check: ip_address is null.\n"); /*lint !e26*/
return FALSE;
}
#endif
@@ -353,7 +353,7 @@
}
if (result == TRUE) {
if (!zte_mgmt_login_timemark_set()) {
- slog(MISC_PRINT, SLOG_ERR, "[ERROR]zte_goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "[ERROR]goform_whitelist_check -> timemark set error .\n"); /*lint !e26*/
}
}
@@ -378,7 +378,7 @@
zte_goform_id = websGetVar(wp, T("goformId"), T(""));
if (zte_goform_id == NULL) {
- slog(MISC_PRINT, SLOG_ERR, "zte_goform_whitelist_check: zte_goform_id is null.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "goform_whitelist_check: goform_id is null.\n"); /*lint !e26*/
return -1;
}
@@ -397,10 +397,10 @@
|| (0 == strncmp(GOFORM_MGMT_REBOOT, zte_goform_id, strlen(GOFORM_MGMT_REBOOT)))
#endif
) {
- slog(MISC_PRINT, SLOG_DEBUG, "zte_goform_whitelist_check: zte_goform_id:[%s] is OK.\n", zte_goform_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_DEBUG, "goform_whitelist_check: goform_id:[%s] is OK.\n", zte_goform_id); /*lint !e26*/
return 1;
} else {
- slog(MISC_PRINT, SLOG_ERR, "zte_goform_whitelist_check: zte_goform_id:[%s] is black.\n", zte_goform_id); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "goform_whitelist_check: goform_id:[%s] is black.\n", zte_goform_id); /*lint !e26*/
return -1;
}
@@ -523,7 +523,7 @@
char language[64] = {0};
if (NULL == i_pageName) {
- slog(MISC_PRINT, SLOG_ERR, "zte_webs_feedback_top para null.\n"); /*lint !e26*/
+ slog(MISC_PRINT, SLOG_ERR, "webs_feedback_top para null.\n"); /*lint !e26*/
return;
}
@@ -567,7 +567,7 @@
cmd = websGetVar(wp, T("cmd"), T(""));
multi_data = websGetVar(wp, T("multi_data"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG, "[goahead] zte_goform_get_cmd_process multi_data = %s, cmd = %s\n", multi_data, cmd);
+ slog(MISC_PRINT, SLOG_DEBUG, "[goahead] goform_get_cmd_process multi_data = %s, cmd = %s\n", multi_data, cmd);
zte_mgmt_login_timeout_check();
@@ -683,7 +683,7 @@
zte_get_login_status_value(wp, login_info);
zte_goform_id = websGetVar(wp, T("goformId"), T(""));
- slog(MISC_PRINT, SLOG_DEBUG,"[goahead] zte_goform_set_cmd_process zte_goform_id = %s,login_info=%s!\n", zte_goform_id, login_info);
+ slog(MISC_PRINT, SLOG_DEBUG,"[goahead] goform_set_cmd_process goform_id = %s,login_info=%s!\n", zte_goform_id, login_info);
#ifdef WEBINSPECT_FIX
if (query && (strstr(query, ")(")
/* || strstr(query, "%26%26")
@@ -747,7 +747,7 @@
if (0 != strcmp("ok", login_info)) {
blacklist_result = zte_goform_blacklist_check(wp);
if (blacklist_result < 0) {
- slog(MISC_PRINT, SLOG_ERR,"[ERROR]zte_goform_blacklist_check -> black goform id:[%s].\n", zte_goform_id);
+ slog(MISC_PRINT, SLOG_ERR,"[ERROR]goform_blacklist_check -> black goform id:[%s].\n", zte_goform_id);
zte_write_result_to_web(wp, FAILURE);
websDone(wp, 200);
return;
@@ -765,7 +765,7 @@
}
if (goform_index == max_goform_index) {
- slog(MISC_PRINT, SLOG_ERR,"[ERROR]zte_goform_set_cmd_process -> unknown goform id:[%s].\n", zte_goform_id);
+ slog(MISC_PRINT, SLOG_ERR,"[ERROR]goform_set_cmd_process -> unknown goform id:[%s].\n", zte_goform_id);
zte_write_result_to_web(wp, FAILURE);
}
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);
diff --git a/ap/app/goahead/server/cgi.c b/ap/app/goahead/server/cgi.c
index c9286c6..7742a7b 100755
--- a/ap/app/goahead/server/cgi.c
+++ b/ap/app/goahead/server/cgi.c
@@ -210,7 +210,7 @@
if (wp->flags & WEBS_CGI_HTTPSHARE_UPLOAD)
{
- printf("[httpshare]call zte_process_cgi_end.\n");
+ printf("[httpshare]call process_cgi_end.\n");
return zte_process_cgi_end(wp);
}else if(wp->flags & WEBS_CGI_UPLOAD)
{
diff --git a/ap/app/goahead/server/webs.c b/ap/app/goahead/server/webs.c
index b0238e1..00ba24c 100755
--- a/ap/app/goahead/server/webs.c
+++ b/ap/app/goahead/server/webs.c
@@ -433,7 +433,7 @@
//Add By liuyingnan for XML COMM API START
if(wp->flags & WEBS_XML_CLIENT_REQUEST)
{
- slog(MISC_PRINT,SLOG_DEBUG,"[websReadEvent]:zte_change_wp_query function:%s\n",websRecvHttpBuffer_XML);
+ slog(MISC_PRINT,SLOG_DEBUG,"[websReadEvent]:change_wp_query function:%s\n",websRecvHttpBuffer_XML);
//zte_change_wp_query(wp,websRecvHttpBuffer_Json);
zte_change_wp_query(wp,websRecvHttpBuffer_XML);
memset(websRecvHttpBuffer_XML,0,HTTP_BUFFER_SIZE);
@@ -2274,7 +2274,7 @@
(void)zte_web_write(NV_LOGINFO,"timeout");
(void)zte_web_write(NV_COOKIE_ID, "");
(void)zte_web_write(NV_USER_LOGIN_TIMEMARK,"0");
- slog(MISC_PRINT,SLOG_ERR,"zte_mgmt_login_timemark_check: the login is timeout .\n");
+ slog(MISC_PRINT,SLOG_ERR,"mgmt_login_timemark_check: the login is timeout .\n");
}
else
{