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

wapi: skip associate if ssid is invalid

Browse Source 
Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2020-04-03 13:30:45 +08:00 committed by Abdelatif Guettouche
parent df1d0e73f8
commit 6ab29d4ffb
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
netutils/netinit/netinit.c
View File

@ -411,17 +411,24 @@ static void netinit_net_bringup(void)
{ {
#ifdef CONFIG_NETINIT_DHCPC #ifdef CONFIG_NETINIT_DHCPC
uint8_t mac[IFHWADDRLEN]; uint8_t mac[IFHWADDRLEN];
struct dhcpc_state ds;
FAR void *handle; FAR void *handle;
#endif #endif
/* Bring the network up. */ /* Bring the network up. */
netlib_ifup(NET_DEVNAME); if (netlib_ifup(NET_DEVNAME) < 0)
{
return;
}
#ifdef CONFIG_WIRELESS_WAPI #ifdef CONFIG_WIRELESS_WAPI
/* Associate the wlan with an access point. */ /* Associate the wlan with an access point. */
netinit_associate(NET_DEVNAME); if (netinit_associate(NET_DEVNAME) < 0)
{
return;
}
#endif #endif
#ifdef CONFIG_NET_ICMPv6_AUTOCONF #ifdef CONFIG_NET_ICMPv6_AUTOCONF
@ -438,18 +445,16 @@ static void netinit_net_bringup(void)
/* Set up the DHCPC modules */ /* Set up the DHCPC modules */
handle = dhcpc_open(NET_DEVNAME, &mac, IFHWADDRLEN); handle = dhcpc_open(NET_DEVNAME, &mac, IFHWADDRLEN);
if (handle == NULL)
{
return;
}
/* Get an IP address. Note that there is no logic for renewing the IP /* Get an IP address. Note that there is no logic for renewing the
* address in this example. The address should be renewed in * IP address in this example. The address should be renewed in
* ds.lease_time/2 seconds. * (ds.lease_time / 2) seconds.
*/ */
if (handle != NULL)
{
struct dhcpc_state ds =
{
};
if (dhcpc_request(handle, &ds) == OK) if (dhcpc_request(handle, &ds) == OK)
{ {
netlib_set_ipv4addr(NET_DEVNAME, &ds.ipaddr); netlib_set_ipv4addr(NET_DEVNAME, &ds.ipaddr);
@ -471,7 +476,6 @@ static void netinit_net_bringup(void)
} }
dhcpc_close(handle); dhcpc_close(handle);
}
#endif #endif
#ifdef CONFIG_NETUTILS_NTPCLIENT #ifdef CONFIG_NETUTILS_NTPCLIENT

6
netutils/netinit/netinit_associate.c
View File

@ -41,6 +41,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <nuttx/wireless/wireless.h> #include <nuttx/wireless/wireless.h>
@ -60,7 +61,7 @@
int netinit_associate(FAR const char *ifname) int netinit_associate(FAR const char *ifname)
{ {
struct wpa_wconfig_s conf; struct wpa_wconfig_s conf;
int ret; int ret = -EINVAL;
FAR void *load; FAR void *load;
load = wapi_load_config(ifname, NULL, &conf); load = wapi_load_config(ifname, NULL, &conf);
@ -77,7 +78,10 @@ int netinit_associate(FAR const char *ifname)
conf.phraselen = strlen(conf.passphrase); conf.phraselen = strlen(conf.passphrase);
} }
if (conf.ssidlen > 0)
{
ret = wpa_driver_wext_associate(&conf); ret = wpa_driver_wext_associate(&conf);
}
wapi_unload_config(load); wapi_unload_config(load);