Merge pull request #885 from david-cermak/fix/eppp_uart_channels

david-cermak · web-flow · commit 858d38b55f54 · 2025-09-09T17:03:00.000+02:00
[eppp]: Fix getting context for channel API
diff --git a/components/eppp_link/.cz.yaml b/components/eppp_link/.cz.yaml
@@ -3,6 +3,6 @@ commitizen:
   bump_message: 'bump(eppp): $current_version -> $new_version'
   pre_bump_hooks: python ../../ci/changelog.py eppp_link
   tag_format: eppp-v$version
-  version: 1.1.0
+  version: 1.1.1
   version_files:
   - idf_component.yml
diff --git a/components/eppp_link/CHANGELOG.md b/components/eppp_link/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.1](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.1)
+
+### Bug Fixes
+
+- Fix getting context for channel API ([94563cdc](https://github.com/espressif/esp-protocols/commit/94563cdc))
+- Cover more combinations in build tests ([e0b8de8f](https://github.com/espressif/esp-protocols/commit/e0b8de8f))
+
 ## [1.1.0](https://github.com/espressif/esp-protocols/commits/eppp-v1.1.0)
 
 ### Features
diff --git a/components/eppp_link/eppp_uart.c b/components/eppp_link/eppp_uart.c
@@ -157,6 +157,8 @@ static void process_packet(esp_netif_t *netif, uart_port_t uart_port, size_t ava
             esp_netif_receive(netif, in_buf + buf_start + sizeof(struct header), payload_size, NULL);
         } else {
 #ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT
+            struct eppp_handle *handle = esp_netif_get_io_driver(netif);
+            struct eppp_uart *h = __containerof(handle, struct eppp_uart, parent);
             if (h->parent.channel_rx) {
                 h->parent.channel_rx(netif, channel, in_buf + buf_start + sizeof(struct header), payload_size);
             }
diff --git a/components/eppp_link/examples/host/sdkconfig.ci.1 b/components/eppp_link/examples/host/sdkconfig.ci.1
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_EPPP_LINK_DEVICE_SPI=y
+CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y
+CONFIG_EPPP_LINK_USES_PPP=y
diff --git a/components/eppp_link/examples/host/sdkconfig.ci.2 b/components/eppp_link/examples/host/sdkconfig.ci.2
@@ -0,0 +1,3 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_EPPP_LINK_DEVICE_UART=y
+CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y
diff --git a/components/eppp_link/examples/host/sdkconfig.defaults b/components/eppp_link/examples/host/sdkconfig.defaults
@@ -1,4 +1 @@
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_LWIP_PPP_SERVER_SUPPORT=y
 CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
-CONFIG_LWIP_PPP_DEBUG_ON=y
diff --git a/components/eppp_link/examples/slave/sdkconfig.ci.1 b/components/eppp_link/examples/slave/sdkconfig.ci.1
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32s2"
+CONFIG_EPPP_LINK_DEVICE_SPI=y
+CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y
+CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
diff --git a/components/eppp_link/examples/slave/sdkconfig.ci.2 b/components/eppp_link/examples/slave/sdkconfig.ci.2
@@ -0,0 +1,4 @@
+CONFIG_IDF_TARGET="esp32c2"
+CONFIG_EPPP_LINK_DEVICE_UART=y
+CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
+CONFIG_EPPP_LINK_USES_PPP=y
diff --git a/components/eppp_link/examples/slave/sdkconfig.defaults b/components/eppp_link/examples/slave/sdkconfig.defaults
@@ -1,6 +1,3 @@
 CONFIG_LWIP_IP_FORWARD=y
 CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096
-CONFIG_LWIP_PPP_SUPPORT=y
-CONFIG_LWIP_PPP_SERVER_SUPPORT=y
-CONFIG_LWIP_PPP_VJ_HEADER_COMPRESSION=n
diff --git a/components/eppp_link/idf_component.yml b/components/eppp_link/idf_component.yml
@@ -1,4 +1,4 @@
-version: 1.1.0
+version: 1.1.1
 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
 dependencies:

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,8 @@ static void process_packet(esp_netif_t *netif, uart_port_t uart_port, size_t ava`
`157`	`157`	`esp_netif_receive(netif, in_buf + buf_start + sizeof(struct header), payload_size, NULL);`
`158`	`158`	`} else {`
`159`	`159`	`#ifdef CONFIG_EPPP_LINK_CHANNELS_SUPPORT`
	`160`	`+ struct eppp_handle *handle = esp_netif_get_io_driver(netif);`
	`161`	`+ struct eppp_uart *h = __containerof(handle, struct eppp_uart, parent);`
`160`	`162`	`if (h->parent.channel_rx) {`
`161`	`163`	`h->parent.channel_rx(netif, channel, in_buf + buf_start + sizeof(struct header), payload_size);`
`162`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+CONFIG_IDF_TARGET="esp32c3"`
	`2`	`+CONFIG_EPPP_LINK_DEVICE_UART=y`
	`3`	`+CONFIG_EPPP_LINK_CHANNELS_SUPPORT=y`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 1.1.0`
	`1`	`+version: 1.1.1`
`2`	`2`	`url: https://github.com/espressif/esp-protocols/tree/master/components/eppp_link`
`3`	`3`	`description: The component provides a general purpose PPP connectivity, typically used as WiFi-PPP router`
`4`	`4`	`dependencies:`