mirror of
https://github.com/RT-Thread/rt-thread.git
synced 2025-10-22 08:24:18 +08:00
[components][drivers][wlan] 修复自动连接 32 密码长度失败的问题,增强代码稳定性
This commit is contained in:
@@ -468,6 +468,10 @@ static int wifi_debug_set_mode(int argc, char *argv[])
|
|||||||
{
|
{
|
||||||
mode = RT_WLAN_AP;
|
mode = RT_WLAN_AP;
|
||||||
}
|
}
|
||||||
|
else if (rt_strcmp("none", argv[1]) == 0)
|
||||||
|
{
|
||||||
|
mode = RT_WLAN_NONE;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
@@ -56,12 +56,16 @@ static void netif_is_ready(struct rt_work *work, void *parameter)
|
|||||||
ip_addr_t ip_addr_zero = { 0 };
|
ip_addr_t ip_addr_zero = { 0 };
|
||||||
struct rt_wlan_device *wlan = parameter;
|
struct rt_wlan_device *wlan = parameter;
|
||||||
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
||||||
struct eth_device *eth_dev = &lwip_prot->eth;
|
struct eth_device *eth_dev;
|
||||||
rt_base_t level;
|
rt_base_t level;
|
||||||
struct rt_wlan_buff buff;
|
struct rt_wlan_buff buff;
|
||||||
rt_uint32_t ip_addr[4];
|
rt_uint32_t ip_addr[4];
|
||||||
char str[IPADDR_STRLEN_MAX];
|
char str[IPADDR_STRLEN_MAX];
|
||||||
|
|
||||||
|
if (lwip_prot == RT_NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
eth_dev = &lwip_prot->eth;
|
||||||
rt_timer_stop(&lwip_prot->timer);
|
rt_timer_stop(&lwip_prot->timer);
|
||||||
if (ip_addr_cmp(&(eth_dev->netif->ip_addr), &ip_addr_zero) != 0)
|
if (ip_addr_cmp(&(eth_dev->netif->ip_addr), &ip_addr_zero) != 0)
|
||||||
{
|
{
|
||||||
@@ -122,9 +126,13 @@ static void timer_callback(void *parameter)
|
|||||||
struct rt_workqueue *workqueue;
|
struct rt_workqueue *workqueue;
|
||||||
struct rt_wlan_device *wlan = parameter;
|
struct rt_wlan_device *wlan = parameter;
|
||||||
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
||||||
struct rt_work *work = &lwip_prot->work;
|
struct rt_work *work;
|
||||||
rt_base_t level;
|
rt_base_t level;
|
||||||
|
|
||||||
|
if (lwip_prot == RT_NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
work = &lwip_prot->work;
|
||||||
workqueue = rt_wlan_get_workqueue();
|
workqueue = rt_wlan_get_workqueue();
|
||||||
if (workqueue != RT_NULL)
|
if (workqueue != RT_NULL)
|
||||||
{
|
{
|
||||||
@@ -148,7 +156,12 @@ static void netif_set_connected(void *parameter)
|
|||||||
{
|
{
|
||||||
struct rt_wlan_device *wlan = parameter;
|
struct rt_wlan_device *wlan = parameter;
|
||||||
struct lwip_prot_des *lwip_prot = wlan->prot;
|
struct lwip_prot_des *lwip_prot = wlan->prot;
|
||||||
struct eth_device *eth_dev = &lwip_prot->eth;
|
struct eth_device *eth_dev;
|
||||||
|
|
||||||
|
if (lwip_prot == RT_NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
eth_dev = &lwip_prot->eth;
|
||||||
|
|
||||||
if (lwip_prot->connected_flag)
|
if (lwip_prot->connected_flag)
|
||||||
{
|
{
|
||||||
@@ -209,6 +222,9 @@ static void rt_wlan_lwip_event_handle(struct rt_wlan_prot *port, struct rt_wlan_
|
|||||||
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
struct lwip_prot_des *lwip_prot = (struct lwip_prot_des *)wlan->prot;
|
||||||
rt_bool_t flag_old;
|
rt_bool_t flag_old;
|
||||||
|
|
||||||
|
if (lwip_prot == RT_NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
flag_old = lwip_prot->connected_flag;
|
flag_old = lwip_prot->connected_flag;
|
||||||
|
|
||||||
switch (event)
|
switch (event)
|
||||||
@@ -472,12 +488,9 @@ static struct rt_wlan_prot *rt_wlan_lwip_protocol_register(struct rt_wlan_prot *
|
|||||||
return RT_NULL;
|
return RT_NULL;
|
||||||
}
|
}
|
||||||
rt_memcpy(&lwip_prot->prot, prot, sizeof(struct rt_wlan_prot));
|
rt_memcpy(&lwip_prot->prot, prot, sizeof(struct rt_wlan_prot));
|
||||||
if (wlan->mode == RT_WLAN_STATION)
|
|
||||||
{
|
|
||||||
rt_sprintf(timer_name, "timer_%s", eth_name);
|
rt_sprintf(timer_name, "timer_%s", eth_name);
|
||||||
rt_timer_init(&lwip_prot->timer, timer_name, timer_callback, wlan, rt_tick_from_millisecond(1000),
|
rt_timer_init(&lwip_prot->timer, timer_name, timer_callback, wlan, rt_tick_from_millisecond(1000),
|
||||||
RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT);
|
RT_TIMER_FLAG_SOFT_TIMER | RT_TIMER_FLAG_ONE_SHOT);
|
||||||
}
|
|
||||||
netif_set_up(eth->netif);
|
netif_set_up(eth->netif);
|
||||||
LOG_I("eth device init ok name:%s", eth_name);
|
LOG_I("eth device init ok name:%s", eth_name);
|
||||||
#ifdef RT_USING_NETDEV
|
#ifdef RT_USING_NETDEV
|
||||||
|
@@ -528,7 +528,7 @@ static void rt_wlan_auto_connect_run(struct rt_work *work, void *parameter)
|
|||||||
|
|
||||||
if (id >= rt_wlan_cfg_get_num()) id = 0;
|
if (id >= rt_wlan_cfg_get_num()) id = 0;
|
||||||
|
|
||||||
if ((cfg_info.key.len > 0) && (cfg_info.key.len < RT_WLAN_PASSWORD_MAX_LENGTH))
|
if ((cfg_info.key.len > 0) && (cfg_info.key.len <= RT_WLAN_PASSWORD_MAX_LENGTH))
|
||||||
{
|
{
|
||||||
cfg_info.key.val[cfg_info.key.len] = '\0';
|
cfg_info.key.val[cfg_info.key.len] = '\0';
|
||||||
password = (char *)(&cfg_info.key.val[0]);
|
password = (char *)(&cfg_info.key.val[0]);
|
||||||
|
Reference in New Issue
Block a user