mirror
/
devilutionX-lwip-contrib
mirror of https://github.com/diasurgical/lwip-contrib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update unix port to 1.3.0 before release

master
kieranm 18 years ago
parent
18a8963351
commit
bddf652073
12 changed files with 797 additions and 385 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ports/FILES
  2. 2
      ports/old/FILES
  3. 2
      ports/unix/proj/lib/Makefile
  4. 531
      ports/unix/proj/lib/lwipopts.h
  5. 13
      ports/unix/proj/lib/unixlib.c
  6. 3
      ports/unix/proj/minimal/Makefile
  7. 562
      ports/unix/proj/minimal/lwipopts.h
  8. 15
      ports/unix/proj/minimal/main.c
  9. 3
      ports/unix/proj/unixsim/Makefile
  10. 4
      ports/unix/proj/unixsim/lwipopts.h
  11. 15
      ports/unix/proj/unixsim/simhost.c
  12. 29
      ports/unix/sys_arch.c

3
ports/FILES
Unescape View File

@ -2,4 +2,7 @@ unix/ - Architectural files for testing on unix-like systems
(assuming gcc and pthreads). (assuming gcc and pthreads).
- Maintained by Kieran Mansley <kieran@recoil.org> - Maintained by Kieran Mansley <kieran@recoil.org>
msvc6/ - Architectural files for Microsoft Visual C++ 6.0.
- Maintained by Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
old/ - Ports that are no longer actively maintained old/ - Ports that are no longer actively maintained

2
ports/old/FILES
Unescape View File

@ -6,8 +6,6 @@ c16x/ - Architectural files for the C16x/ST10 uC.
Supports lwIP Raw API only. Supports lwIP Raw API only.
CS8900a Ethernet driver for 16-bit mode. CS8900a Ethernet driver for 16-bit mode.
msvc6/ - Architectural files for Microsoft Visual C++ 6.0.
rtxc/ - Architectural files for the RTXC operating system. rtxc/ - Architectural files for the RTXC operating system.
v2pro/ - Architectural files for the Xilinx Virtex-II PRO device with v2pro/ - Architectural files for the Xilinx Virtex-II PRO device with

2
ports/unix/proj/lib/Makefile
Unescape View File

