Revert "Upgrade to mainstream lwip 2.2.1"

Author: fjtrujy

download_dependencies.sh

@@ -14,14 +14,14 @@ if [ "x$1" != "xlocked" ]; then
 fi
 
 ## Download LWIP
-LWIP_REPO_URL="https://github.com/lwip-tcpip/lwip.git"
+LWIP_REPO_URL="https://github.com/ps2dev/lwip.git"
 LWIP_REPO_FOLDER="common/external_deps/lwip"
-LWIP_BRANCH_NAME="STABLE-2_2_1_RELEASE"
+LWIP_BRANCH_NAME="ps2-v2.0.3"
 if test ! -d "$LWIP_REPO_FOLDER"; then
   git clone --depth 1 -b $LWIP_BRANCH_NAME $LWIP_REPO_URL "$LWIP_REPO_FOLDER"_inprogress || exit 1
   mv "$LWIP_REPO_FOLDER"_inprogress "$LWIP_REPO_FOLDER"
 else
-  (cd "$LWIP_REPO_FOLDER" && git fetch origin --tags && git reset --hard "${LWIP_BRANCH_NAME}" && git checkout "$LWIP_BRANCH_NAME" && cd - )|| exit 1
+  (cd "$LWIP_REPO_FOLDER" && git fetch origin && git reset --hard "origin/${LWIP_BRANCH_NAME}" && git checkout "$LWIP_BRANCH_NAME" && cd - )|| exit 1
 fi
 
 ## Download libsmb2

ee/network/tcpip/Makefile

@@ -35,42 +35,9 @@ endif
 
 EE_INCS += -I$(LWIP)/src/include -I$(LWIP)/src/include/ipv4
 
-ps2api_OBJECTS = \
-	api_lib.o \
-	api_msg.o \
-	api_netbuf.o \
-	err.o \
-	sockets.o \
-	tcpip.o
-
-ps2api_IPV4 = \
-	acd.o \
-	icmp.o \
-	ip.o \
-	ip4.o \
-	ip4_addr.o \
-	ip4_frag.o \
-	inet_chksum.o
-
-ps2ip_OBJECTS = \
-	sys.o \
-	lwip_init.o \
-	mem.o \
-	netif.o \
-	pbuf.o \
-	stats.o \
-	tcp_in.o \
-	tcp_out.o \
-	udp.o \
-	memp.o \
-	tcp.o \
-	ethernet.o \
-	etharp.o \
-	raw.o \
-	def.o \
-	timeouts.o \
-	$(ps2api_IPV4) \
-	$(ps2api_OBJECTS)
+ps2api_OBJECTS = api_lib.o api_msg.o api_netbuf.o err.o sockets.o tcpip.o
+ps2api_IPV4 = icmp.o ip.o ip4.o ip4_addr.o ip4_frag.o inet_chksum.o
+ps2ip_OBJECTS = sys.o lwip_init.o mem.o netif.o pbuf.o stats.o tcp_in.o tcp_out.o udp.o memp.o tcp.o ethernet.o etharp.o raw.o def.o timeouts.o $(ps2api_IPV4) $(ps2api_OBJECTS)
 
 ifdef PS2IP_DHCP
 ps2ip_OBJECTS += dhcp.o
@@ -115,9 +82,6 @@ $(EE_OBJS_DIR)api_msg.o: $(LWIP)/src/api/api_msg.c
 $(EE_OBJS_DIR)api_netbuf.o: $(LWIP)/src/api/netbuf.c
 	$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
 
-$(EE_OBJS_DIR)acd.o: $(LWIP)/src/core/ipv4/acd.c
-	$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
-
 $(EE_OBJS_DIR)icmp.o: $(LWIP)/src/core/ipv4/icmp.c
 	$(EE_CC) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@
 

ee/network/tcpip/src/include/arch/cc.h

@@ -4,7 +4,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <sys/select.h>
 
 #define PACK_STRUCT_FIELD(x) x __attribute((packed))
 #define PACK_STRUCT_STRUCT __attribute((packed))

