Skip to content

Commit 24f7031

Browse files
fix(mdns): fix build issue if CONFIG_ESP_WIFI_ENABLED disabled
1 parent 62d809a commit 24f7031

File tree

1 file changed

+43
-41
lines changed

1 file changed

+43
-41
lines changed

components/mdns/mdns.c

Lines changed: 43 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -4157,6 +4157,7 @@ void mdns_preset_if_handle_system_event(void *arg, esp_event_base_t event_base,
41574157
}
41584158

41594159
esp_netif_dhcp_status_t dcst;
4160+
#if CONFIG_ESP_WIFI_ENABLED
41604161
if (event_base == WIFI_EVENT) {
41614162
switch (event_id) {
41624163
case WIFI_EVENT_STA_CONNECTED:
@@ -4180,51 +4181,52 @@ void mdns_preset_if_handle_system_event(void *arg, esp_event_base_t event_base,
41804181
default:
41814182
break;
41824183
}
4183-
}
4184+
} else
4185+
#endif
41844186
#if CONFIG_ETH_ENABLED
4185-
else if (event_base == ETH_EVENT) {
4186-
switch (event_id) {
4187-
case ETHERNET_EVENT_CONNECTED:
4188-
if (!esp_netif_dhcpc_get_status(esp_netif_from_preset_if(MDNS_IF_ETH), &dcst)) {
4189-
if (dcst == ESP_NETIF_DHCP_STOPPED) {
4190-
post_mdns_enable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4187+
if (event_base == ETH_EVENT) {
4188+
switch (event_id) {
4189+
case ETHERNET_EVENT_CONNECTED:
4190+
if (!esp_netif_dhcpc_get_status(esp_netif_from_preset_if(MDNS_IF_ETH), &dcst)) {
4191+
if (dcst == ESP_NETIF_DHCP_STOPPED) {
4192+
post_mdns_enable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4193+
}
41914194
}
4195+
break;
4196+
case ETHERNET_EVENT_DISCONNECTED:
4197+
post_mdns_disable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4198+
post_mdns_disable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V6);
4199+
break;
4200+
default:
4201+
break;
41924202
}
4193-
break;
4194-
case ETHERNET_EVENT_DISCONNECTED:
4195-
post_mdns_disable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4196-
post_mdns_disable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V6);
4197-
break;
4198-
default:
4199-
break;
4200-
}
4201-
}
4203+
} else
42024204
#endif
4203-
else if (event_base == IP_EVENT) {
4204-
switch (event_id) {
4205-
case IP_EVENT_STA_GOT_IP:
4206-
post_mdns_enable_pcb(MDNS_IF_STA, MDNS_IP_PROTOCOL_V4);
4207-
post_mdns_announce_pcb(MDNS_IF_STA, MDNS_IP_PROTOCOL_V6);
4208-
break;
4205+
if (event_base == IP_EVENT) {
4206+
switch (event_id) {
4207+
case IP_EVENT_STA_GOT_IP:
4208+
post_mdns_enable_pcb(MDNS_IF_STA, MDNS_IP_PROTOCOL_V4);
4209+
post_mdns_announce_pcb(MDNS_IF_STA, MDNS_IP_PROTOCOL_V6);
4210+
break;
42094211
#if CONFIG_ETH_ENABLED
4210-
case IP_EVENT_ETH_GOT_IP:
4211-
post_mdns_enable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4212-
break;
4212+
case IP_EVENT_ETH_GOT_IP:
4213+
post_mdns_enable_pcb(MDNS_IF_ETH, MDNS_IP_PROTOCOL_V4);
4214+
break;
42134215
#endif
4214-
case IP_EVENT_GOT_IP6: {
4215-
ip_event_got_ip6_t *event = (ip_event_got_ip6_t *) event_data;
4216-
mdns_if_t mdns_if = _mdns_get_if_from_esp_netif(event->esp_netif);
4217-
if (mdns_if < MDNS_MAX_INTERFACES) {
4218-
post_mdns_enable_pcb(mdns_if, MDNS_IP_PROTOCOL_V6);
4219-
post_mdns_announce_pcb(mdns_if, MDNS_IP_PROTOCOL_V4);
4220-
}
4216+
case IP_EVENT_GOT_IP6: {
4217+
ip_event_got_ip6_t *event = (ip_event_got_ip6_t *) event_data;
4218+
mdns_if_t mdns_if = _mdns_get_if_from_esp_netif(event->esp_netif);
4219+
if (mdns_if < MDNS_MAX_INTERFACES) {
4220+
post_mdns_enable_pcb(mdns_if, MDNS_IP_PROTOCOL_V6);
4221+
post_mdns_announce_pcb(mdns_if, MDNS_IP_PROTOCOL_V4);
4222+
}
42214223

4222-
}
4223-
break;
4224-
default:
4225-
break;
4226-
}
4227-
}
4224+
}
4225+
break;
4226+
default:
4227+
break;
4228+
}
4229+
}
42284230
}
42294231
#endif /* CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP || CONFIG_MDNS_PREDEF_NETIF_ETH */
42304232

@@ -5357,7 +5359,7 @@ static inline void set_default_duplicated_interfaces(void)
53575359

53585360
static inline void unregister_predefined_handlers(void)
53595361
{
5360-
#if CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP
5362+
#if defined(CONFIG_ESP_WIFI_ENABLED) && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP)
53615363
esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event);
53625364
#endif
53635365
#if CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP || CONFIG_MDNS_PREDEF_NETIF_ETH
@@ -5454,7 +5456,7 @@ esp_err_t mdns_init(void)
54545456
goto free_queue;
54555457
}
54565458

5457-
#if CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP
5459+
#if defined(CONFIG_ESP_WIFI_ENABLED) && (CONFIG_MDNS_PREDEF_NETIF_STA || CONFIG_MDNS_PREDEF_NETIF_AP)
54585460
if ((err = esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, mdns_preset_if_handle_system_event, NULL)) != ESP_OK) {
54595461
goto free_event_handlers;
54605462
}

0 commit comments

Comments
 (0)