sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simwifi: Suppress the scanning times to avoid the popen crash.

Browse Source 
Signed-off-by: liqinhui <liqinhui@xiaomi.com>
This commit is contained in:
liqinhui 2024-06-26 20:27:21 +08:00 committed by Xiang Xiao
parent 577e2fa73f
commit 6d3fdd4f15
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/sim/src/sim/sim_wifidriver.c
View File

@ -31,6 +31,7 @@
#include <nuttx/net/netdev_lowerhalf.h> #include <nuttx/net/netdev_lowerhalf.h>
#include <netpacket/netlink.h> #include <netpacket/netlink.h>
#include <nuttx/net/netlink.h> #include <nuttx/net/netlink.h>
#include <sys/time.h>
#include "sim_internal.h" #include "sim_internal.h"
@ -176,6 +177,7 @@ struct sim_netdev_s
bool psk_flag; /* for psk, 0: unset, 1: set */ bool psk_flag; /* for psk, 0: unset, 1: set */
char host_ifname[IFNAMSIZ]; /* The wlan interface name on the host */ char host_ifname[IFNAMSIZ]; /* The wlan interface name on the host */
uint8_t network_id; /* for sta, default is 0 */ uint8_t network_id; /* for sta, default is 0 */
hrtime_t scantime;
}; };
/* for wireless event */ /* for wireless event */
@ -1075,6 +1077,7 @@ static int wifidriver_start_scan(struct sim_netdev_s *wifidev,
{ {
int ret; int ret;
uint8_t mode = wifidev->mode; uint8_t mode = wifidev->mode;
hrtime_t curtime;
if (mode == IW_MODE_MASTER) if (mode == IW_MODE_MASTER)
{ {
@ -1082,6 +1085,13 @@ static int wifidriver_start_scan(struct sim_netdev_s *wifidev,
} }
else if (mode == IW_MODE_INFRA) else if (mode == IW_MODE_INFRA)
{ {
curtime = gethrtime();
if (wifidev->scantime && wifidev->scantime - curtime >= 5000000000)
{
return OK;
}
wifidev->scantime = curtime;
ret = set_cmd(wifidev, "scan"); ret = set_cmd(wifidev, "scan");
if (ret == -EINVAL) if (ret == -EINVAL)
{ {
@ -1109,6 +1119,11 @@ static int wifidriver_scan_result(struct sim_netdev_s *wifidev,
} }
else if (wifidev->mode == IW_MODE_INFRA) else if (wifidev->mode == IW_MODE_INFRA)
{ {
if (wifidev->scantime && wifidev->scantime - gethrtime() < 5000000000)
{
return -EAGAIN;
}
scan_req.buf = pwrq->u.data.pointer; scan_req.buf = pwrq->u.data.pointer;
scan_req.total_len = pwrq->u.data.length; scan_req.total_len = pwrq->u.data.length;
scan_req.cur_len = 0; scan_req.cur_len = 0;