From 110f7bce646e24453b291741dd7bfb68837592fa Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sat, 25 Apr 2015 18:58:45 +0800 Subject: [PATCH] runtime: saner lwipopts --- soc/runtime/liblwip/lwipopts.h | 220 ++++++++++++++------------------- 1 file changed, 94 insertions(+), 126 deletions(-) diff --git a/soc/runtime/liblwip/lwipopts.h b/soc/runtime/liblwip/lwipopts.h index 3a23b80cd..14c2c2677 100644 --- a/soc/runtime/liblwip/lwipopts.h +++ b/soc/runtime/liblwip/lwipopts.h @@ -1,73 +1,109 @@ -// This file is Copyright (c) 2015 Florent Kermarrec -// LiteETH lwIP port for ARTIQ -// License: BSD +/* + * Copyright (c) 2001, 2002 Swedish Institute of Computer Science. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the lwIP TCP/IP stack. + * + * Author: Adam Dunkels + * + */ #ifndef __LWIPOPTS_H__ #define __LWIPOPTS_H__ -//#define LWIP_DEBUG -#include - -/*----------------------------General options ------------------------------ */ #define NO_SYS 1 #define LWIP_NETCONN 0 #define LWIP_SOCKET 0 #define LWIP_IPV6 0 - /* ------------------------ Memory options -------------------------------- */ +#define LWIP_CALLBACK_API 1 + +/* -------- TCP Timer Intervals ------- */ +#define TCP_TMR_INTERVAL 1 /* The TCP timer interval in + milliseconds. */ + +#define TCP_FAST_INTERVAL 2 /* the fine grained timeout in + milliseconds */ + +#define TCP_SLOW_INTERVAL 5 /* the coarse grained timeout in + milliseconds */ + +/* ---------- Memory options ---------- */ /* MEM_ALIGNMENT: should be set to the alignment of the CPU for which lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2 byte alignment -> define MEM_ALIGNMENT to 2. */ -#define MEM_ALIGNMENT 4 /* MUST BE 4 */ +#define MEM_ALIGNMENT 4 /* 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. */ -#define MEM_SIZE 16000 +#define MEM_SIZE 32 * 1024 /* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application sends a lot of data out of ROM (or other static memory), this should be set high. */ -#define MEMP_NUM_PBUF 20 +#define MEMP_NUM_PBUF 64 /* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One per active UDP "connection". */ -#define MEMP_NUM_UDP_PCB 4 +#define MEMP_NUM_UDP_PCB 1 /* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections. */ -#define MEMP_NUM_TCP_PCB 10 +#define MEMP_NUM_TCP_PCB 8 /* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections. */ -#define MEMP_NUM_TCP_PCB_LISTEN 8 +#define MEMP_NUM_TCP_PCB_LISTEN 16 /* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments. */ -#define MEMP_NUM_TCP_SEG 8 -/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active - timeouts. */ -#define MEMP_NUM_SYS_TIMEOUT 3 +#define MEMP_NUM_TCP_SEG 255 /* The following four are used only with the sequential API and can be set to 0 if the application only will use the raw API. */ /* MEMP_NUM_NETBUF: the number of struct netbufs. */ -//#define MEMP_NUM_NETBUF 4 +#define MEMP_NUM_NETBUF 0 /* MEMP_NUM_NETCONN: the number of struct netconns. */ -//#define MEMP_NUM_NETCONN 4 - -/* These two control is reclaimer functions should be compiled - in. Should always be turned on (1). */ -#define MEM_RECLAIM 1 -#define MEMP_RECLAIM 1 +#define MEMP_NUM_NETCONN 0 +/* MEMP_NUM_TCPIP_MSG: the number of struct tcpip_msg, which is used + for sequential API communication and incoming packets. Used in + src/api/tcpip.c. */ +#define MEMP_NUM_TCPIP_MSG_API 0 +#define MEMP_NUM_TCPIP_MSG_INPKT 0 +/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active + timeouts. */ +#define MEMP_NUM_SYS_TIMEOUT 5 /* ---------- Pbuf options ---------- */ /* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */ -#define PBUF_POOL_SIZE 4 +#define PBUF_POOL_SIZE 512 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */ -#define PBUF_POOL_BUFSIZE 1024 +#define PBUF_POOL_BUFSIZE 1536 /* PBUF_LINK_HLEN: the number of bytes that should be allocated for a link level header. */ #define PBUF_LINK_HLEN 16 -/* ------------------------ TCP options ----------------------------------- */ +/* ---------- TCP options ---------- */ #define LWIP_TCP 1 #define TCP_TTL 255 @@ -76,17 +112,17 @@ a lot of data that needs to be copied, this should be set high. */ #define TCP_QUEUE_OOSEQ 1 /* TCP Maximum segment size. */ -#define TCP_MSS 256 +#define TCP_MSS 1476 /* TCP sender buffer space (bytes). */ -#define TCP_SND_BUF 512 +#define TCP_SND_BUF 32 * 1024 /* TCP sender buffer space (pbufs). This must be at least = 2 * TCP_SND_BUF/TCP_MSS for things to work. */ -#define TCP_SND_QUEUELEN 4 * TCP_SND_BUF/TCP_MSS +#define TCP_SND_QUEUELEN 2 * TCP_SND_BUF/TCP_MSS /* TCP receive window. */ -#define TCP_WND 256 +#define TCP_WND 16 * 1024 /* Maximum number of retransmissions of data segments. */ #define TCP_MAXRTX 12 @@ -94,12 +130,11 @@ a lot of data that needs to be copied, this should be set high. */ /* Maximum number of retransmissions of SYN segments. */ #define TCP_SYNMAXRTX 4 -/* ------------------------ ARP options ----------------------------------- */ -#define LWIP_ARP 1 -#define ARP_TABLE_SIZE 10 -#define ARP_QUEUEING 1 +/* ---------- ARP options ---------- */ +#define ARP_TABLE_SIZE 10 +#define ARP_QUEUEING 1 -/* ------------------------ IP options ------------------------------------ */ +/* ---------- IP options ---------- */ /* Define IP_FORWARD to 1 if you wish to have the ability to forward IP packets across network interfaces. If you are going to run lwIP on a device with only one network interface, define this to 0. */ @@ -107,27 +142,13 @@ a lot of data that needs to be copied, this should be set high. */ /* If defined to 1, IP options are allowed (but not parsed). If defined to 0, all packets with IP options are dropped. */ -#define IP_OPTIONS 0 /* set it to 1 to allow IP options in hdr */ -#define IP_REASSEMBLY 0 /* set it to 1 to enable tcp/ip reassembly */ -#define IP_FRAG 0 /* Outgoing fragmentation of IP packets occurs - * when the packet-size exceeds the path maximum - * packet-size (path MTU). To avoid fragmentation, - * don't allow application OR lwIP to generate packets larger - * than anticipated path maximum transmission unit. - * - * For TCP, setting TCP_MSS to much less than anticipated - * path MTU avoids frag/defrag. For UDP it depends on app - * and path MTU. For ping (ICMP), with large payload, - * frag/reass is required. Some network stacks have - * path MTU discovery capability but not sure if LwIP - * supports it - */ -#define LWIP_RAW 1 /* set it to 1 to enable raw support */ +#define IP_OPTIONS 1 -/* ------------------------ ICMP options ---------------------------------- */ +/* ---------- ICMP options ---------- */ #define ICMP_TTL 255 -/* ------------------------ DHCP options ---------------------------------- */ + +/* ---------- DHCP options ---------- */ /* Define LWIP_DHCP to 1 if you want DHCP configuration of interfaces. DHCP is not implemented in lwIP 0.5.1, however, so turning this on does currently not work. */ @@ -135,79 +156,26 @@ a lot of data that needs to be copied, this should be set high. */ /* 1 if you want to do an ARP check on the offered address (recommended). */ -//#define DHCP_DOES_ARP_CHECK 1 +#define DHCP_DOES_ARP_CHECK 0 -/* ------------------------ UDP options ----------------------------------- */ -#define LWIP_UDP 1 /* set it to 1 to enable UDP */ -#define UDP_TTL 255 /* time to live for udp */ -#define CHECKSUM_GEN_UDP 0 /* don't generate UDP chksum, if UDP enabled*/ -#define CHECKSUM_CHECK_UDP 0 /* check chksum in rx UDP pkts if enabled */ - -#define LWIP_STATS 0 -#define LWIP_COMPAT_SOCKETS 0 - -/* Override the default dynamic memory alloc functions (malloc copy)*/ -//#include "memmgr.h" - -//#define mem_init() -//#define mem_free memmgr_free -//#define mem_malloc memmgr_alloc -//#define mem_calloc(c, n) memmgr_alloc((c) * (n)) -//#define mem_realloc(p, sz) (p) - -#ifdef LWIP_DEBUG -/* - * for a list of options for the flags, please refer to - * lwip/src/include/lwip/debug.h - ******************NOTE******************************** - * - * TO TURN OFF A SPECIFIC DEBUG SOURCE, SET THE VALUE TO - * DBG_OFF - * - * DO NOT MODIFY DBG_TYPES_ON OR DBG_MIN_LEVEL UNLESS YOU - * ARE AWARE WHAT YOU'RE DOING!! - * - */ -#define LWIP_DBG_TYPES_ON LWIP_DBG_ON -#define DBG_TYPES_ON LWIP_DBG_TRACE - -#define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL -#define ETHARP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define NETIF_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define PBUF_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define API_LIB_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define API_MSG_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define SOCKETS_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define ICMP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define INET_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define IP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define IP_REASS_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define RAW_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define MEM_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define MEMP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define SYS_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_INPUT_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_FR_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_RTO_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_CWND_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_WND_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_OUTPUT_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_RST_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCP_QLEN_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define UDP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TCPIP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define PPP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define SLIP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define DHCP_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE -#define TIMERS_DEBUG LWIP_DBG_ON|LWIP_DBG_TRACE - -/* APPLICATION DEBUGGING */ -/* #define HTTPD_DEBUG (1) */ -#endif +/* ---------- UDP options ---------- */ +#define LWIP_UDP 0 +#define UDP_TTL 255 -/* Perform DHCP */ -/*#define LWIP_DHCP (1)*/ +/* ---------- Statistics options ---------- */ +/*#define STATS*/ + +#ifdef STATS +#define LINK_STATS +#define IP_STATS +#define ICMP_STATS +#define UDP_STATS +#define TCP_STATS +#define MEM_STATS +#define MEMP_STATS +#define PBUF_STATS +#define SYS_STATS +#endif /* STATS */ #endif /* __LWIPOPTS_H__ */