Skip to content

Commit 77ca7ea

Browse files
me-no-devme-no-dev
authored
IDF release/v5.1 (espressif#10038)
* IDF release/v5.1 dc859c1e67 * fix(lwip): Filter out V6 packets if V6 is not enabled the ESP might accept and act on some IPv6 packets, even though IPv6 is not enabled for the interface in Arduino. This change makes the ESP ignore all IPv6 packets if IPv6 address is not available. * fix(lwip): DNS header is not required * fix(ot): Add LWIP_HOOK_IP6_INPUT_CUSTOM support
1 parent 3c1e5a9 commit 77ca7ea

File tree

3 files changed

+77
-36
lines changed

3 files changed

+77
-36
lines changed

‎libraries/Network/src/NetworkInterface.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ NetworkInterface *getNetifByID(Network_Interface_ID id) {
3434
return NULL;
3535
}
3636

37+
#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
38+
extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) __attribute__((weak));
39+
extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
40+
if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
41+
// We don't have an LL address -> eat this packet here, so it won't get accepted on input netif
42+
pbuf_free(p);
43+
return 1;
44+
}
45+
return 0;
46+
}
47+
#endif
48+
3749
static void _ip_event_cb(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
3850
if (event_base == IP_EVENT) {
3951
NetworkInterface *netif = NULL;

‎libraries/OpenThread/src/OThreadCLI.cpp

+31-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "freertos/semphr.h"
1717
#include "freertos/queue.h"
1818

19-
#include "esp_netif.h"
20-
#include "esp_netif_types.h"
19+
#include "esp_netif_net_stack.h"
20+
#include "lwip/netif.h"
2121

2222
static TaskHandle_t s_cli_task = NULL;
2323
static TaskHandle_t s_console_cli_task = NULL;
@@ -27,6 +27,9 @@ static xQueueHandle tx_queue = NULL;
2727
static esp_openthread_platform_config_t ot_native_config;
2828
static TaskHandle_t s_ot_task = NULL;
2929
static esp_netif_t *openthread_netif = NULL;
30+
#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
31+
static struct netif *ot_lwip_netif = NULL;
32+
#endif
3033

3134
#define OT_CLI_MAX_LINE_LENGTH 512
3235

@@ -38,6 +41,20 @@ typedef struct {
3841
} ot_cli_console_t;
3942
static ot_cli_console_t otConsole = {NULL, false, (const char *)NULL, NULL};
4043

44+
#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
45+
extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
46+
if (ot_lwip_netif && ot_lwip_netif == inp) {
47+
return 0;
48+
}
49+
if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
50+
// We don't have an LL address -> eat this packet here, so it won't get accepted on input netif
51+
pbuf_free(p);
52+
return 1;
53+
}
54+
return 0;
55+
}
56+
#endif
57+
4158
// process the CLI commands sent to the OpenThread stack
4259
static void ot_cli_loop(void *context) {
4360
String sTxString("");
@@ -258,6 +275,15 @@ static void ot_task_worker(void *aContext) {
258275
// Initialize the esp_netif bindings
259276
esp_netif_config_t cfg = ESP_NETIF_DEFAULT_OPENTHREAD();
260277
openthread_netif = esp_netif_new(&cfg);
278+
#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
279+
// Get LwIP Netif
280+
if (openthread_netif != NULL) {
281+
ot_lwip_netif = (struct netif *)esp_netif_get_netif_impl(openthread_netif);
282+
if (ot_lwip_netif == NULL) {
283+
log_e("Failed to get OpenThread LwIP netif");
284+
}
285+
}
286+
#endif
261287
}
262288
if (!err && openthread_netif == NULL) {
263289
log_e("Failed to create OpenThread esp_netif");
@@ -335,6 +361,9 @@ void OpenThreadCLI::end() {
335361
// Clean up
336362
esp_openthread_deinit();
337363
esp_openthread_netif_glue_deinit();
364+
#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
365+
ot_lwip_netif = NULL;
366+
#endif
338367
esp_netif_destroy(openthread_netif);
339368
esp_vfs_eventfd_unregister();
340369
}

‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.1-bd2b9390ef"
45+
"version": "idf-release_v5.1-dc859c1e67"
4646
},
4747
{
4848
"packager": "esp32",
@@ -105,63 +105,63 @@
105105
"tools": [
106106
{
107107
"name": "esp32-arduino-libs",
108-
"version": "idf-release_v5.1-bd2b9390ef",
108+
"version": "idf-release_v5.1-dc859c1e67",
109109
"systems": [
110110
{
111111
"host": "i686-mingw32",
112-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
113-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
114-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
115-
"size": "307841384"
112+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
113+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
114+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
115+
"size": "307528289"
116116
},
117117
{
118118
"host": "x86_64-mingw32",
119-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
120-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
121-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
122-
"size": "307841384"
119+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
120+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
121+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
122+
"size": "307528289"
123123
},
124124
{
125125
"host": "arm64-apple-darwin",
126-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
127-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
128-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
129-
"size": "307841384"
126+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
127+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
128+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
129+
"size": "307528289"
130130
},
131131
{
132132
"host": "x86_64-apple-darwin",
133-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
134-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
135-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
136-
"size": "307841384"
133+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
134+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
135+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
136+
"size": "307528289"
137137
},
138138
{
139139
"host": "x86_64-pc-linux-gnu",
140-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
141-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
142-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
143-
"size": "307841384"
140+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
141+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
142+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
143+
"size": "307528289"
144144
},
145145
{
146146
"host": "i686-pc-linux-gnu",
147-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
148-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
149-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
150-
"size": "307841384"
147+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
148+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
149+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
150+
"size": "307528289"
151151
},
152152
{
153153
"host": "aarch64-linux-gnu",
154-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
155-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
156-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
157-
"size": "307841384"
154+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
155+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
156+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
157+
"size": "307528289"
158158
},
159159
{
160160
"host": "arm-linux-gnueabihf",
161-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/c4ae7a78eafc339c71efcc7a75d5caa525c92f58",
162-
"archiveFileName": "esp32-arduino-libs-c4ae7a78eafc339c71efcc7a75d5caa525c92f58.zip",
163-
"checksum": "SHA-256:bd9d095d468b517e9836355246cff536223b456aa67ffdb176e167c368ddfd1f",
164-
"size": "307841384"
161+
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/da253aa56255b29a76ac5038db350cd9e4ebde1b",
162+
"archiveFileName": "esp32-arduino-libs-da253aa56255b29a76ac5038db350cd9e4ebde1b.zip",
163+
"checksum": "SHA-256:a3ce1e1aebe518d6be26006798b44b6c1a0bc8977a8da4d066ed9d9af1378c9e",
164+
"size": "307528289"
165165
}
166166
]
167167
},

0 commit comments

Comments
 (0)