mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/enable_ipv6_address_autoconfig_v4.0' into 'release/v4.0'
lw-ip: Enable IPv6 stateless address autoconfiguration (backport v4.0) See merge request espressif/esp-idf!7653
This commit is contained in:
commit
6fee9da72e
@ -239,6 +239,14 @@ menu "LWIP"
|
|||||||
If rate limiting self-assignment requests, wait this long between
|
If rate limiting self-assignment requests, wait this long between
|
||||||
each request.
|
each request.
|
||||||
|
|
||||||
|
config LWIP_IPV6_AUTOCONFIG
|
||||||
|
bool "Enable IPV6 stateless address autoconfiguration"
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Enabling this option allows the devices to IPV6 stateless address autoconfiguration.
|
||||||
|
|
||||||
|
See RFC 4862.
|
||||||
|
|
||||||
menuconfig LWIP_NETIF_LOOPBACK
|
menuconfig LWIP_NETIF_LOOPBACK
|
||||||
bool "Support per-interface loopback"
|
bool "Support per-interface loopback"
|
||||||
default y
|
default y
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit b4eaf11fe5e980a2d9b655e6617d4163c11465ec
|
Subproject commit 066ffe0abb83eee47808bf77c1bcfef51ad077fe
|
@ -757,7 +757,6 @@
|
|||||||
#define ESP_THREAD_SAFE_DEBUG LWIP_DBG_OFF
|
#define ESP_THREAD_SAFE_DEBUG LWIP_DBG_OFF
|
||||||
#define ESP_DHCP 1
|
#define ESP_DHCP 1
|
||||||
#define ESP_DNS 1
|
#define ESP_DNS 1
|
||||||
#define ESP_IPV6_AUTOCONFIG 1
|
|
||||||
#define ESP_PERF 0
|
#define ESP_PERF 0
|
||||||
#define ESP_RANDOM_TCP_PORT 1
|
#define ESP_RANDOM_TCP_PORT 1
|
||||||
#define ESP_IP4_ATON 1
|
#define ESP_IP4_ATON 1
|
||||||
@ -781,6 +780,10 @@
|
|||||||
#define ESP_LWIP_SELECT 1
|
#define ESP_LWIP_SELECT 1
|
||||||
#define ESP_LWIP_LOCK 1
|
#define ESP_LWIP_LOCK 1
|
||||||
|
|
||||||
|
#ifdef CONFIG_LWIP_IPV6_AUTOCONFIG
|
||||||
|
#define ESP_IPV6_AUTOCONFIG CONFIG_LWIP_IPV6_AUTOCONFIG
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef ESP_IRAM_ATTR
|
#ifdef ESP_IRAM_ATTR
|
||||||
#undef ESP_IRAM_ATTR
|
#undef ESP_IRAM_ATTR
|
||||||
#endif
|
#endif
|
||||||
|
@ -439,6 +439,21 @@ esp_err_t tcpip_adapter_create_ip6_linklocal(tcpip_adapter_if_t tcpip_if);
|
|||||||
*/
|
*/
|
||||||
esp_err_t tcpip_adapter_get_ip6_linklocal(tcpip_adapter_if_t tcpip_if, ip6_addr_t *if_ip6);
|
esp_err_t tcpip_adapter_get_ip6_linklocal(tcpip_adapter_if_t tcpip_if, ip6_addr_t *if_ip6);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Get interface global IPv6 address
|
||||||
|
*
|
||||||
|
* If the specified interface is up and a preferred global IPv6 address
|
||||||
|
* has been created for the interface, return a copy of it.
|
||||||
|
*
|
||||||
|
* @param[in] tcpip_if Interface to get global IPv6 address
|
||||||
|
* @param[out] if_ip6 IPv6 information will be returned in this argument if successful.
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* - ESP_OK
|
||||||
|
* - ESP_FAIL If interface is down, does not have a global IPv6 address, or the global IPv6 address is not a preferred address.
|
||||||
|
*/
|
||||||
|
esp_err_t tcpip_adapter_get_ip6_global(tcpip_adapter_if_t tcpip_if, ip6_addr_t *if_ip6);
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
esp_err_t tcpip_adapter_get_mac(tcpip_adapter_if_t tcpip_if, uint8_t *mac);
|
esp_err_t tcpip_adapter_get_mac(tcpip_adapter_if_t tcpip_if, uint8_t *mac);
|
||||||
|
|
||||||
|
@ -553,6 +553,29 @@ esp_err_t tcpip_adapter_get_ip6_linklocal(tcpip_adapter_if_t tcpip_if, ip6_addr_
|
|||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
esp_err_t tcpip_adapter_get_ip6_global(tcpip_adapter_if_t tcpip_if, ip6_addr_t *if_ip6)
|
||||||
|
{
|
||||||
|
ESP_LOGD(TAG, "%s esp-netif:%p", __func__, esp_netif);
|
||||||
|
|
||||||
|
if (tcpip_if >=TCPIP_ADAPTER_IF_MAX || if_ip6 == NULL) {
|
||||||
|
return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
|
||||||
|
}
|
||||||
|
|
||||||
|
int i;
|
||||||
|
struct netif *p_netif = esp_netif[tcpip_if];
|
||||||
|
|
||||||
|
if (p_netif != NULL && netif_is_up(p_netif)) {
|
||||||
|
for (i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
|
||||||
|
if (ip6_addr_ispreferred(netif_ip6_addr_state(p_netif, i))) {
|
||||||
|
memcpy(if_ip6, &p_netif->ip6_addr[i], sizeof(ip6_addr_t));
|
||||||
|
return ESP_OK;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ESP_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
esp_err_t tcpip_adapter_get_mac(tcpip_adapter_if_t tcpip_if, uint8_t mac[6])
|
esp_err_t tcpip_adapter_get_mac(tcpip_adapter_if_t tcpip_if, uint8_t mac[6])
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user