fix(ot): Add LWIP_HOOK_IP6_INPUT_CUSTOM support

Author: me-no-dev

libraries/Network/src/NetworkInterface.cpp

@@ -35,6 +35,7 @@ NetworkInterface *getNetifByID(Network_Interface_ID id) {
 }
 
 #if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) __attribute__((weak));
 extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
   if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
     // We don't have an LL address -> eat this packet here, so it won't get accepted on input netif

libraries/OpenThread/src/OThreadCLI.cpp

@@ -16,8 +16,8 @@
 #include "freertos/semphr.h"
 #include "freertos/queue.h"
 
-#include "esp_netif.h"
-#include "esp_netif_types.h"
+#include "esp_netif_net_stack.h"
+#include "lwip/netif.h"
 
 static TaskHandle_t s_cli_task = NULL;
 static TaskHandle_t s_console_cli_task = NULL;
@@ -27,6 +27,9 @@ static xQueueHandle tx_queue = NULL;
 static esp_openthread_platform_config_t ot_native_config;
 static TaskHandle_t s_ot_task = NULL;
 static esp_netif_t *openthread_netif = NULL;
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+static struct netif *ot_lwip_netif = NULL;
+#endif
 
 #define OT_CLI_MAX_LINE_LENGTH 512
 
@@ -38,6 +41,20 @@ typedef struct {
 } ot_cli_console_t;
 static ot_cli_console_t otConsole = {NULL, false, (const char *)NULL, NULL};
 
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
+  if (ot_lwip_netif && ot_lwip_netif == inp) {
+    return 0;
+  }
+  if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
+    // We don't have an LL address -> eat this packet here, so it won't get accepted on input netif
+    pbuf_free(p);
+    return 1;
+  }
+  return 0;
+}
+#endif
+
 // process the CLI commands sent to the OpenThread stack
 static void ot_cli_loop(void *context) {
   String sTxString("");
@@ -258,6 +275,15 @@ static void ot_task_worker(void *aContext) {
     // Initialize the esp_netif bindings
     esp_netif_config_t cfg = ESP_NETIF_DEFAULT_OPENTHREAD();
     openthread_netif = esp_netif_new(&cfg);
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+    // Get LwIP Netif
+    if (openthread_netif != NULL) {
+      ot_lwip_netif = (struct netif *)esp_netif_get_netif_impl(openthread_netif);
+      if (ot_lwip_netif == NULL) {
+        log_e("Failed to get OpenThread LwIP netif");
+      }
+    }
+#endif
   }
   if (!err && openthread_netif == NULL) {
     log_e("Failed to create OpenThread esp_netif");
@@ -335,6 +361,9 @@ void OpenThreadCLI::end() {
     // Clean up
     esp_openthread_deinit();
     esp_openthread_netif_glue_deinit();
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+    ot_lwip_netif = NULL;
+#endif
     esp_netif_destroy(openthread_netif);
     esp_vfs_eventfd_unregister();
   }