Merge "[BugFix][API-1288]fix wifi driver Redzone && remove +4" into GSW3.0-No-Connman
diff --git a/src/lynq/lib/liblynq-wifi6/include/libwifi6.h b/src/lynq/lib/liblynq-wifi6/include/libwifi6.h
index f99af3d..53006b8 100755
--- a/src/lynq/lib/liblynq-wifi6/include/libwifi6.h
+++ b/src/lynq/lib/liblynq-wifi6/include/libwifi6.h
@@ -235,7 +235,7 @@
int lynq_get_connect_ap_rssi(lynq_wifi_index_e idx,int * rssi);
int lynq_get_connect_ap_band(lynq_wifi_index_e idx,lynq_wifi_band_m * band);
int lynq_get_connect_ap_ip(lynq_wifi_index_e idx,char *ip);
-
+int lynq_get_sta_connected_dns(lynq_wifi_index_e idx,char *dns);
/*****add limit of connected ap device number 2022.10.12 by qs.xiong
*
*sta_number:
diff --git a/src/lynq/lib/liblynq-wifi6/libwifi6.c b/src/lynq/lib/liblynq-wifi6/libwifi6.c
index 3848f9c..963f62b 100755
--- a/src/lynq/lib/liblynq-wifi6/libwifi6.c
+++ b/src/lynq/lib/liblynq-wifi6/libwifi6.c
@@ -478,7 +478,7 @@
}
}
}
- else if (strstr(msg_notify, "WoWLAN is enabled") != NULL || strstr(msg_notify, "Failed to start AP functionality") != NULL || strstr(msg_notify, "Could not connect to kernel driver") != NULL )
+ else if ( strstr(msg_notify, "Failed to start AP functionality") != NULL )
{
RLOGD("APWatcherThreadProc ap------> service error");
inner_notify_ap_msg(LYNQ_WIFI_SERVICE_ABNORMAL);
@@ -904,6 +904,7 @@
else if (memcmp(pReason, "WRONG_KEY", 9) == 0)
{
*error = LYNQ_PSW_ERROR;
+ *state = LYNQ_WIFI_STA_STATUS_CONNECT_FAIL;
// tmp fix sta autoconnect connect and disconnect
if(tmpdisid != -1 && lynq_wifi_sta_stop_network(0,tmpdisid) != 0)
{
@@ -3989,7 +3990,7 @@
if ( g_sta_conncet_status_flag != 0 )
{
RLOGD("current sta is connecting dest ap");
- return -1;
+ return 1;
}
const char *clean_last_re ="wpa_cli -iwpa_wlan0_cmd -p/var/run/ IFNAME=wlan0 bss_flush";
const char *lynq_scan_cmd = "SCAN";
@@ -4604,6 +4605,12 @@
return 0;
}
+int lynq_get_sta_connected_dns(lynq_wifi_index_e idx, char *dns)
+{
+ RLOGD("[wifi]--enter--lynq_get_sta_connected_dns");
+ return lynq_get_connect_ap_ip(idx,dns); //> not 100 % get dns info
+}
+
int lynq_ap_connect_num(int sta_number)
{
char lynq_limit_cmd[32]={0};