ee/network/tcpip/src/include/lwipopts.h

@@ -244,8 +244,6 @@
  */
 #define LWIP_CHECKSUM_ON_COPY	1
 
-/* Define LWIP_ERRNO_STDINCLUDE if you want to include <errno.h> here */
-#define LWIP_ERRNO_STDINCLUDE	1
 /*
    ------------------------------------
    ---------- Socket options ----------

ee/network/tcpip/src/ps2ip_internal.h

@@ -11,7 +11,6 @@
 #ifndef IOP_PS2IP_INTERNAL_H
 #define	IOP_PS2IP_INTERNAL_H
 
-#include <sys/select.h>
 #include "lwip/sockets.h"
 
 typedef struct

ee/network/tcpip/src/sys_arch.c

@@ -338,12 +338,6 @@ err_t sys_mbox_trypost(sys_mbox_t *mbox, void *sys_msg)
 	return result;
 }
 
-err_t sys_mbox_trypost_fromisr(sys_mbox_t *mbox, void *msg)
-{
-	// On PS2 EE, ISR and task level are the same, so just call trypost
-	return sys_mbox_trypost(mbox, msg);
-}
-
 void sys_mbox_post(sys_mbox_t *mbox, void *sys_msg)
 {
 	SendMbx(mbox, alloc_msg(), sys_msg);

iop/network/smap/src/imports.lst

@@ -63,7 +63,7 @@ I_inet_addr
 I_tcpip_input
 I_netif_set_link_up
 I_netif_set_link_down
-I_tcpip_callback
+I_tcpip_callback_with_block
 ps2ip_IMPORTS_end
 #endif
 

iop/tcpip/tcpip-base/include/arch/cc.h

@@ -1,8 +1,8 @@
 #ifndef __CC_H__
 #define __CC_H__
 
+#include <errno.h>
 #include <stddef.h>
-#include <sys/time.h>
 
 #define BYTE_ORDER LITTLE_ENDIAN
 
@@ -47,6 +47,8 @@ typedef u32_t			mem_ptr_t;
 #define LWIP_PLATFORM_ASSERT(args)
 #endif
 
+#define atoi(x) strtol(x, NULL, 10)
+
 #define LWIP_NO_STDINT_H	1	//stdint.h does not exist.
 #define LWIP_NO_INTTYPES_H	1	//inttypes.h does not exist.
 

iop/tcpip/tcpip-base/include/lwipopts.h

@@ -86,13 +86,6 @@
    byte alignment -> define MEM_ALIGNMENT to 2. */
 #define MEM_ALIGNMENT		4
 
-/**
- * LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT==1: allows mem_free() to be called
- * from ISR/different task context (uses SYS_ARCH_PROTECT instead of mutex).
- * Required on IOP because interrupt context may free pbufs.
- */
-#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT	1
-
 /**
  * MEM_SIZE: the size of the heap memory. If the application will send
  * a lot of data that needs to be copied, this should be set high.
@@ -101,60 +94,11 @@
 	Up to TCP_SND_BUF * 2 segments may be transmitted at once, thanks to Nagle and Delayed Ack. */
 #define MEM_SIZE		(TCP_SND_BUF * 2)
 
-/*
-   -----------------------------------------------
-   ---------- IP options -------------------------
-   -----------------------------------------------
-*/
-/**
- * IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets.
- * Disabled: PS2 always operates on a local LAN; IP fragments never occur
- * with MSS=1460 and MTU=1500. Saves MEMP_NUM_REASSDATA pool entries.
- */
-#define IP_REASSEMBLY		0
-
-/**
- * IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU.
- * Disabled: TCP_MSS=1460 ensures we never exceed Ethernet MTU=1500.
- */
-#define IP_FRAG			0
-
 /*
    ------------------------------------------------
    ---------- Internal Memory Pool Sizes ----------
    ------------------------------------------------
 */
