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

wapi/conf: convert mac address

Browse Source 
N/A

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2020-12-08 20:57:01 +08:00 committed by Xiang Xiao
parent 3d42c6460f
commit e4cddb169a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wireless/wapi/src/util.c
View File

@ -307,6 +307,7 @@ FAR void *wapi_load_config(FAR const char *ifname,
FAR const char *confname,
FAR struct wpa_wconfig_s *conf)
{
FAR struct ether_addr *ap;
FAR cJSON *ifobj;
FAR cJSON *root;
FAR cJSON *obj;
@ -336,6 +337,8 @@ FAR void *wapi_load_config(FAR const char *ifname,
goto errout;
}
memset(conf, 0, sizeof(*conf));
obj = cJSON_GetObjectItem(ifobj, "mode");
if (!obj)
{
@ -382,7 +385,11 @@ FAR void *wapi_load_config(FAR const char *ifname,
goto errout;
}
conf->bssid = (FAR const char *)obj->valuestring;
ap = ether_aton(obj->valuestring);
if (ap != NULL)
{
conf->bssid = (FAR const char *)ap->ether_addr_octet;
}
obj = cJSON_GetObjectItem(ifobj, "psk");
if (!obj || !obj->valuestring)

4
wireless/wapi/src/wapi.c
View File

@ -48,6 +48,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/ether.h>
#include "netutils/netlib.h"
#include "wireless/wapi.h"
@ -834,7 +836,7 @@ static int wapi_save_config_cmd(int sock, int argc, FAR char **argv)
return ret;
}
conf.bssid = (FAR const char *)ap.ether_addr_octet;
conf.bssid = ether_ntoa(&ap);
memset(psk, 0, sizeof(psk));
ret = wpa_driver_wext_get_key_ext(sock,