mirror of
https://github.com/espressif/esp-protocols.git
synced 2025-09-25 22:30:55 +02:00
Merge pull request #865 from david-cermak/fix/eppp_ipv4_only
[eppp]: Support for IPv4-only mode
This commit is contained in:
@@ -3,6 +3,6 @@ commitizen:
|
|||||||
bump_message: 'bump(eppp): $current_version -> $new_version'
|
bump_message: 'bump(eppp): $current_version -> $new_version'
|
||||||
pre_bump_hooks: python ../../ci/changelog.py eppp_link
|
pre_bump_hooks: python ../../ci/changelog.py eppp_link
|
||||||
tag_format: eppp-v$version
|
tag_format: eppp-v$version
|
||||||
version: 1.0.0
|
version: 1.0.1
|
||||||
version_files:
|
version_files:
|
||||||
- idf_component.yml
|
- idf_component.yml
|
||||||
|
@@ -1,5 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [1.0.1](https://github.com/espressif/esp-protocols/commits/eppp-v1.0.1)
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
- Support for IPv4-only mode ([653328ba](https://github.com/espressif/esp-protocols/commit/653328ba), [#864](https://github.com/espressif/esp-protocols/issues/864))
|
||||||
|
|
||||||
## [1.0.0](https://github.com/espressif/esp-protocols/commits/eppp-v1.0.0)
|
## [1.0.0](https://github.com/espressif/esp-protocols/commits/eppp-v1.0.0)
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
@@ -65,12 +65,13 @@ static err_t tun_output_v4(struct netif *netif, struct pbuf *p, const ip4_addr_t
|
|||||||
LWIP_UNUSED_ARG(ipaddr);
|
LWIP_UNUSED_ARG(ipaddr);
|
||||||
return tun_output(netif, p);
|
return tun_output(netif, p);
|
||||||
}
|
}
|
||||||
|
#if LWIP_IPV6
|
||||||
static err_t tun_output_v6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
|
static err_t tun_output_v6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
|
||||||
{
|
{
|
||||||
LWIP_UNUSED_ARG(ipaddr);
|
LWIP_UNUSED_ARG(ipaddr);
|
||||||
return tun_output(netif, p);
|
return tun_output(netif, p);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
static err_t tun_init(struct netif *netif)
|
static err_t tun_init(struct netif *netif)
|
||||||
{
|
{
|
||||||
if (netif == NULL) {
|
if (netif == NULL) {
|
||||||
@@ -151,9 +152,12 @@ static void cmd_ping_on_ping_end(esp_ping_handle_t hdl, void *args)
|
|||||||
}
|
}
|
||||||
if (IP_IS_V4(&target_addr)) {
|
if (IP_IS_V4(&target_addr)) {
|
||||||
ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet_ntoa(*ip_2_ip4(&target_addr)));
|
ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet_ntoa(*ip_2_ip4(&target_addr)));
|
||||||
} else {
|
}
|
||||||
|
#if LWIP_IPV6
|
||||||
|
else {
|
||||||
ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet6_ntoa(*ip_2_ip6(&target_addr)));
|
ESP_LOGD(TAG, "\n--- %s ping statistics ---\n", inet6_ntoa(*ip_2_ip6(&target_addr)));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
ESP_LOGI(TAG, "%" PRIu32 " packets transmitted, %" PRIu32 " received, %" PRIu32 "%% packet loss, time %" PRIu32 "ms\n",
|
ESP_LOGI(TAG, "%" PRIu32 " packets transmitted, %" PRIu32 " received, %" PRIu32 "%% packet loss, time %" PRIu32 "ms\n",
|
||||||
transmitted, received, loss, total_time_ms);
|
transmitted, received, loss, total_time_ms);
|
||||||
esp_ping_delete_session(hdl);
|
esp_ping_delete_session(hdl);
|
||||||
@@ -168,7 +172,11 @@ esp_err_t eppp_check_connection(esp_netif_t *netif)
|
|||||||
ip_addr_t target_addr = {0};
|
ip_addr_t target_addr = {0};
|
||||||
esp_netif_ip_info_t ip;
|
esp_netif_ip_info_t ip;
|
||||||
esp_netif_get_ip_info(netif, &ip);
|
esp_netif_get_ip_info(netif, &ip);
|
||||||
|
#if LWIP_IPV6
|
||||||
target_addr.u_addr.ip4.addr = ip.gw.addr;
|
target_addr.u_addr.ip4.addr = ip.gw.addr;
|
||||||
|
#else
|
||||||
|
target_addr.addr = ip.gw.addr;
|
||||||
|
#endif
|
||||||
config.target_addr = target_addr;
|
config.target_addr = target_addr;
|
||||||
esp_ping_callbacks_t cbs = {
|
esp_ping_callbacks_t cbs = {
|
||||||
.cb_args = netif,
|
.cb_args = netif,
|
||||||
|
@@ -0,0 +1 @@
|
|||||||
|
CONFIG_LWIP_IPV6=n
|
@@ -1,4 +1,4 @@
|
|||||||
version: 1.0.0
|
version: 1.0.1
|
||||||
url: https://github.com/espressif/esp-protocols/tree/master/components/eppp_link
|
url: https://github.com/espressif/esp-protocols/tree/master/components/eppp_link
|
||||||
description: The component provides a general purpose PPP connectivity, typically used as WiFi-PPP router
|
description: The component provides a general purpose PPP connectivity, typically used as WiFi-PPP router
|
||||||
dependencies:
|
dependencies:
|
||||||
|
Reference in New Issue
Block a user