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