Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update host lwip to current master (2.2.x) #2814

Merged
merged 2 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 34 additions & 21 deletions Sming/Components/lwip/.patches/lwip.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/contrib/ports/unix/port/sys_arch.c b/contrib/ports/unix/port/sys_arch.c
index 9f7c8d3a..440469c6 100644
index 1e094e80..618a203d 100644
--- a/contrib/ports/unix/port/sys_arch.c
+++ b/contrib/ports/unix/port/sys_arch.c
@@ -71,10 +71,12 @@
@@ -76,10 +76,12 @@ static pthread_key_t sys_thread_sem_key;
/* Return code for an interrupted timed wait */
#define SYS_ARCH_INTR 0xfffffffeUL

Expand All @@ -16,7 +16,7 @@ index 9f7c8d3a..440469c6 100644
}

static void
@@ -757,15 +759,3 @@ sys_arch_unprotect(sys_prot_t pval)
@@ -826,15 +828,3 @@ sys_arch_unprotect(sys_prot_t pval)
}
#endif /* SYS_LIGHTWEIGHT_PROT */

Expand All @@ -32,9 +32,8 @@ index 9f7c8d3a..440469c6 100644
- return select(1, &fds, NULL, NULL, &tv);
-}
-#endif /* !NO_SYS */

diff --git a/contrib/ports/CMakeCommon.cmake b/contrib/ports/CMakeCommon.cmake
index fccf0f31..0a6378c4 100644
index a56b59cb..2e30f1b7 100644
--- a/contrib/ports/CMakeCommon.cmake
+++ b/contrib/ports/CMakeCommon.cmake
@@ -65,25 +65,12 @@ set(LWIP_COMPILER_FLAGS_GNU_CLANG
Expand Down Expand Up @@ -63,8 +62,28 @@ index fccf0f31..0a6378c4 100644
if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
if(LWIP_USE_SANITIZERS)
list(APPEND LWIP_COMPILER_FLAGS_GNU_CLANG
diff --git a/contrib/ports/win32/pcapif_helper.c b/contrib/ports/win32/pcapif_helper.c
index 9cc889c1..90e84dd2 100644
--- a/contrib/ports/win32/pcapif_helper.c
+++ b/contrib/ports/win32/pcapif_helper.c
@@ -114,6 +114,7 @@ pcapifh_free_readonly_mem(void *data)
}
}

+#if 0
/**
* Npcap keeps its DLLs in a different directory for compatibility with winpcap.
* Make sure they get found by adding that directory to the DLL search path.
@@ -140,6 +141,7 @@ void pcapifh_init_npcap(void)
}
}
}
+#endif

#else /* WIN32 */

diff --git a/contrib/ports/win32/sys_arch.c b/contrib/ports/win32/sys_arch.c
index 61897e9d..e2eb7053 100644
index 84f5775e..f4078838 100644
--- a/contrib/ports/win32/sys_arch.c
+++ b/contrib/ports/win32/sys_arch.c
@@ -38,6 +38,7 @@
Expand Down Expand Up @@ -104,9 +123,8 @@ index 61897e9d..e2eb7053 100644
#include <stdarg.h>

/* This is an example implementation for LWIP_PLATFORM_DIAG:

diff --git a/contrib/ports/win32/pcapif.c b/contrib/ports/win32/pcapif.c
index 3066abd0..62097fee 100644
index 6bf58f02..063a41b9 100644
--- a/contrib/ports/win32/pcapif.c
+++ b/contrib/ports/win32/pcapif.c
@@ -40,16 +40,7 @@
Expand Down Expand Up @@ -142,17 +160,12 @@ index 3066abd0..62097fee 100644
/* Scan the list printing every entry */
for (d = alldevs, i = 0; d != NULL; d = d->next, i++) {
char *desc = d->description;

diff --git a/contrib/ports/win32/pcapif_helper.c b/contrib/ports/win32/pcapif_helper.c
index bc6ca8d8..82e26d27 100644
--- a/contrib/ports/win32/pcapif_helper.c
+++ b/contrib/ports/win32/pcapif_helper.c
@@ -102,7 +102,7 @@ pcapifh_alloc_readonly_copy(void *data, size_t len)
lwip_win32_platform_diag("VirtualProtect failed: %d\n", GetLastError());
while(1);
}
- printf("pcapifh_alloc_readonly_copy(%d): 0x%08x\n", len, ret);
+ printf("pcapifh_alloc_readonly_copy(%d): %p\n", len, ret);
return ret;
}
@@ -1063,8 +1054,6 @@ pcapif_init(struct netif *netif)
int local_index;
SYS_ARCH_DECL_PROTECT(lev);

- pcapifh_init_npcap();
-
SYS_ARCH_PROTECT(lev);
local_index = ethernetif_index++;
SYS_ARCH_UNPROTECT(lev);
2 changes: 1 addition & 1 deletion Sming/Components/lwip/lwip
Submodule lwip updated 172 files
Loading