[Feature][ZXW-33]merge ZXW 0428 version

Change-Id: I11f167edfea428d9fab198ff00ff1364932d1b0b
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 *)&para, 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 *)&para, 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 *)&para, 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;
 	}