Merge "[Feature][T8TSK-291]modify the sensitive information in syslog (imei log)" into GSW3.0-No-Connman
diff --git a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp b/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
index 4d5c7ee..5cd9cfc 100755
--- a/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
+++ b/framework/lynq-sdk-ready/src/timer/lynq_timer.cpp
@@ -97,6 +97,7 @@
return 0;
}
+
/**
* @brief 30s request imei
*
@@ -189,7 +190,7 @@
//unknow
system("uci set lynq_uci.sdk_ready='4'");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
- continue;;
+ continue;
}
if(recv_num == -1 && errno == EAGAIN)
{
@@ -221,7 +222,7 @@
}
}
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
- continue;;
+ continue;
}
if(recv_num < 0)
{
@@ -229,7 +230,7 @@
//unknow
system("uci set lynq_uci.sdk_ready='4'");
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
- continue;;
+ continue;
}
Parcel p;
p.setData((uint8_t *)res_data,sizeof(char)*recv_num);
@@ -254,6 +255,17 @@
RLOGD("__FUNCTION__ %s res_error %d\n", __FUNCTION__, res_error);
/*judge the res_error*/
pthread_mutex_unlock(&g_lynq_sim_sendto_mutex);
+
+ ret = system("dmesg|grep \"tx_busy\"|grep -v \"tx_busy=(0,0)\"");
+ if(!ret)
+ {
+ RLOGD("check tx_busy exist, down modem!!\n");
+ system("echo \"ccif_assert\" > /sys/kernel/ccci/mdsys1/control");
+ }
+ else
+ {
+ RLOGD("check tx_busy no exist, down modem!!\n");
+ }
sleep(TIMER);
}
return NULL;
diff --git a/lib/liblynq-data/lynq_data.cpp b/lib/liblynq-data/lynq_data.cpp
index 248000d..e5b23e8 100755
--- a/lib/liblynq-data/lynq_data.cpp
+++ b/lib/liblynq-data/lynq_data.cpp
@@ -826,6 +826,7 @@
sendSignalApnChange();
}
free(urc_msg);
+ break;
}
case LYNQ_TELEPHONY_RESTART:
{
@@ -837,12 +838,9 @@
pthread_mutex_lock(&s_lynq_urc_vector_mutex);
s_data_urc_wait_list.push_back(TELEPHONY_RESTART);
pthread_mutex_unlock(&s_lynq_urc_vector_mutex);
- radio_switch(0);
- sleep(1);
- radio_switch(1);
- sleep(1);
sendSignalPdnChange();
}
+ break;
}
default:
break;
diff --git a/lib/liblynq-wifi6/libwifi6.c b/lib/liblynq-wifi6/libwifi6.c
index 77d826e..94a094d 100755
--- a/lib/liblynq-wifi6/libwifi6.c
+++ b/lib/liblynq-wifi6/libwifi6.c
@@ -2194,7 +2194,7 @@
DO_OK_FAIL_REQUEST(lynq_wifi_ssid_cmd);
DO_OK_FAIL_REQUEST(cmd_save_config);
- RLOGD("[lynq_wifi_ap_ssid_set] set ssid sucss");
+ RLOGD("[lynq_wifi_ap_ssid_set] set ssid succeed %d",__LINE__);
return 0;
}
@@ -3869,7 +3869,7 @@
int lynq_wifi_sta_start(lynq_wifi_index_e idx)
{
-
+ RLOGD("enter %s %d func",__func__,__LINE__);
const char *lynq_enable_sta_cmd = "wpa_cli -iwpa_wlan0_cmd -p/var/run/ IFNAME=wlan0 enable_net all";
const char *lynq_reconnect_cmd = "wpa_cli -iwpa_wlan0_cmd -p/var/run/ IFNAME=wlan0 reconnect";
@@ -3879,7 +3879,7 @@
ret = system_call_v("%s %s", start_stop_sta_script, "start");
if (ret != 0)
{
- RLOGE("lynq_wifi_ap_start excute script fail");
+ RLOGE("lynq_wifi_sta_start excute script fail %s %d",__func__,__LINE__);
return -1;
}
@@ -3889,6 +3889,7 @@
g_history_disconnect_valid_num = 0; //clean history_disconenct_list info
s_sta_status = INNER_STA_STATUS_INIT;
pthread_mutex_unlock(&s_global_check_mutex);
+ RLOGD("end %s %d func",__func__,__LINE__);
return 0;
}
@@ -3935,7 +3936,7 @@
ret = system_call_v("%s %s", start_stop_sta_script, "stop");
if (ret != 0)
{
- RLOGE("lynq_wifi_ap_start excute script fail");
+ RLOGE("lynq_wifi_sta_stop excute script fail %s %d",__func__,__LINE__);
return -1;
}
@@ -3950,7 +3951,7 @@
{
break;
}
- RLOGD("lynq_wifi_ap_start curr state %s", state);
+ RLOGD("lynq_wifi_sta_stop curr state %s %s %d", state,__func__,__LINE__);
usleep(SLEEP_TIME_ON_IDLE);
}
pthread_mutex_lock(&s_global_check_mutex);
@@ -4321,7 +4322,7 @@
}
pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
- RLOGD("creat APWatcherTheradProc susccs");
+ RLOGD("creat APWatcherTheradProc succeed");
return 0;
}
@@ -4366,7 +4367,7 @@
}
pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
- RLOGD("creat STAWatcherTheradProc susccs");
+ RLOGD("creat STAWatcherTheradProc succeed");
return 0;
}
@@ -4407,7 +4408,7 @@
}
}
pthread_mutex_unlock(&s_check_wpa_ctrl_mutex);
- RLOGD("creat STAWatcherTheradProc susccs");
+ RLOGD("creat STAWatcherTheradProc succeed");
return 0;
}
int lynq_unreg_sta_auto_event_callback(void * priv) {
@@ -4865,7 +4866,6 @@
if (ret != 0)
{
RLOGE("[lynq_get_connect_ap_ip] inner_get_ip_by_mac return fail");
- return -1;
}
if (ip[0] == '\0' || strchr(ip, ':') != NULL) //temp change, not ok