-/**
- * MEMP_NUM_TCP_PCB: the number of simultaneously active TCP connections.
- * ps2link handles at most a few simultaneous TCP connections.
- */
-#define MEMP_NUM_TCP_PCB	4
-
-/**
- * MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
- * ps2link listens on a small number of ports.
- */
-#define MEMP_NUM_TCP_PCB_LISTEN	4
-
-/**
- * MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks.
- * DNS (1) + DHCP (1) internally allocate raw UDP PCBs via udp_new(),
- * plus application sockets (udptty 1, ps2link 1) need their own.
- */
-#define MEMP_NUM_UDP_PCB	4
-
-/**
- * MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
- * Must be at least TCP_SND_QUEUELEN (enforced by lwIP sanity check in init.c).
- */
-#define MEMP_NUM_TCP_SEG	TCP_SND_QUEUELEN
-
-/**
- * MEMP_NUM_ARP_QUEUE: the number of ARP queued packets.
- * ps2link communicates with a single host; 5 entries is more than enough.
- */
-#define MEMP_NUM_ARP_QUEUE	5
-
 /**
  * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
  * for incoming packets.
@@ -181,15 +125,8 @@
 
 /**
  * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
- * Each pool entry is ~1532 bytes (PBUF_POOL_BUFSIZE ≈ 1516 + struct pbuf).
- * Reduced from 32 (~49 KB) to 12 (~18 KB). Safe because
- * LWIP_TCPIP_CORE_LOCKING_INPUT=1 means RX is processed synchronously,
- * so the pool backlog stays very small.
- * Must satisfy: TCP_WND <= PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - 54).
- * With PBUF_POOL_SIZE=12 and PBUF_POOL_BUFSIZE=1516: max = 12 * 1462 = 17544.
- * 16384 (16 KB) fits comfortably.
  */
-#define PBUF_POOL_SIZE		12
+#define PBUF_POOL_SIZE		32	//SP193: should be at least ((TCP_WND/PBUF_POOL_BUFSIZE)+1). But that is too small to handle simultaneous connections.
 
 /**
  * LWIP_TCPIP_CORE_LOCKING_INPUT: when LWIP_TCPIP_CORE_LOCKING is enabled,
@@ -219,11 +156,8 @@
 /* TCP sender buffer space (bytes). */
 #define TCP_SND_BUF             (TCP_MSS*4)
 
-/* TCP receive window.
- * Must satisfy: TCP_WND <= PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - 54).
- * With PBUF_POOL_SIZE=12 and PBUF_POOL_BUFSIZE=1516: max = 12 * 1462 = 17544.
- * 16384 (16 KB) fits comfortably and still gives ample throughput on LAN. */
-#define TCP_WND                 16384
+/* TCP receive window. */
+#define TCP_WND                 32768
 
 /* ---------- DHCP options ---------- */
 #ifdef PS2IP_DHCP
@@ -233,10 +167,6 @@
 #define LWIP_DHCP		1
 #endif
 
-/* ---------- ACD options ---------- */
-#define LWIP_ACD		0
-#define LWIP_DHCP_DOES_ACD_CHECK	0
-
 /**
  * DHCP_DOES_ARP_CHECK==1: Do an ARP check on the offered address.
  */
@@ -306,8 +236,6 @@
  */
 #define LWIP_CHECKSUM_ON_COPY	1
 
-/* Use PS2SDK's errno.h instead of lwIP's own errno definitions */
-#define LWIP_ERRNO_STDINCLUDE	1
 /*
    ------------------------------------
    ---------- Socket options ----------
@@ -323,11 +251,6 @@
  * names (read, write & close). (only used if you use sockets.c)
  */
 #define LWIP_POSIX_SOCKETS_IO_NAMES	0
-/**
- * LWIP_SOCKET_POLL==1: Enable poll() for sockets (new in lwIP 2.2.x, default=1).
- * Disabled: lwip_poll() is not exported by ps2ip; disabling saves code size.
- */
-#define LWIP_SOCKET_POLL	0
 
 /*
    ----------------------------------