Merge branch 'example/multi_interface' into 'master'

feat(example): Add tcp client example for multiple interface.

See merge request espressif/esp-idf!6918

Author: david-cermak

components/esp_netif/include/esp_netif.h

@@ -402,6 +402,22 @@ esp_err_t esp_netif_set_old_ip_info(esp_netif_t *esp_netif, const esp_netif_ip_i
  */
 int esp_netif_get_netif_impl_index(esp_netif_t *esp_netif);
 
+/**
+ * @brief  Get net interface name from network stack implementation
+ *
+ * @note This name could be used in `setsockopt()` to bind socket with appropriate interface
+ *
+ * @param[in]  esp_netif Handle to esp-netif instance
+ * @param[out]  name Interface name as specified in underlying TCP/IP stack. Note that the
+ * actual name will be copied to the specified buffer, which must be allocated to hold
+ * maximum interface name size (6 characters for lwIP)
+ *
+ * @return
+ *         - ESP_OK
+ *         - ESP_ERR_ESP_NETIF_INVALID_PARAMS
+*/
+esp_err_t esp_netif_get_netif_impl_name(esp_netif_t *esp_netif, char* name);
+
 /**
  * @}
  */
@@ -648,6 +664,17 @@ esp_err_t esp_netif_get_ip6_linklocal(esp_netif_t *esp_netif, esp_ip6_addr_t *if
  */
 esp_err_t esp_netif_get_ip6_global(esp_netif_t *esp_netif, esp_ip6_addr_t *if_ip6);
 
+/**
+ * @brief  Get all IPv6 addresses of the specified interface
+ *
+ * @param[in]  esp_netif Handle to esp-netif instance
+ * @param[out] if_ip6 Array of IPv6 addresses will be copied to the argument
+ *
+ * @return
+ *      number of returned IPv6 addresses
+ */
+int esp_netif_get_all_ip6(esp_netif_t *esp_netif, esp_ip6_addr_t if_ip6[]);
+
 /**
  * @brief Sets IPv4 address to the specified octets
  *

components/esp_netif/lwip/esp_netif_lwip.c

@@ -1446,7 +1446,7 @@ static esp_err_t esp_netif_create_ip6_linklocal_api(esp_netif_api_msg_t *msg)
 {
     esp_netif_t *esp_netif = msg->esp_netif;
 
-    ESP_LOGD(TAG, "%s esp-netif:%p", __func__, esp_netif);
+    ESP_LOGV(TAG, "%s esp-netif:%p", __func__, esp_netif);
 
     struct netif *p_netif = esp_netif->lwip_netif;
     if (p_netif != NULL && netif_is_up(p_netif)) {
@@ -1462,7 +1462,7 @@ esp_err_t esp_netif_create_ip6_linklocal(esp_netif_t *esp_netif) _RUN_IN_LWIP_TA
 
 esp_err_t esp_netif_get_ip6_linklocal(esp_netif_t *esp_netif, esp_ip6_addr_t *if_ip6)
 {
-    ESP_LOGD(TAG, "%s esp-netif:%p", __func__, esp_netif);
+    ESP_LOGV(TAG, "%s esp-netif:%p", __func__, esp_netif);
 
     if (esp_netif == NULL || if_ip6 == NULL || esp_netif->is_ppp_netif) {
         return ESP_ERR_ESP_NETIF_INVALID_PARAMS;
@@ -1479,7 +1479,7 @@ esp_err_t esp_netif_get_ip6_linklocal(esp_netif_t *esp_netif, esp_ip6_addr_t *if
 
 esp_err_t esp_netif_get_ip6_global(esp_netif_t *esp_netif, esp_ip6_addr_t *if_ip6)
 {
-    ESP_LOGD(TAG, "%s esp-netif:%p", __func__, esp_netif);
+    ESP_LOGV(TAG, "%s esp-netif:%p", __func__, esp_netif);
 
     if (esp_netif == NULL || if_ip6 == NULL) {
         return ESP_ERR_ESP_NETIF_INVALID_PARAMS;
@@ -1496,10 +1496,31 @@ esp_err_t esp_netif_get_ip6_global(esp_netif_t *esp_netif, esp_ip6_addr_t *if_ip
             }
         }
     }
-    
+
     return ESP_FAIL;
 }
 
+int esp_netif_get_all_ip6(esp_netif_t *esp_netif, esp_ip6_addr_t if_ip6[])
+{
+    ESP_LOGV(TAG, "%s esp-netif:%p", __func__, esp_netif);
+
+    if (esp_netif == NULL || if_ip6 == NULL) {
+        return 0;
+    }
+
+    int addr_count = 0;
+    struct netif *p_netif = esp_netif->lwip_netif;
+
+    if (p_netif != NULL && netif_is_up(p_netif)) {
+        for (int i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+            if (!ip_addr_cmp(&p_netif->ip6_addr[i], IP6_ADDR_ANY)) {
+                memcpy(&if_ip6[addr_count++], &p_netif->ip6_addr[i], sizeof(ip6_addr_t));
+            }
+        }
+    }
+    return addr_count;
+}
+
 esp_netif_flags_t esp_netif_get_flags(esp_netif_t *esp_netif)
 {
     return esp_netif->flags;
@@ -1715,4 +1736,15 @@ int esp_netif_get_netif_impl_index(esp_netif_t *esp_netif)
     return netif_get_index(esp_netif->lwip_netif);
 }
 
+esp_err_t esp_netif_get_netif_impl_name(esp_netif_t *esp_netif, char* name)
+{
+    ESP_LOGD(TAG, "%s esp_netif:%p", __func__, esp_netif);
+
+    if (esp_netif == NULL || esp_netif->lwip_netif == NULL) {
+        return ESP_ERR_ESP_NETIF_INVALID_PARAMS;
+    }
+    netif_index_to_name(netif_get_index(esp_netif->lwip_netif), name);
+    return ESP_OK;
+}
+
 #endif /* CONFIG_ESP_NETIF_TCPIP_LWIP */

examples/common_components/protocol_examples_common/Kconfig.projbuild

@@ -1,18 +1,11 @@
 menu "Example Connection Configuration"
-    choice EXAMPLE_CONNECT_INTERFACE
-        prompt "Connect using"
-        default EXAMPLE_CONNECT_WIFI
-        help
-            Protocol examples can use Wi-Fi or Ethernet to connect to the network.
-            Choose which interface to use.
-
-        config EXAMPLE_CONNECT_WIFI
-            bool "Wi-Fi"
 
-        config EXAMPLE_CONNECT_ETHERNET
-            bool "Ethernet"
-
-    endchoice
+    config EXAMPLE_CONNECT_WIFI
+        bool "connect using WiFi interface"
+        default y
+        help
+            Protocol examples can use Wi-Fi and/or Ethernet to connect to the network.
+            Choose this option to connect with WiFi
 
     if EXAMPLE_CONNECT_WIFI
         config EXAMPLE_WIFI_SSID
@@ -29,6 +22,13 @@ menu "Example Connection Configuration"
                 Can be left blank if the network has no security set.
     endif
 
+    config EXAMPLE_CONNECT_ETHERNET
+        bool "connect using Ethernet interface"
+        default n
+        help
+            Protocol examples can use Wi-Fi and/or Ethernet to connect to the network.
+            Choose this option to connect with Ethernet
+
     if EXAMPLE_CONNECT_ETHERNET
         choice EXAMPLE_USE_ETHERNET
             prompt "Ethernet Type"