@ -49,7 +49,7 @@ CFLAGS:=$(CFLAGS) \
COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \ COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c \ $(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c \
$(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \ $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
$(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/init.c
CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \ CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \
$(LWIPDIR)/core/ipv4/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c \ $(LWIPDIR)/core/ipv4/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c \
$(LWIPDIR)/core/ipv4/inet_chksum.c $(LWIPDIR)/core/ipv4/inet_chksum.c

531
ports/unix/proj/lib/lwipopts.h
Unescape View File

@ -1,5 +1,11 @@
/**
* @file
*
* lwIP Options Configuration
*/
/* /*
* Copyright (c) 2001-2003 Swedish Institute of Computer Science. * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
@ -32,151 +38,384 @@
#ifndef __LWIPOPTS_H__ #ifndef __LWIPOPTS_H__
#define __LWIPOPTS_H__ #define __LWIPOPTS_H__
/* <sys/time.h> is included in cc.h! */ /*
#define LWIP_TIMEVAL_PRIVATE 0 * Include user defined options first. Anything not defined in these files
* will be set to standard values. Override anything you dont like!
*/
#include "lwipopts.h"
#include "lwip/debug.h"
/*
-----------------------------------------------
---------- Platform specific locking ----------
-----------------------------------------------
*/
/**
* SYS_LIGHTWEIGHT_PROT==1: if you want inter-task protection for certain
* critical regions during buffer allocation, deallocation and memory
* allocation and deallocation.
*/
#define SYS_LIGHTWEIGHT_PROT 0
/**
* NO_SYS==1: Provides VERY minimal functionality. Otherwise,
* use lwIP facilities.
*/
#define NO_SYS 0
/*
------------------------------------
---------- Memory options ----------
------------------------------------
*/
/**
* MEM_ALIGNMENT: should be set to the alignment of the CPU
* 4 byte alignment -> #define MEM_ALIGNMENT 4
* 2 byte alignment -> #define MEM_ALIGNMENT 2
*/
#define MEM_ALIGNMENT 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.
*/
#define MEM_SIZE 1600
/*
------------------------------------------------
---------- Internal Memory Pool Sizes ----------
------------------------------------------------
*/
/**
* MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
* If the application sends a lot of data out of ROM (or other static memory),
* this should be set high.
*/
#define MEMP_NUM_PBUF 16
/**
* MEMP_NUM_RAW_PCB: Number of raw connection PCBs
* (requires the LWIP_RAW option)
*/
#define MEMP_NUM_RAW_PCB 4
/**
* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
* per active UDP "connection".
* (requires the LWIP_UDP option)
*/
#define MEMP_NUM_UDP_PCB 4
/**
* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB 4
/**
* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB_LISTEN 4
/**
* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_SEG 16
/**
* MEMP_NUM_REASSDATA: the number of simultaneously IP packets queued for
* reassembly (whole packets, not fragments!)
*/
#define MEMP_NUM_REASSDATA 1
/**
* MEMP_NUM_ARP_QUEUE: the number of simulateously queued outgoing
* packets (pbufs) that are waiting for an ARP request (to resolve
* their destination address) to finish.
* (requires the ARP_QUEUEING option)
*/
#define MEMP_NUM_ARP_QUEUE 2
/**
* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
* (requires NO_SYS==0)
*/
#define MEMP_NUM_SYS_TIMEOUT 3
/**
* MEMP_NUM_NETBUF: the number of struct netbufs.
* (only needed if you use the sequential API, like api_lib.c)
*/
#define MEMP_NUM_NETBUF 2
/**
* MEMP_NUM_NETCONN: the number of struct netconns.
* (only needed if you use the sequential API, like api_lib.c)
*/
#define MEMP_NUM_NETCONN 4
/**
* MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
* for callback/timeout API communication.
* (only needed if you use tcpip.c)
*/
#define MEMP_NUM_TCPIP_MSG_API 8
/**
* MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
* for incoming packets.
* (only needed if you use tcpip.c)
*/
#define MEMP_NUM_TCPIP_MSG_INPKT 8
/**
* PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
*/
#define PBUF_POOL_SIZE 8
/*
---------------------------------
---------- ARP options ----------
---------------------------------
*/
/**
* LWIP_ARP==1: Enable ARP functionality.
*/
#define LWIP_ARP 1
/*
--------------------------------
---------- IP options ----------
--------------------------------
*/
/**
* IP_FORWARD==1: Enables 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.
*/
#define IP_FORWARD 0
/**
* IP_OPTIONS: Defines the behavior for IP options.
* IP_OPTIONS_ALLOWED==0: All packets with IP options are dropped.
* IP_OPTIONS_ALLOWED==1: IP options are allowed (but not parsed).
*/
#define IP_OPTIONS_ALLOWED 1
/**
* IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
* this option does not affect outgoing packet sizes, which can be controlled
* via IP_FRAG.
*/
#define IP_REASSEMBLY 1
/**
* IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
* that this option does not affect incoming packet sizes, which can be
* controlled via IP_REASSEMBLY.
*/
#define IP_FRAG 1
/* ---------- Memory options ---------- */ /**
/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which * IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
lwIP is compiled. 4 byte alignment -> define MEM_ALIGNMENT to 4, 2 * a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
byte alignment -> define MEM_ALIGNMENT to 2. */ * in this time, the whole packet is discarded.
#define MEM_ALIGNMENT 1 */
#define IP_REASS_MAXAGE 3
/* 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 1600 * IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
* Since the received pbufs are enqueued, be sure to configure
/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application * PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
sends a lot of data out of ROM (or other static memory), this * packets even if the maximum amount of fragments is enqueued for reassembly!
should be set high. */ */
#define MEMP_NUM_PBUF 16 #define IP_REASS_MAX_PBUFS 4
/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
per active UDP "connection". */ /**
#define MEMP_NUM_UDP_PCB 4 * IP_FRAG_USES_STATIC_BUF==1: Use a static MTU-sized buffer for IP
/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP * fragmentation. Otherwise pbufs are allocated and reference the original
connections. */ * packet data to be fragmented.
#define MEMP_NUM_TCP_PCB 5 */
/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP #define IP_FRAG_USES_STATIC_BUF 0
connections. */
#define MEMP_NUM_TCP_PCB_LISTEN 8 /**
/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP * IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
segments. */ */
#define MEMP_NUM_TCP_SEG 16 #define IP_DEFAULT_TTL 255
/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
timeouts. */ /*
#define MEMP_NUM_SYS_TIMEOUT 3 ----------------------------------
---------- ICMP options ----------
----------------------------------
/* 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. */ * LWIP_ICMP==1: Enable ICMP module inside the IP stack.
#define MEMP_NUM_NETBUF 2 * Be careful, disable that make your product non-compliant to RFC1122
/* MEMP_NUM_NETCONN: the number of struct netconns. */ */
#define MEMP_NUM_NETCONN 4 #define LWIP_ICMP 1
/* 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 8 ---------- RAW options ----------
#define MEMP_NUM_TCPIP_MSG_INPKT 8 ---------------------------------
*/
/* These two control is reclaimer functions should be compiled /**
in. Should always be turned on (1). */ * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
#define MEM_RECLAIM 1 */
#define MEMP_RECLAIM 1 #define LWIP_RAW 1
/* ---------- Pbuf options ---------- */ /*
/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */ ----------------------------------
#define PBUF_POOL_SIZE 6 ---------- DHCP options ----------
----------------------------------
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */ */
#define PBUF_POOL_BUFSIZE 128 /**
* LWIP_DHCP==1: Enable DHCP module.
/* PBUF_LINK_HLEN: the number of bytes that should be allocated for a */
link level header. */ #define LWIP_DHCP 0
#define PBUF_LINK_HLEN 16
/* ---------- TCP options ---------- */ /*
#define LWIP_TCP 1 ------------------------------------
#define TCP_TTL 255 ---------- AUTOIP options ----------
------------------------------------
/* Controls if TCP should queue segments that arrive out of */
order. Define to 0 if your device is low on memory. */ /**
#define TCP_QUEUE_OOSEQ 1 * LWIP_AUTOIP==1: Enable AUTOIP module.
*/
/* TCP Maximum segment size. */ #define LWIP_AUTOIP 0
#define TCP_MSS 128
/*
/* TCP sender buffer space (bytes). */ ----------------------------------
#define TCP_SND_BUF 256 ---------- SNMP options ----------
----------------------------------
/* 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 * LWIP_SNMP==1: Turn on SNMP module. UDP must be available for SNMP
* transport.
/* TCP receive window. */ */
#define TCP_WND 1024 #define LWIP_SNMP 0
/* Maximum number of retransmissions of data segments. */ /*
#define TCP_MAXRTX 12 ----------------------------------
---------- IGMP options ----------
/* Maximum number of retransmissions of SYN segments. */ ----------------------------------
#define TCP_SYNMAXRTX 4 */
/**
/* ---------- ARP options ---------- */ * LWIP_IGMP==1: Turn on IGMP module.
#define ARP_TABLE_SIZE 10 */
#define ARP_QUEUEING 1 #define LWIP_IGMP 0
/* ---------- 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 ---------- DNS options -----------
on a device with only one network interface, define this to 0. */ ----------------------------------
#define IP_FORWARD 1 */
/**
/* If defined to 1, IP options are allowed (but not parsed). If * LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
defined to 0, all packets with IP options are dropped. */ * transport.
#define IP_OPTIONS_ALLOWED 1 */
#define LWIP_DNS 0
/* ---------- ICMP options ---------- */
#define ICMP_TTL 255 /*
---------------------------------
---------- UDP 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. */ * LWIP_UDP==1: Turn on UDP.
#define LWIP_DHCP 0 */
#define LWIP_UDP 1
/* 1 if you want to do an ARP check on the offered address
(recommended). */ /*
#define DHCP_DOES_ARP_CHECK 1 ---------------------------------
---------- TCP options ----------
/* ---------- UDP options ---------- */ ---------------------------------
#define LWIP_UDP 1 */
#define UDP_TTL 255 /**
* LWIP_TCP==1: Turn on TCP.
*/
/* ---------- Statistics options ---------- */ #define LWIP_TCP 1
/*#define LWIP_STATS 1*/
#define LWIP_LISTEN_BACKLOG 0
#ifdef LWIP_STATS
#define LINK_STATS 1 /*
#define IP_STATS 1 ----------------------------------
#define ICMP_STATS 1 ---------- Pbuf options ----------
#define UDP_STATS 1 ----------------------------------
#define TCP_STATS 1 */
#define MEM_STATS 1 /**
#define MEMP_STATS 1 * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
#define PBUF_STATS 1 * link level header. The default is 14, the standard value for
#define SYS_STATS 1 * Ethernet.
#else */
#define LINK_STATS 0 #define PBUF_LINK_HLEN 16
#define IP_STATS 0
#define ICMP_STATS 0 /**
#define UDP_STATS 0 * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
#define TCP_STATS 0 * designed to accomodate single full size TCP frame in one pbuf, including
#define MEM_STATS 0 * TCP_MSS, IP header, and link header.
#define MEMP_STATS 0 *
#define PBUF_STATS 0 */
#define SYS_STATS 0 #define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_HLEN)
#endif /* STATS */
/*
------------------------------------
---------- LOOPIF options ----------
------------------------------------
*/
/**
* LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
*/
#define LWIP_HAVE_LOOPIF 0
/*
----------------------------------------------
---------- Sequential layer options ----------
----------------------------------------------
*/
/**
* LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
*/
#define LWIP_NETCONN 1
/*
------------------------------------
---------- Socket options ----------
------------------------------------
*/
/**
* LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
*/
#define LWIP_SOCKET 1
/*
----------------------------------------
---------- Statistics options ----------
----------------------------------------
*/
/**
* LWIP_STATS==1: Enable statistics collection in lwip_stats.
*/
#define LWIP_STATS 0
/*
---------------------------------
---------- PPP options ----------
---------------------------------
*/
/**
* PPP_SUPPORT==1: Enable PPP.
*/
#define PPP_SUPPORT 0
/* Misc */
#define LWIP_TIMEVAL_PRIVATE 0
#endif /* __LWIPOPTS_H__ */ #endif /* __LWIPOPTS_H__ */

13
ports/unix/proj/lib/unixlib.c
Unescape View File

@ -26,7 +26,7 @@
* *
* Author: Kieran Mansley <kjm25@cam.ac.uk> * Author: Kieran Mansley <kjm25@cam.ac.uk>
* *
* $Id: unixlib.c,v 1.5 2007/02/26 20:09:23 jifl Exp $ * $Id: unixlib.c,v 1.6 2008/01/15 13:10:51 kieranm Exp $
*/ */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
@ -41,6 +41,7 @@
* you would like the stack to use. * you would like the stack to use.
*/ */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#include "lwip/init.h"
#include "lwip/sys.h" #include "lwip/sys.h"
#include "lwip/mem.h" #include "lwip/mem.h"
#include "lwip/memp.h" #include "lwip/memp.h"
@ -67,24 +68,16 @@ void _init(void){
struct ip_addr ipaddr, netmask, gateway; struct ip_addr ipaddr, netmask, gateway;
sys_sem_t sem; sys_sem_t sem;
stats_init();
sys_init();
mem_init();
memp_init();
pbuf_init();
lwip_socket_init();
sem = sys_sem_new(0); sem = sys_sem_new(0);
tcpip_init(tcpip_init_done, &sem); tcpip_init(tcpip_init_done, &sem);
sys_sem_wait(sem); sys_sem_wait(sem);
sys_sem_free(sem); sys_sem_free(sem);
netif_init();
/* /*
CHANGE THESE to suit your own network configuration: CHANGE THESE to suit your own network configuration:
*/ */
IP4_ADDR(&gateway, 192,168,1,1); IP4_ADDR(&gateway, 192,168,1,1);
IP4_ADDR(&ipaddr, 192,168,1,1); IP4_ADDR(&ipaddr, 192,168,1,2);
IP4_ADDR(&netmask, 255,255,255,0); IP4_ADDR(&netmask, 255,255,255,0);
netif_set_default(netif_add(&netif, &ipaddr, &netmask, &gateway, NULL, tapif_init, netif_set_default(netif_add(&netif, &ipaddr, &netmask, &gateway, NULL, tapif_init,

3
ports/unix/proj/minimal/Makefile
Unescape View File

@ -54,7 +54,8 @@ COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c \ $(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c \
$(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c \ $(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c \
$(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \ $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
$(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c \
$(LWIPDIR)/core/init.c
CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \ CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \
$(LWIPDIR)/core/ipv4/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c \ $(LWIPDIR)/core/ipv4/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c \
$(LWIPDIR)/core/ipv4/ip_frag.c $(LWIPDIR)/core/ipv4/inet_chksum.c $(LWIPDIR)/core/ipv4/ip_frag.c $(LWIPDIR)/core/ipv4/inet_chksum.c

562
ports/unix/proj/minimal/lwipopts.h
Unescape View File

@ -1,5 +1,11 @@
/**
* @file
*
* lwIP Options Configuration
*/
/* /*
* Copyright (c) 2001-2003 Swedish Institute of Computer Science. * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, * Redistribution and use in source and binary forms, with or without modification,
@ -32,207 +38,361 @@
#ifndef __LWIPOPTS_H__ #ifndef __LWIPOPTS_H__
#define __LWIPOPTS_H__ #define __LWIPOPTS_H__
/* <sys/time.h> is included in cc.h! */ /*
#define LWIP_TIMEVAL_PRIVATE 0 -----------------------------------------------
---------- Platform specific locking ----------
-----------------------------------------------
*/
/**
* NO_SYS==1: Provides VERY minimal functionality. Otherwise,
* use lwIP facilities.
*/
#define NO_SYS 1
/*
------------------------------------
---------- Memory options ----------
------------------------------------
*/
/**
* MEM_ALIGNMENT: should be set to the alignment of the CPU
* 4 byte alignment -> #define MEM_ALIGNMENT 4
* 2 byte alignment -> #define MEM_ALIGNMENT 2
*/
#define MEM_ALIGNMENT 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.
*/
#define MEM_SIZE 16000
#define NO_SYS 1
/* #define LWIP_EVENT_API 1 */
/* ---------- 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 2
/* 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
/* 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 30
/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
per active UDP "connection". */
#define MEMP_NUM_UDP_PCB 4
/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
connections. */
#define MEMP_NUM_TCP_PCB 2
/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
connections. */
#define MEMP_NUM_TCP_PCB_LISTEN 8
/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
segments. */
#define MEMP_NUM_TCP_SEG 16
/* 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 0
/* MEMP_NUM_NETCONN: the number of struct netconns. */
#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 simultaneously active
timeouts. */
#define MEMP_NUM_SYS_TIMEOUT 0
/* ---------- Pbuf options ---------- */
/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
#define PBUF_POOL_SIZE 46
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
#define PBUF_POOL_BUFSIZE 128
/* PBUF_LINK_HLEN: the number of bytes that should be allocated for a
link level header. */
#define PBUF_LINK_HLEN 16
/* ---------- TCP options ---------- */
#define LWIP_TCP 1
#define TCP_TTL 255
/* Controls if TCP should queue segments that arrive out of
order. Define to 0 if your device is low on memory. */
#define TCP_QUEUE_OOSEQ 0
/* TCP Maximum segment size. */
#define TCP_MSS 128
/* TCP sender buffer space (bytes). */
#define TCP_SND_BUF 256
/* 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
/* TCP receive window. */
#define TCP_WND 512
/* Maximum number of retransmissions of data segments. */
#define TCP_MAXRTX 12
/* Maximum number of retransmissions of SYN segments. */
#define TCP_SYNMAXRTX 4
/* ---------- ARP options ---------- */
#define ARP_TABLE_SIZE 10
/* CSi: disabled because of some TCP issues?
need to enable for coldstart trap. @todo fixme */
#define ARP_QUEUEING 0
/* ---------- 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. */
#define IP_FORWARD 0
/* If defined to 1, IP options are allowed (but ignored). If
defined to 0, all packets with IP options are dropped. */
#define IP_OPTIONS_ALLOWED 1
#define IP_REASSEMBLY 1
#define IP_FRAG 1
/* ---------- ICMP options ---------- */
#define ICMP_TTL 255
/* ---------- 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. */
#define LWIP_DHCP 0
/* 1 if you want to do an ARP check on the offered address
(recommended). */
#define DHCP_DOES_ARP_CHECK 1
/* ---------- SNMP options ---------- */
/** @todo SNMP isn't functional yet.
@note UDP must be available for SNMP transport */
#define LWIP_SNMP 1
#define SNMP_TRAP_DESTINATIONS 1
#define SNMP_PRIVATE_MIB 1
/* ---------- UDP options ---------- */
#define LWIP_UDP 1
#define UDP_TTL 255
#define LWIP_RAW 0
/* ---------- Statistics options ---------- */
#define LWIP_STATS 0
#if LWIP_STATS
#define LINK_STATS 0
#define IP_STATS 0
#define ICMP_STATS 0
#define UDP_STATS 0
#define TCP_STATS 0
#define MEM_STATS 1
#define MEMP_STATS 1
#define PBUF_STATS 1
#define SYS_STATS 0
#endif /* LWIP_STATS */
/** print only debug messages with this level or higher */
#define LWIP_DBG_MIN_LEVEL 0
#if 0
/** compiletime debug output selection */
#define LWIP_DBG_TYPES_ON (LWIP_DBG_ON | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_FRESH)
#else
/** runtime debug output selection
debug_flags exported from main.c()*/
extern unsigned char debug_flags;
#define LWIP_DBG_TYPES_ON debug_flags
#endif
/**
* Enable/disable debugging per module
*/
#define DEMO_DEBUG LWIP_DBG_OFF
#define ETHARP_DEBUG LWIP_DBG_OFF
#define NETIF_DEBUG LWIP_DBG_OFF
#define PBUF_DEBUG LWIP_DBG_OFF
#define DELIF_DEBUG LWIP_DBG_OFF
#define DROPIF_DEBUG LWIP_DBG_OFF
#define TUNIF_DEBUG LWIP_DBG_OFF
#define UNIXIF_DEBUG LWIP_DBG_OFF
#define TAPIF_DEBUG LWIP_DBG_OFF
#define SIO_FIFO_DEBUG LWIP_DBG_OFF
#define PPP_DEBUG LWIP_DBG_OFF
#define API_LIB_DEBUG LWIP_DBG_OFF
#define API_MSG_DEBUG LWIP_DBG_OFF
#define SOCKETS_DEBUG LWIP_DBG_OFF
#define ICMP_DEBUG LWIP_DBG_OFF
#define INET_DEBUG LWIP_DBG_OFF
#define IP_DEBUG LWIP_DBG_OFF
#define IP_REASS_DEBUG LWIP_DBG_OFF
#define MEM_DEBUG LWIP_DBG_OFF
#define MEMP_DEBUG LWIP_DBG_OFF
#define SYS_DEBUG LWIP_DBG_OFF
#define TCP_DEBUG LWIP_DBG_OFF
#define TCP_INPUT_DEBUG LWIP_DBG_OFF
#define TCP_FR_DEBUG LWIP_DBG_OFF
#define TCP_RTO_DEBUG LWIP_DBG_OFF
#define TCP_CWND_DEBUG LWIP_DBG_OFF
#define TCP_WND_DEBUG LWIP_DBG_OFF
#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
#define TCP_RST_DEBUG LWIP_DBG_OFF
#define TCP_QLEN_DEBUG LWIP_DBG_OFF
#define UDP_DEBUG LWIP_DBG_OFF
#define TCPIP_DEBUG LWIP_DBG_OFF
#define TCPDUMP_DEBUG LWIP_DBG_OFF
#define DHCP_DEBUG LWIP_DBG_OFF
#define SNMP_MSG_DEBUG LWIP_DBG_ON
#define SNMP_MIB_DEBUG LWIP_DBG_ON
/*
------------------------------------------------
---------- Internal Memory Pool Sizes ----------
------------------------------------------------
*/
/**
* MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
* If the application sends a lot of data out of ROM (or other static memory),
* this should be set high.
*/
#define MEMP_NUM_PBUF 30
/**
* MEMP_NUM_RAW_PCB: Number of raw connection PCBs
* (requires the LWIP_RAW option)
*/
#define MEMP_NUM_RAW_PCB 4
/**
* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
* per active UDP "connection".
* (requires the LWIP_UDP option)
*/
#define MEMP_NUM_UDP_PCB 4
/**
* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB 2
/**
* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_PCB_LISTEN 8
/**
* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
* (requires the LWIP_TCP option)
*/
#define MEMP_NUM_TCP_SEG 16
/**
* MEMP_NUM_ARP_QUEUE: the number of simulateously queued outgoing
* packets (pbufs) that are waiting for an ARP request (to resolve
* their destination address) to finish.
* (requires the ARP_QUEUEING option)
*/
#define MEMP_NUM_ARP_QUEUE 2
/**
* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active timeouts.
* (requires NO_SYS==0)
*/
#define MEMP_NUM_SYS_TIMEOUT 0
/**
* MEMP_NUM_NETBUF: the number of struct netbufs.
* (only needed if you use the sequential API, like api_lib.c)
*/
#define MEMP_NUM_NETBUF 0
/**
* MEMP_NUM_NETCONN: the number of struct netconns.
* (only needed if you use the sequential API, like api_lib.c)
*/
#define MEMP_NUM_NETCONN 0
/**
* MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
* for callback/timeout API communication.
* (only needed if you use tcpip.c)
*/
#define MEMP_NUM_TCPIP_MSG_API 0
/**
* MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
* for incoming packets.
* (only needed if you use tcpip.c)
*/
#define MEMP_NUM_TCPIP_MSG_INPKT 0
/**
* PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
*/
#define PBUF_POOL_SIZE 32
/*
---------------------------------
---------- ARP options ----------
---------------------------------
*/
/**
* LWIP_ARP==1: Enable ARP functionality.
*/
#define LWIP_ARP 1
/*
--------------------------------
---------- IP options ----------
--------------------------------
*/
/**
* IP_FORWARD==1: Enables 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.
*/
#define IP_FORWARD 0
/**
* IP_OPTIONS: Defines the behavior for IP options.
* IP_OPTIONS==0_ALLOWED: All packets with IP options are dropped.
* IP_OPTIONS==1_ALLOWED: IP options are allowed (but not parsed).
*/
#define IP_OPTIONS_ALLOWED 1
/**
* IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
* this option does not affect outgoing packet sizes, which can be controlled
* via IP_FRAG.
*/
#define IP_REASSEMBLY 1
/**
* IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
* that this option does not affect incoming packet sizes, which can be
* controlled via IP_REASSEMBLY.
*/
#define IP_FRAG 1
/**
* IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
* a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
* in this time, the whole packet is discarded.
*/
#define IP_REASS_MAXAGE 3
/**
* IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
* Since the received pbufs are enqueued, be sure to configure
* PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
* packets even if the maximum amount of fragments is enqueued for reassembly!
*/
#define IP_REASS_MAX_PBUFS 10
/**
* IP_FRAG_USES_STATIC_BUF==1: Use a static MTU-sized buffer for IP
* fragmentation. Otherwise pbufs are allocated and reference the original
* packet data to be fragmented.
*/
#define IP_FRAG_USES_STATIC_BUF 0
/**
* IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
*/
#define IP_DEFAULT_TTL 255
/*
----------------------------------
---------- ICMP options ----------
----------------------------------
*/
/**
* LWIP_ICMP==1: Enable ICMP module inside the IP stack.
* Be careful, disable that make your product non-compliant to RFC1122
*/
#define LWIP_ICMP 1
/**
* ICMP_TTL: Default value for Time-To-Live used by ICMP packets.
*/
#define ICMP_TTL (IP_DEFAULT_TTL)
/*
---------------------------------
---------- RAW options ----------
---------------------------------
*/
/**
* LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
*/
#define LWIP_RAW 0
/*
----------------------------------
---------- DHCP options ----------
----------------------------------
*/
/**
* LWIP_DHCP==1: Enable DHCP module.
*/
#define LWIP_DHCP 0
/*
------------------------------------
---------- AUTOIP options ----------
------------------------------------
*/
/**
* LWIP_AUTOIP==1: Enable AUTOIP module.
*/
#define LWIP_AUTOIP 0
/*
----------------------------------
---------- SNMP options ----------
----------------------------------
*/
/**
* LWIP_SNMP==1: Turn on SNMP module. UDP must be available for SNMP
* transport.
*/
#define LWIP_SNMP 1
#define SNMP_PRIVATE_MIB 1
/*
----------------------------------
---------- IGMP options ----------
----------------------------------
*/
/**
* LWIP_IGMP==1: Turn on IGMP module.
*/
#define LWIP_IGMP 0
/*
----------------------------------
---------- DNS options -----------
----------------------------------
*/
/**
* LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
* transport.
*/
#define LWIP_DNS 0
/*
---------------------------------
---------- UDP options ----------
---------------------------------
*/
/**
* LWIP_UDP==1: Turn on UDP.
*/
#define LWIP_UDP 1
/**
* LWIP_UDPLITE==1: Turn on UDP-Lite. (Requires LWIP_UDP)
*/
#define LWIP_UDPLITE 0
/**
* UDP_TTL: Default Time-To-Live value.
*/
#define UDP_TTL (IP_DEFAULT_TTL)
/*
---------------------------------
---------- TCP options ----------
---------------------------------
*/
/**
* LWIP_TCP==1: Turn on TCP.
*/
#define LWIP_TCP 1
/*
----------------------------------
---------- Pbuf options ----------
----------------------------------
*/
/**
* PBUF_LINK_HLEN: the number of bytes that should be allocated for a
* link level header. The default is 14, the standard value for
* Ethernet.
*/
#define PBUF_LINK_HLEN 16
/*
------------------------------------
---------- LOOPIF options ----------
------------------------------------
*/
/**
* LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1) and loopif.c
*/
#define LWIP_HAVE_LOOPIF 0
/*
----------------------------------------------
---------- Sequential layer options ----------
----------------------------------------------
*/
/**
* LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
*/
#define LWIP_NETCONN 0
/*
------------------------------------
---------- Socket options ----------
------------------------------------
*/
/**
* LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
*/
#define LWIP_SOCKET 0
/*
----------------------------------------
---------- Statistics options ----------
----------------------------------------
*/
/**
* LWIP_STATS==1: Enable statistics collection in lwip_stats.
*/
#define LWIP_STATS 0
/* Misc */
#define LWIP_TIMEVAL_PRIVATE 0
#endif /* __LWIPOPTS_H__ */ #endif /* __LWIPOPTS_H__ */

15
ports/unix/proj/minimal/main.c
Unescape View File

@ -32,6 +32,9 @@
#include <unistd.h> #include <unistd.h>
#include <getopt.h> #include <getopt.h>
#include "lwip/init.h"
#include "lwip/debug.h" #include "lwip/debug.h"
#include "lwip/mem.h" #include "lwip/mem.h"
@ -171,17 +174,9 @@ main(int argc, char **argv)
#ifdef PERF #ifdef PERF
perf_init("/tmp/minimal.perf"); perf_init("/tmp/minimal.perf");
#endif /* PERF */ #endif /* PERF */
#ifdef STATS
stats_init();
#endif /* STATS */
mem_init(); lwip_init();
memp_init();
pbuf_init();
netif_init();
ip_init();
udp_init();
tcp_init();
printf("TCP/IP initialized.\n"); printf("TCP/IP initialized.\n");
netif_add(&netif, &ipaddr, &netmask, &gw, NULL, mintapif_init, ip_input); netif_add(&netif, &ipaddr, &netmask, &gw, NULL, mintapif_init, ip_input);

3
ports/unix/proj/unixsim/Makefile
Unescape View File

@ -54,7 +54,8 @@ CFLAGS:=$(CFLAGS) \
COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \ COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c $(LWIPDIR)/core/stats.c \ $(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c $(LWIPDIR)/core/stats.c \
$(LWIPDIR)/core/sys.c $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \ $(LWIPDIR)/core/sys.c $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c \
$(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/udp.c $(LWIPDIR)/core/dhcp.c \
$(LWIPDIR)/core/init.c
CORE4FILES=$(wildcard $(LWIPDIR)/core/ipv4/*.c) $(LWIPDIR)/core/ipv4/inet.c \ CORE4FILES=$(wildcard $(LWIPDIR)/core/ipv4/*.c) $(LWIPDIR)/core/ipv4/inet.c \
$(LWIPDIR)/core/ipv4/inet_chksum.c $(LWIPDIR)/core/ipv4/inet_chksum.c

4
ports/unix/proj/unixsim/lwipopts.h
Unescape View File

@ -202,8 +202,8 @@ a lot of data that needs to be copied, this should be set high. */
#define LWIP_DHCP 0 #define LWIP_DHCP 0
/* 1 if you want to do an ARP check on the offered address /* 1 if you want to do an ARP check on the offered address
(recommended). */ (recommended if using DHCP). */
#define DHCP_DOES_ARP_CHECK 1 #define DHCP_DOES_ARP_CHECK (LWIP_DHCP)
/* ---------- AUTOIP options ------- */ /* ---------- AUTOIP options ------- */
#define LWIP_AUTOIP 0 #define LWIP_AUTOIP 0

15
ports/unix/proj/unixsim/simhost.c
Unescape View File

@ -36,6 +36,8 @@
#include "lwip/opt.h" #include "lwip/opt.h"
#include "lwip/init.h"
#include "lwip/mem.h" #include "lwip/mem.h"
#include "lwip/memp.h" #include "lwip/memp.h"
#include "lwip/sys.h" #include "lwip/sys.h"
@ -473,17 +475,8 @@ main(int argc, char **argv)
#ifdef PERF #ifdef PERF
perf_init("/tmp/simhost.perf"); perf_init("/tmp/simhost.perf");
#endif /* PERF */ #endif /* PERF */
#if LWIP_STATS
stats_init(); lwip_init();
#endif /* STATS */
mem_init();
memp_init();
pbuf_init();
sys_init();
#ifdef LWIP_TCPDUMP
tcpdump_init();
#endif
lwip_socket_init();
printf("System initialized.\n"); printf("System initialized.\n");

29
ports/unix/sys_arch.c
Unescape View File

@ -250,6 +250,35 @@ sys_mbox_post(struct sys_mbox *mbox, void *msg)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
u32_t u32_t
sys_arch_mbox_tryfetch(struct sys_mbox *mbox, void **msg)
{
sys_arch_sem_wait(mbox->mutex, 0);
if (mbox->first == mbox->last) {
sys_sem_signal(mbox->mutex);
return SYS_MBOX_EMPTY;
}
if (msg != NULL) {
LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_tryfetch: mbox %p msg %p\n", (void *)mbox, *msg));
*msg = mbox->msgs[mbox->first % SYS_MBOX_SIZE];
}
else{
LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_tryfetch: mbox %p, null msg\n", (void *)mbox));
}
mbox->first++;
if (mbox->wait_send) {
sys_sem_signal(mbox->mail);
}
sys_sem_signal(mbox->mutex);
return 0;
}
/*-----------------------------------------------------------------------------------*/
u32_t
sys_arch_mbox_fetch(struct sys_mbox *mbox, void **msg, u32_t timeout) sys_arch_mbox_fetch(struct sys_mbox *mbox, void **msg, u32_t timeout)
{ {
u32_t time = 0; u32_t time = 0;

Write Preview
Loading…
Cancel
Save