lwip: clean up patches

Issue #1327.
This commit is contained in:
Josef Söntgen 2015-03-12 14:01:16 +01:00 committed by Christian Helmuth
parent dd47129bef
commit 5518a21692
6 changed files with 15 additions and 11 deletions

View File

@ -1 +1 @@
8efd6dcd9b82e1b12a85fce9971ab8cd4898d6e0
3608c569747383625a1bca182683c3668fa630b5

View File

@ -16,7 +16,7 @@ PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \
sockets_c_errno.patch \
sol_socket_definition.patch)
PATCH_OPT(src/lib/lwip/window_scaling.patch) := -p1 -d src/lib/lwip
PATCH_OPT := -p1 -d src/lib/lwip
DIRS := include/lwip/lwip include/lwip/netif

View File

@ -1,4 +1,5 @@
+++ src/lib/lwip/src/include/lwip/arch.h
--- a/src/include/lwip/arch.h
+++ b/src/include/lwip/arch.h
@@ -208,6 +208,12 @@ extern "C" {
extern int errno;
#endif

View File

@ -1,5 +1,6 @@
+++ src/lib/lwip/src/api/sockets.c
@@ -171,6 +171,9 @@ static const int err_to_errno_table[] = {
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -243,6 +243,9 @@ static const int err_to_errno_table[] = {
set_errno(sk->err); \
} while (0)
@ -9,7 +10,7 @@
/* Forward delcaration of some functions */
static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len);
static void lwip_getsockopt_internal(void *arg);
@@ -1244,7 +1247,7 @@ return_copy_fdsets:
@@ -1316,7 +1319,7 @@ return_copy_fdsets:
* Processes recvevent (data available) and wakes up tasks waiting for select.
*/
static void
@ -18,7 +19,7 @@
{
int s;
struct lwip_sock *sock;
@@ -1359,6 +1362,17 @@ again:
@@ -1431,6 +1434,17 @@ again:
SYS_ARCH_UNPROTECT(lev);
}

View File

@ -3,8 +3,9 @@ connection is established but never EISCONN. So most programs will
fail to connect because they at one point while connecting expect to
get EISCONN.
+++ src/lib/lwip/src/api/sockets.c
@@ -142,7 +142,7 @@ static const int err_to_errno_table[] = {
--- a/src/api/sockets.c
+++ b/src/api/sockets.c
@@ -214,7 +214,7 @@ static const int err_to_errno_table[] = {
EINVAL, /* ERR_VAL -6 Illegal value. */
EWOULDBLOCK, /* ERR_WOULDBLOCK -7 Operation would block. */
EADDRINUSE, /* ERR_USE -8 Address in use. */

View File

@ -2,8 +2,9 @@ Our FreeBSD libc based libc defines SOL_SOCKET as 0xffff. We change
lwip's definition from 0xfff to match ours. This prevents us from
converting the level when we call {g,s}etsockopt.
+++ src/lib/lwip/src/include/lwip/sockets.h
@@ -115,7 +115,7 @@ struct linger {
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -131,7 +131,7 @@ struct linger {
/*
* Level number for (get/set)sockopt() to apply to socket itself.
*/