[Feature][ZXW-33]merge ZXW 0428 version
Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
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);
}