espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-30 21:58:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_example_udp_client' into 'master'

Browse Source 
Fix UDP client example IPv6 support

See merge request sdk/ESP8266_RTOS_SDK!708
This commit is contained in:
Dong Heng
2019-01-08 17:13:04 +08:00
parent 797dd7014a 762295a97a
commit ce41364d20
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/protocols/sockets/udp_client/main/udp_client.c
View File

@ -43,7 +43,9 @@
static EventGroupHandle_t wifi_event_group; static EventGroupHandle_t wifi_event_group;
const int IPV4_GOTIP_BIT = BIT0; const int IPV4_GOTIP_BIT = BIT0;
#ifdef CONFIG_EXAMPLE_IPV6
const int IPV6_GOTIP_BIT = BIT1; const int IPV6_GOTIP_BIT = BIT1;
#endif
static const char *TAG = "example"; static const char *TAG = "example";
static const char *payload = "Message from ESP32 "; static const char *payload = "Message from ESP32 ";
@ -56,8 +58,10 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_START");
break; break;
case SYSTEM_EVENT_STA_CONNECTED: case SYSTEM_EVENT_STA_CONNECTED:
#ifdef CONFIG_EXAMPLE_IPV6
/* enable ipv6 */ /* enable ipv6 */
tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_STA); tcpip_adapter_create_ip6_linklocal(TCPIP_ADAPTER_IF_STA);
#endif
break; break;
case SYSTEM_EVENT_STA_GOT_IP: case SYSTEM_EVENT_STA_GOT_IP:
xEventGroupSetBits(wifi_event_group, IPV4_GOTIP_BIT); xEventGroupSetBits(wifi_event_group, IPV4_GOTIP_BIT);
@ -67,14 +71,18 @@ static esp_err_t event_handler(void *ctx, system_event_t *event)
/* This is a workaround as ESP32 WiFi libs don't currently auto-reassociate. */ /* This is a workaround as ESP32 WiFi libs don't currently auto-reassociate. */
esp_wifi_connect(); esp_wifi_connect();
xEventGroupClearBits(wifi_event_group, IPV4_GOTIP_BIT); xEventGroupClearBits(wifi_event_group, IPV4_GOTIP_BIT);
#ifdef CONFIG_EXAMPLE_IPV6
xEventGroupClearBits(wifi_event_group, IPV6_GOTIP_BIT); xEventGroupClearBits(wifi_event_group, IPV6_GOTIP_BIT);
#endif
break; break;
case SYSTEM_EVENT_AP_STA_GOT_IP6: case SYSTEM_EVENT_AP_STA_GOT_IP6:
#ifdef CONFIG_EXAMPLE_IPV6
xEventGroupSetBits(wifi_event_group, IPV6_GOTIP_BIT); xEventGroupSetBits(wifi_event_group, IPV6_GOTIP_BIT);
ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP6"); ESP_LOGI(TAG, "SYSTEM_EVENT_STA_GOT_IP6");
char *ip6 = ip6addr_ntoa(&event->event_info.got_ip6.ip6_info.ip); char *ip6 = ip6addr_ntoa(&event->event_info.got_ip6.ip6_info.ip);
ESP_LOGI(TAG, "IPv6: %s", ip6); ESP_LOGI(TAG, "IPv6: %s", ip6);
#endif
default: default:
break; break;
} }
@ -103,7 +111,11 @@ static void initialise_wifi(void)
static void wait_for_ip() static void wait_for_ip()
{ {
uint32_t bits = IPV4_GOTIP_BIT | IPV6_GOTIP_BIT ; #ifdef CONFIG_EXAMPLE_IPV6
uint32_t bits = IPV4_GOTIP_BIT | IPV6_GOTIP_BIT;
#else
uint32_t bits = IPV4_GOTIP_BIT;
#endif
ESP_LOGI(TAG, "Waiting for AP connection..."); ESP_LOGI(TAG, "Waiting for AP connection...");
xEventGroupWaitBits(wifi_event_group, bits, false, true, portMAX_DELAY); xEventGroupWaitBits(wifi_event_group, bits, false, true, portMAX_DELAY);