Merge branch 'test/bridge' into 'master'

[network/examples]: Fix build rules to test builds on for all targets See merge request espressif/esp-idf!36590
safocl · Jan 24, 2025 · e65c9a5 · e65c9a5
2 parents e5ee420 + b708c01
commit e65c9a5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/components/esp_netif/lwip/esp_netif_br_glue.c b/components/esp_netif/lwip/esp_netif_br_glue.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -97,11 +97,14 @@ static void port_action_start(void *handler_args, esp_event_base_t base, int32_t
 {
     esp_netif_br_glue_t *netif_glue = handler_args;
 
+#if CONFIG_ESP_WIFI_ENABLED
     if (base == WIFI_EVENT) {
         ESP_LOGD(TAG, "wifi_action_start: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
         start_br_if_stopped(netif_glue);
         esp_netif_bridge_add_port(netif_glue->base.netif, netif_glue->wifi_esp_netif);
-    } else if (base == ETH_EVENT) {
+    } else
+#endif /* CONFIG_ESP_WIFI_ENABLED */
+    if (base == ETH_EVENT) {
         esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
         ESP_LOGD(TAG, "eth_action_start: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
         for (int i = 0; i < netif_glue->port_cnt; i++) {
@@ -119,10 +122,13 @@ static void port_action_stop(void *handler_args, esp_event_base_t base, int32_t
 
     // if one of the bridge's ports is stopped, we need to stop the bridge too, since port's lwip_netif is removed and so it would become
     // an invalid reference in the bridge's internal structure (there is no way how to remove single port from bridge in current LwIP)
+#if CONFIG_ESP_WIFI_ENABLED
     if (base == WIFI_EVENT) {
         ESP_LOGD(TAG, "wifi_action_stop: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
         stop_br_if_started(netif_glue);
-    } else if (base == ETH_EVENT) {
+    } else
+#endif /* CONFIG_ESP_WIFI_ENABLED */
+    if (base == ETH_EVENT) {
         esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
         ESP_LOGD(TAG, "eth_action_stop: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
         for (int i = 0; i < netif_glue->port_cnt; i++) {
@@ -142,11 +148,13 @@ static void port_action_connected(void *handler_args, esp_event_base_t base, int
         ESP_LOGD(TAG, "action_connected, no action bridge is up");
         return;
     }
-
+#if CONFIG_ESP_WIFI_ENABLED
     if (base == WIFI_EVENT) {
         ESP_LOGD(TAG, "wifi_action_connected: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
         esp_netif_action_connected(netif_glue->base.netif, 0, 0, NULL);
-    } else if (base == ETH_EVENT) {
+    } else
+#endif /* CONFIG_ESP_WIFI_ENABLED */
+    if (base == ETH_EVENT) {
         esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
         ESP_LOGD(TAG, "eth_action_connected: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
         for (int i = 0; i < netif_glue->port_cnt; i++) {
@@ -253,6 +261,7 @@ static esp_err_t esp_netif_br_glue_set_instance_handlers(esp_netif_br_glue_handl
     return ret;
 }
 
+#if CONFIG_ESP_WIFI_ENABLED
 static esp_err_t esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue_handle_t esp_netif_br_glue)
 {
     ESP_RETURN_ON_FALSE(esp_netif_br_glue, ESP_ERR_INVALID_ARG, TAG, "esp_netif_br_glue handle can't be null");
@@ -313,6 +322,7 @@ static esp_err_t esp_netif_br_glue_set_instance_handlers_wifi(esp_netif_br_glue_
     esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue);
     return ret;
 }
+#endif /* CONFIG_ESP_WIFI_ENABLED */
 
 esp_err_t esp_netif_br_glue_add_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port)
 {
@@ -334,6 +344,7 @@ esp_err_t esp_netif_br_glue_add_port(esp_netif_br_glue_handle_t netif_br_glue, e
 
 esp_err_t esp_netif_br_glue_add_wifi_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port)
 {
+#if CONFIG_ESP_WIFI_ENABLED
     esp_err_t ret = ESP_OK;
     ESP_GOTO_ON_FALSE(netif_br_glue->wifi_esp_netif == NULL, ESP_ERR_INVALID_STATE, fail_ret, TAG, "WiFi interface already registered");
     const char *if_desc = esp_netif_get_desc(esp_netif_port);
@@ -348,6 +359,9 @@ esp_err_t esp_netif_br_glue_add_wifi_port(esp_netif_br_glue_handle_t netif_br_gl
     netif_br_glue->wifi_ctx_handlers = NULL;
 fail_ret:
     return ret;
+#else
+    return ESP_ERR_NOT_SUPPORTED;
+#endif /* CONFIG_ESP_WIFI_ENABLED */
 }
 
 esp_netif_br_glue_handle_t esp_netif_br_glue_new(void)
@@ -372,9 +386,11 @@ esp_err_t esp_netif_br_glue_del(esp_netif_br_glue_handle_t netif_br_glue)
 {
     stop_br_if_started(netif_br_glue);
     esp_netif_br_glue_clear_instance_handlers(netif_br_glue);
+#if CONFIG_ESP_WIFI_ENABLED
     if (netif_br_glue->wifi_esp_netif != NULL) {
         esp_netif_br_glue_clear_instance_handlers_wifi(netif_br_glue);
     }
+#endif /* CONFIG_ESP_WIFI_ENABLED */
     free(netif_br_glue->ports_esp_netifs);
     free(netif_br_glue);
     netif_br_glue = NULL;

diff --git a/examples/network/bridge/sdkconfig.ci b/examples/network/bridge/sdkconfig.ci
@@ -0,0 +1,6 @@
+# This is the default CI config for building the example for all supported targets
+# Note that it enables SPI Ethernet, so it uses eth-eth bridge (to support targets that don't have Wi-Fi)
+CONFIG_ESP_NETIF_TCPIP_LWIP=y
+CONFIG_ESP_NETIF_BRIDGE_EN=y
+CONFIG_EXAMPLE_USE_SPI_ETHERNET=y
+CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=1