[TCPIP] Synchronize LWIP code to 2.2.0

- take code from STABLE-2_2_0_RELEASE commit on https://git.savannah.gnu.org/git/lwip.git
- remove lwip/contrib directory
- do required changes due to upgrade in
  * CMakeLists.txt
  * include/lwip/arch/cc.h
  * include/lwip/arch/sys_arch.h
  * include/lwip/lwipopts.h
  * include/tcpip.h
  * ip/CMakeLists.txt
  * ip/lwip_glue/lwip_glue.h
  * ip/lwip_glue/tcp.c
  * ip/transport/tcp/if.c
  * tcpip/icmp.c

CORE-13098

Author: hpoussin

drivers/network/tcpip/CMakeLists.txt

@@ -4,7 +4,8 @@ set(LWIP_INCLUDE_DIRS
     ${LWIP_DIR}/src/include
     ${CMAKE_CURRENT_SOURCE_DIR}/include/lwip
 )
-add_subdirectory(lwip)
+include(${LWIP_DIR}/src/Filelists.cmake)
+add_dependencies(lwipcore xdk)
 add_subdirectory(ip)
 
 add_definitions(

drivers/network/tcpip/include/lwip/arch/cc.h

@@ -15,23 +15,6 @@ free(void *mem);
 void *
 realloc(void *mem, size_t size);
 
-/* mem_trim() must trim the buffer without relocating it.
- * Since we can't do that, we just return the buffer passed in unchanged */
-#define mem_trim(_m_, _s_) (_m_)
-
-/* Unsigned int types */
-typedef unsigned char u8_t;
-typedef unsigned short u16_t;
-typedef unsigned long u32_t;
-
-/* Signed int types */
-typedef signed char s8_t;
-typedef signed short s16_t;
-typedef signed long s32_t;
-
-/* Memory pointer */
-typedef ULONG_PTR mem_ptr_t;
-
 /* Printf/DPRINT formatters */
 #define U16_F "hu"
 #define S16_F "hd"

drivers/network/tcpip/include/lwip/arch/sys_arch.h

@@ -27,6 +27,9 @@ typedef struct _LWIP_MESSAGE_CONTAINER
 
 #define sys_jiffies() sys_now()
 
+/* There is no such thing as "from ISR" for us */
+#define sys_mbox_trypost_fromisr sys_mbox_trypost
+
 /* NULL definitions */
 #define SYS_MBOX_NULL NULL
 #define SYS_SEM_NULL NULL

drivers/network/tcpip/include/lwip/lwipopts.h

@@ -11,6 +11,7 @@
 /* Define LWIP_COMPAT_MUTEX if the port has no mutexes and binary semaphores
  should be used instead */
 #define LWIP_COMPAT_MUTEX               1
+#define LWIP_COMPAT_MUTEX_ALLOWED       1
 
 #define MEM_ALIGNMENT                   4
 

drivers/network/tcpip/include/tcpip.h

@@ -151,6 +151,7 @@ typedef struct {
 
 #ifndef htons
 #define htons(x) WH2N(x)
+#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
 #endif
 
 /* Global variable */

drivers/network/tcpip/ip/CMakeLists.txt

@@ -32,6 +32,7 @@ list(APPEND SOURCE
 add_library(ip OBJECT ${SOURCE} ${ip_asm})
 
 target_link_libraries(ip lwipcore)
+add_importlibs(lwipcore ntoskrnl)
 
 target_include_directories(ip BEFORE
     PRIVATE ${LWIP_INCLUDE_DIRS}

drivers/network/tcpip/ip/lwip_glue/lwip_glue.h

@@ -13,7 +13,6 @@
 #endif
 
 typedef struct tcp_pcb* PTCP_PCB;
-typedef struct ip_addr ip4_addr_t;
 
 typedef struct _QUEUE_ENTRY
 {

drivers/network/tcpip/ip/lwip_glue/tcp.c

@@ -36,7 +36,7 @@ void
 LibTCPDumpPcb(PVOID SocketContext)
 {
     struct tcp_pcb *pcb = (struct tcp_pcb*)SocketContext;
-    unsigned int addr = ntohl(pcb->remote_ip.addr);
+    unsigned int addr = lwip_ntohl(pcb->remote_ip.addr);
 
     DbgPrint("\tState: %s\n", tcp_state_str[pcb->state]);
     DbgPrint("\tRemote: (%d.%d.%d.%d, %d)\n",
@@ -405,7 +405,7 @@ LibTCPBindCallback(void *arg)
 
     msg->Output.Bind.Error = tcp_bind(pcb,
                                       msg->Input.Bind.IpAddress,
-                                      ntohs(msg->Input.Bind.Port));
+                                      lwip_ntohs(msg->Input.Bind.Port));
 
 done:
     KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE);
@@ -609,7 +609,7 @@ LibTCPConnectCallback(void *arg)
     tcp_sent((PTCP_PCB)msg->Input.Connect.Connection->SocketContext, InternalSendEventHandler);
 
     Error = tcp_connect((PTCP_PCB)msg->Input.Connect.Connection->SocketContext,
-                        msg->Input.Connect.IpAddress, ntohs(msg->Input.Connect.Port),
+                        msg->Input.Connect.IpAddress, lwip_ntohs(msg->Input.Connect.Port),
                         InternalConnectEventHandler);
 
     msg->Output.Connect.Error = Error == ERR_OK ? ERR_INPROGRESS : Error;

drivers/network/tcpip/ip/transport/tcp/if.c

@@ -9,7 +9,7 @@
 #include <ipifcons.h>
 
 err_t
-TCPSendDataCallback(struct netif *netif, struct pbuf *p, ip4_addr_t *dest)
+TCPSendDataCallback(struct netif *netif, struct pbuf *p, const ip4_addr_t *dest)
 {
     NDIS_STATUS NdisStatus;
     PNEIGHBOR_CACHE_ENTRY NCE;

drivers/network/tcpip/lwip/.gitattributes

@@ -0,0 +1,10 @@
+# These files are text and should be normalized
+*.txt     text
+*.c       text
+*.h       text
+
+# For git archive
+.gitignore              export-ignore
+.gitattributes          export-ignore
+.github                 export-ignore
+.vscode                 export-ignore