Removed all structure packing directives. Protocol header fields are naturally aligned by design.

(Earlier, the 14-byte ethernet header screwed this up, this had already been fixed by adding two pad bytes.)
Assumption is that compilers do not align with larger-than-sizeof(type) boundaries.
Pre-tag PRE_PACK_REMOVE. Post-tag POST_TAG_REMOVE.

CHANGELOG

@@ -1,3 +1,165 @@
+FUTURE
+
+  * TODO: The lwIP source code makes some invalid assumptions on processor
+    word-length, storage sizes and alignment. See the mailing lists for
+    problems with exoteric (/DSP) architectures showing these problems.
+    We still have to fix some of these issues neatly.
+
+HISTORY
+
+(HEAD)
+
+  ++ Changes:
+
+  2004-04-29 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * tcp*.c: Cleaned up source comment documentation for Doxygen processing.
+  * opt.h: ETHHARP_ALWAYS_INSERT option removed to comply with ARP RFC.
+  * etharp.c: update_arp_entry() only adds new ARP entries when adviced to by
+    the caller. This deprecates the ETHHARP_ALWAYS_INSERT overrule option.
+
+  ++ Bug fixes:
+
+  2004-04-27 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * etharp.c: Applied patch of bug #8708 by Toni Mountifield with a solution
+    suggested by Timmy Brolin. Fix for 32-bit processors that cannot access
+    non-aligned 32-bit words, such as soms 32-bit TCP/IP header fields. Fix
+    is to prefix the 14-bit Ethernet headers with two padding bytes.
+
+  2004-04-23 Leon Woestenberg <leon.woestenberg@gmx.net>
+  * ip_addr.c: Fix in the ip_addr_isbroadcast() check.
+  * etharp.c: Fixed the case where the packet that initiates the ARP request
+    is not queued, and gets lost. Fixed the case where the packets destination
+    address is already known; we now always queue the packet and perform an ARP
+    request.
+  
+(STABLE-0_7_0)
+
+  ++ Bug fixes:
+
+  * Fixed TCP bug for SYN_SENT to ESTABLISHED state transition.
+  * Fixed TCP bug in dequeueing of FIN from out of order segment queue.
+  * Fixed two possible NULL references in rare cases.
+
+(STABLE-0_6_6)
+
+  ++ Bug fixes:
+
+  * Fixed DHCP which did not include the IP address in DECLINE messages.
+
+  ++ Changes:
+
+  * etharp.c has been hauled over a bit.
+
+(STABLE-0_6_5)
+
+  ++ Bug fixes:
+
+  * Fixed TCP bug induced by bad window resizing with unidirectional TCP traffic.
+  * Packets sent from ARP queue had invalid source hardware address.
+
+  ++ Changes:
+
+  * Pass-by ARP requests do now update the cache.
+
+  ++ New features:
+
+  * No longer dependent on ctype.h.
+  * New socket options.
+  * Raw IP pcb support.
+
+(STABLE-0_6_4)
+
+  ++ Bug fixes:
+
+  * Some debug formatters and casts fixed.
+  * Numereous fixes in PPP.
+
+  ++ Changes:
+
+  * DEBUGF now is LWIP_DEBUGF
+  * pbuf_dechain() has been re-enabled.
+  * Mentioned the changed use of CVS branches in README.
+
+(STABLE-0_6_3)
+
+  ++ Bug fixes:
+
+  * Fixed pool pbuf memory leak in pbuf_alloc().
+    Occured if not enough PBUF_POOL pbufs for a packet pbuf chain.
+    Reported by Savin Zlobec.
+
+  * PBUF_POOL chains had their tot_len field not set for non-first
+    pbufs. Fixed in pbuf_alloc().
+
+  ++ New features:
+
+  * Added PPP stack contributed by Marc Boucher
+
+  ++ Changes:
+
+  * Now drops short packets for ICMP/UDP/TCP protocols. More robust.
+
+  * ARP queueuing now queues the latest packet instead of the first.
+    This is the RFC recommended behaviour, but can be overridden in
+    lwipopts.h.
+
+(0.6.2)
+
+  ++ Bugfixes:
+
+  * TCP has been fixed to deal with the new use of the pbuf->ref
+    counter.
+
+  * DHCP dhcp_inform() crash bug fixed.
+
+  ++ Changes:
+
+  * Removed pbuf_pool_free_cache and pbuf_pool_alloc_cache. Also removed
+    pbuf_refresh(). This has sped up pbuf pool operations considerably.
+    Implemented by David Haas.
+
+(0.6.1)
+
+  ++ New features:
+
+  * The packet buffer implementation has been enhanced to support
+    zero-copy and copy-on-demand for packet buffers which have their
+    payloads in application-managed memory.
+    Implemented by David Haas.
+
+    Use PBUF_REF to make a pbuf refer to RAM. lwIP will use zero-copy
+    if an outgoing packet can be directly sent on the link, or perform
+    a copy-on-demand when necessary.
+
+    The application can safely assume the packet is sent, and the RAM
+    is available to the application directly after calling udp_send()
+    or similar function.
+
+  ++ Bugfixes:
+
+  * ARP_QUEUEING should now correctly work for all cases, including
+    PBUF_REF.
+    Implemented by Leon Woestenberg.
+
+  ++ Changes:
+
+  * IP_ADDR_ANY is no longer a NULL pointer. Instead, it is a pointer
+    to a '0.0.0.0' IP address.
+
+  * The packet buffer implementation is changed. The pbuf->ref counter
+    meaning has changed, and several pbuf functions have been
+    adapted accordingly.
+
+  * netif drivers have to be changed to set the hardware address length field
+    that must be initialized correctly by the driver (hint: 6 for Ethernet MAC).
+    See the contrib/ports/c16x cs8900 driver as a driver example.
+
+  * netif's have a dhcp field that must be initialized to NULL by the driver.
+    See the contrib/ports/c16x cs8900 driver as a driver example.
+
+(0.5.x) This file has been unmaintained up to 0.6.1. All changes are
+  logged in CVS but have not been explained here.
+
 (0.5.3) Changes since version 0.5.2
 
   ++ Bugfixes:
@@ -29,7 +191,7 @@
   * pbuf_dechain() did not update the ->tot_len field of the tail.
 
   * Aborted TCP connections were not handled correctly in all
-    situations. 
+    situations.
 
   ++ Other changes:
 
@@ -37,7 +199,7 @@
 
   * The ->len field in the tcp_seg structure now counts the actual
     amount of data, and does not add one for SYN and FIN segments.
-    
+
 (0.5.1) Changes since version 0.5.0
 
   ++ New features:
@@ -47,16 +209,16 @@
   * Preliminary support for cross platform packed structs.
 
   * ARP timer now implemented.
-  
+
   ++ Bugfixes:
 
   * TCP output queue length was badly initialized when opening
     connections.
 
   * TCP delayed ACKs were not sent correctly.
-  
+
   * Explicit initialization of BSS segment variables.
-  
+
   * read() in BSD socket library could drop data.
 
   * Problems with memory alignment.
@@ -70,7 +232,7 @@
 
   * IP multicast address tests had endianess problems.
 
-  * ARP requests had wrong destination hardware address. 
+  * ARP requests had wrong destination hardware address.
 
   ++ Other changes:
 
@@ -80,8 +242,8 @@
 
   * TCP and UDP ->dest_* struct members where changed to ->remote_*.
 
-  * ntoh* macros are now null definitions for big endian CPUs. 
-  
+  * ntoh* macros are now null definitions for big endian CPUs.
+
 (0.5.0) Changes since version 0.4.2
 
   ++ New features:
@@ -89,9 +251,9 @@
   * Redesigned operating system emulation layer to make porting easier.
 
   * Better control over TCP output buffers.
-    
+
   * Documenation added.
-  
+
   ++ Bugfixes:
 
   * Locking issues in buffer management.
@@ -104,7 +266,7 @@
 
   * Directory structure somewhat changed; the core/ tree has been
     collapsed.
-  
+
 (0.4.2) Changes since version 0.4.1
 
   ++ New features:
@@ -127,7 +289,7 @@
 
   * Variable++ have in appliciable cases been translated to ++variable
     since some compilers generate better code in the latter case.
-    
+
 (0.4.1) Changes since version 0.4
 
   ++ New features:
@@ -139,43 +301,43 @@
   * UDP: experimental support for UDP-Lite extensions.
 
   ++ Bugfixes:
-    
+
   * TCP: out of order segments were in some cases handled incorrectly,
     and this has now been fixed. Delayed acknowledgements was broken
     in 0.4, has now been fixed. Binding to an address that is in use
     now results in an error. Reset connections sometimes hung an
-    application; this has been fixed. 
+    application; this has been fixed.
 
   * Checksum calculation sometimes failed for chained pbufs with odd
     lengths. This has been fixed.
-    
+
   * API: a lot of bug fixes in the API. The UDP API has been improved
     and tested. Error reporting and handling has been
     improved. Logical flaws and race conditions for incoming TCP
-    connections has been found and removed. 
- 
+    connections has been found and removed.
+
   * Memory manager: alignment issues. Reallocating memory sometimes
     failed, this has been fixed.
 
-  * Generic library: bcopy was flawed and has been fixed. 
+  * Generic library: bcopy was flawed and has been fixed.
 
   ++ Other changes:
-  
+
   * API: all datatypes has been changed from generic ones such as
     ints, to specified ones such as u16_t. Functions that return
     errors now have the correct type (err_t).
-  
+
   * General: A lot of code cleaned up and debugging code removed. Many
     portability issues have been fixed.
 
-  * The license was changed; the advertising clause was removed. 
+  * The license was changed; the advertising clause was removed.
 
   * C64 port added.
 
   * Thanks: Huge thanks go to Dagan Galarneau, Horst Garnetzke, Petri
     Kosunen, Mikael Caleres, and Frits Wilmink for reporting and
     fixing bugs!
-  
+
 (0.4) Changes since version 0.3.1
 
   * Memory management has been radically changed; instead of
@@ -183,14 +345,14 @@
     rapidly allocated and deallocated is now kept in pools. Allocation
     and deallocation from those memory pools is very fast. The shared
     heap is still present but is used less frequently.
-    
+
   * The memory, memory pool, and packet buffer subsystems now support
     4-, 2-, or 1-byte alignment.
 
   * "Out of memory" situations are handled in a more robust way.
- 
+
   * Stack usage has been reduced.
-    
+
   * Easier configuration of lwIP parameters such as memory usage,
     TTLs, statistics gathering, etc. All configuration parameters are
     now kept in a single header file "lwipopts.h".
@@ -204,7 +366,7 @@
 
   * The code for the RTXC architecture has been implemented, tested
     and put to use.
-    
+
   * Bugs have been found and corrected in the TCP, UDP, IP, API, and
     the Internet checksum modules.
 
@@ -213,7 +375,7 @@
 
   * The license has been changed slightly to conform more with the
     original BSD license, including the advertisement clause.
-  
+
 (0.3.1) Changes since version 0.3
 
   * Fix of a fatal bug in the buffer management. Pbufs with allocated
@@ -239,10 +401,10 @@
     to free some memory and retry the allocation.
 
   * Much testing has been done with limited memory
-    configurations. lwIP now does a better job when overloaded. 
+    configurations. lwIP now does a better job when overloaded.
 
   * Some bugfixes and improvements to the buffer (pbuf) subsystem.
-    
+
   * Many bugfixes in the TCP code:
 
     - Fixed a bug in tcp_close().
@@ -269,15 +431,15 @@
     - TCP retransmission timeout backoffs are not correctly computed
       (ala BSD). After a number of retransmissions, TCP now gives up
       the connection.
-      
+
   * TCP connections now are kept on three lists, one for active
     connections, one for listening connections, and one for
     connections that are in TIME-WAIT. This greatly speeds up the fast
     timeout processing for sending delayed ACKs.
-  
+
   * TCP now provides proper feedback to the application when a
     connection has been successfully set up.
-  
+
   * More comments have been added to the code. The code has also been
     somewhat cleaned up.
 

COPYING

@@ -1,29 +1,33 @@
-Copyright (c) 2001, 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. Neither the name of the Institute nor the names of its contributors 
-   may be used to endorse or promote products derived from this software 
-   without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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. 
+/*
+ * 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 <adam@sics.se>
+ *
+ */
 
 

FILES

@@ -1,5 +1,4 @@
 src/      - The source code for the lwIP TCP/IP stack.
+doc/      - The documentation for lwIP.
 
-proj/     - Makefiles and code for compiling lwIP.
-
-See also the FILES file in each subdirectory.
+See also the FILES file in each subdirectory.

README

@@ -0,0 +1,92 @@
+INTRODUCTION
+
+lwIP is a small independent implementation of the TCP/IP protocol
+suite that has been developed by Adam Dunkels at the Computer and
+Networks Architectures (CNA) lab at the Swedish Institute of Computer
+Science (SICS).
+
+The focus of the lwIP TCP/IP implementation is to reduce the RAM usage
+while still having a full scale TCP. This making lwIP suitable for use
+in embedded systems with tenths of kilobytes of free RAM and room for
+around 40 kilobytes of code ROM.
+
+FEATURES
+
+ * IP (Internet Protocol) including packet forwarding over multiple
+   network interfaces
+ * ICMP (Internet Control Message Protocol) for network maintenance
+   and debugging
+ * UDP (User Datagram Protocol) including experimental UDP-lite
+   extensions
+ * TCP (Transmission Control Protocol) with congestion control, RTT
+   estimation and fast recovery/fast retransmit
+ * Specialized API for enhanced performance
+ * Optional Berkeley socket API
+
+LICENSE
+
+lwIP is freely available under a BSD license.
+
+DEVELOPMENT
+
+lwIP has grown into an excellent TCP/IP stack for embedded devices,
+and developers using the stack often submit bug fixes, improvements,
+and additions to the stack to further increase its usefulness.
+
+Development of lwIP is hosted on Savannah, a central point for
+software development, maintenance and distribution. Everyone can
+help improve lwIP by use of Savannah's interface, CVS and the
+mailing list. A core team of developers will commit changes to the
+CVS source tree.
+
+The lwIP TCP/IP stack is maintained in the 'lwip' CVS module and
+contributions (such as platform ports) are in the 'contrib' module.
+
+The CVS main trunk is the stable branch, which contains bug fixes and
+tested features. The latest stable branch can be checked out by doing:
+  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
+  cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip co lwip
+
+The 'STABLE' tag in the stable branch will represent the most stable
+revision (which may be somewhat older to protect us from errors
+introduced by merges). This 'STABLE' tagged version can be checked out
+by doing:
+  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
+  cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip co -r STABLE lwip
+
+The 'DEVEL' branch is the active development branch, which contains
+bleeding edge changes, and may be instable. It can be checkout by doing:
+  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
+  cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip co -r DEVEL lwip
+
+The current contrib CVS tree can be checked out by doing:
+  cvs -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip login
+  cvs -z3 -d:pserver:anoncvs@subversions.gnu.org:/cvsroot/lwip co contrib
+
+Last night's CVS tar ball can be downloaded from:
+  http://savannah.gnu.org/cvs.backups/lwip.tar.gz
+
+The current CVS trees are web-browsable:
+  http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/lwip/
+  http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/contrib/
+
+Submit patches and bugs via the lwIP project page:
+  http://savannah.nongnu.org/projects/lwip/
+
+
+DOCUMENTATION
+
+The original out-dated homepage of lwIP and Adam Dunkels' papers on
+lwIP are at the official lwIP home page:
+  http://www.sics.se/~adam/lwip/
+
+Self documentation of the source code is regularly extracted from the
+current CVS sources and is available from this web page:
+  http://www.nongnu.org/lwip/
+
+Reading Adam's papers, the files in docs/, browsing the source code
+documentation and browsing the mailing list archives is a good way to
+become familiar with the design of lwIP.
+
+Adam Dunkels <adam@sics.se>
+Leon Woestenberg <leon.woestenberg@gmx.net>		    

doc/contrib.txt

@@ -0,0 +1,63 @@
+1 Introduction
+
+This document describes some guidelines for people participating
+in lwIP development.
+
+2 How to contribute to lwIP
+
+Here is a short list of suggestions to anybody working with lwIP and 
+trying to contribute bugreports, fixes, enhancements, platform ports etc.
+First of all as you may already know lwIP is a volunteer project so feedback
+to fixes or questions might often come late. Hopefully the bug and patch tracking 
+features of Savannah help us not lose users' input.
+
+2.1 Source code style:
+
+1. do not use tabs.
+2. identation is two spaces per level.
+3. end debug messages with a trailing newline (\n).
+4. one space between keyword and opening bracket.
+5. no space between function and opening bracket.
+6. one space and no newline before opening curly braces of a block.
+7. spaces surrounding assignment and comparisons.
+8. use current source code style as further reference.
+
+2.2 Source code documentation style:
+
+1. JavaDoc compliant and Doxygen compatible.
+2. Function documentation above functions in .c files, not .h files.
+   (This forces you to synchronize documentation and behaviour.)
+3. Use current documentation style as further reference.
+ 
+2.3 Bug reports and patches:
+
+1. Make sure you are reporting bugs or send patches against the latest
+   sources. (From the latest release and/or the current CVS sources.)
+2. If you think you found a bug make sure it's not already filed in the
+   bugtracker at Savannah.
+3. If you have a fix put the patch on Savannah. If it is a patch that affects
+   both core and arch specific stuff please separate them so that the core can
+   be applied separately while leaving the other patch 'open'. The prefered way
+   is to NOT touch archs you can't test and let maintainers take care of them.
+   This is a good way to see if they are used at all - the same goes for unix
+   netifs except tapif.
+4. Do not file a bug and post a fix to it to the patch area. Either a bug report
+   or a patch will be enough.
+   If you correct an existing bug then attach the patch to the bug rather than creating a new entry in the patch area.
+5. Trivial patches (compiler warning, indentation and spelling fixes or anything obvious which takes a line or two)
+   can go to the lwip-users list. This is still the fastest way of interaction and the list is not so crowded
+   as to allow for loss of fixes. Putting bugs on Savannah and subsequently closing them is too much an overhead
+   for reporting a compiler warning fix.
+6. Patches should be specific to a single change or to related changes.Do not mix bugfixes with spelling and other
+   trivial fixes unless the bugfix is trivial too.Do not reorganize code and rename identifiers in the same patch you
+   change behaviour if not necessary.A patch is easier to read and understand if it's to the point and short than
+   if it's not to the point and long :) so the chances for it to be applied are greater. 
+
+2.4 Platform porters:
+
+1. If you've ported lwIP to a platform (an OS, a uC/processor or a combination of these) and you think it
+   could benefit others[1] you might want to post an url to a tarball or zip from which it can be imported 
+   to the contrib CVS module. Then you get CVS access and have to maintain your port :)
+
+[1] - lwIP CVS should not be just a place to keep your port so you don't have to set up your own CVS :)
+Especially welcome are ports to common enough OS/hardware that others can have access too.

doc/rawapi.txt

@@ -2,8 +2,6 @@ Raw TCP/IP interface for lwIP 0.5
 
 Author: Adam Dunkels
 
-$Id: rawapi.txt,v 1.1 2002/10/19 12:59:32 likewise Exp $
-
 lwIP provides two Application Program's Interfaces (APIs) for programs
 to use for communication with the TCP/IP code: the sequential API
 (often just called "the API") and the raw TCP/IP interface. This
@@ -274,6 +272,11 @@ level of complexity of UDP, the interface is significantly simpler.
   Sets the remote end of the pcb. This function does not generate any
   network traffic, but only set the remote address of the pcb.
 
+- err_t udp_disconnect(struct udp_pcb *pcb)
+
+  Remove the remote end of the pcb. This function does not generate
+  any network traffic, but only removes the remote address of the pcb.
+
 - err_t udp_send(struct udp_pcb *pcb, struct pbuf *p)
 
   Sends the pbuf p. The pbuf is not deallocated.

doc/savannah.txt

@@ -0,0 +1,159 @@
+Daily Use Guide for using Savannah for lwIP
+
+Table of Contents:
+
+1 - Obtaining lwIP from the CVS repository
+2 - Committers/developers CVS access using SSH (to be written)
+3 - Merging from DEVEL branch to main trunk (stable branch)
+4 - How to release lwIP
+
+
+
+1 Obtaining lwIP from the CVS repository
+----------------------------------------
+
+To perform an anonymous CVS checkout of the main trunk (this is where
+bug fixes and incremental enhancements occur), do this:
+
+export CVS_RSH=ssh
+cvs -d:ext:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout lwip
+
+(If SSH asks about authenticity of the host, you can check the key
+ fingerprint against http://savannah.nongnu.org/cvs/?group=lwip)
+
+Or, obtain a stable branch (updated with bug fixes only) as follows:
+cvs -d:ext:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r STABLE-0_7 -d lwip-0.7 lwip
+
+Or, obtain a specific (fixed) release as follows:
+cvs -d:ext:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r STABLE-0_7_0 -d lwip-0.7.0 lwip
+
+Or, obtain a development branch (considered unstable!) as follows:
+cvs -d:ext:anoncvs@subversions.gnu.org:/cvsroot/lwip checkout -r DEVEL -d lwip-DEVEL lwip
+
+3 Committers/developers CVS access using SSH
+--------------------------------------------
+
+The Savannah server uses SSH (Secure Shell) protocol 2 authentication and encryption.
+As such, CVS commits to the server occur through a SSH tunnel for project members.
+To create a SSH2 key pair in UNIX-like environments, do this:
+
+ssh-keygen -t dsa
+
+Under Windows, a recommended SSH client is "PuTTY", freely available with good
+documentation and a graphic user interface. Use its key generator.
+
+Now paste the id_dsa.pub contents into your Savannah account public key list. Wait
+a while so that Savannah can update its configuration (This can take minutes).
+
+Try to login using SSH:
+
+ssh -v your_login@subversions.gnu.org
+
+If it tells you:
+
+Authenticating with public key "your_key_name"...
+Server refused to allocate pty
+
+then you could login; Savannah refuses to give you a shell - which is OK, as we
+are allowed to use SSH for CVS only. Now, you should be able to do this:
+
+export CVS_RSH=ssh
+cvs -d:ext:your_login@subversions.gnu.org:/cvsroot/lwip checkout lwip
+
+after which you can edit your local files with bug fixes or new features and
+commit them. Make sure you know what you are doing when using CVS to make
+changes on the repository. If in doubt, ask on the lwip-members mailing list.
+
+3 Merging from DEVEL branch to main trunk (stable)
+--------------------------------------------------
+
+Merging is a delicate process in CVS and requires the
+following disciplined steps in order to prevent conflicts
+in the future. Conflicts can be hard to solve!
+
+Merging from branch A to branch B requires that the A branch
+has a tag indicating the previous merger. This tag is called
+'merged_from_A_to_B'. After merging, the tag is moved in the
+A branch to remember this merger for future merge actions.
+
+IMPORTANT: AFTER COMMITTING A SUCCESFUL MERGE IN THE
+REPOSITORY, THE TAG MUST BE SET ON THE SOURCE BRANCH OF THE
+MERGE ACTION (REPLACING EXISTING TAGS WITH THE SAME NAME).
+
+Merge all changes in DEVEL since our last merge to main:
+
+In the working copy of the main trunk:
+cvs update -P -jmerged_from_DEVEL_to_main -jDEVEL 
+
+(This will apply the changes between 'merged_from_DEVEL_to_main'
+and 'DEVEL' to your work set of files)
+
+We can now commit the merge result.
+cvs commit -R -m "Merged from DEVEL to main." 
+
+If this worked out OK, we now move the tag in the DEVEL branch
+to this merge point, so we can use this point for future merges:
+
+cvs rtag -F -r DEVEL merged_from_DEVEL_to_main lwip 
+
+4 How to release lwIP
+---------------------
+
+First, checkout a clean copy of the branch to be released. Tag this set with
+tag name "STABLE-0_6_3". (I use release number 0.6.3 throughout this example).
+
+Login CVS using pserver authentication, then export a clean copy of the
+tagged tree. Export is similar to a checkout, except that the CVS metadata
+is not created locally. 
+
+export CVS_RSH=ssh
+cvs -d:ext:anoncvs@subversions.gnu.org:/cvsroot/lwip export -r STABLE-0_6_3 -d lwip-0.6.3 lwip
+
+Archive this directory using tar, gzip'd, bzip2'd and zip'd.
+
+tar czvf lwip-0.6.3.tar.gz lwip-0.6.3
+tar cjvf lwip-0.6.3.tar.bz2 lwip-0.6.3
+zip -r lwip-0.6.3.zip lwip-0.6.3
+
+First, make a local release directory to work in, I use "lwip-releases":
+
+mkdir lwip-releases
+cd lwip-releases
+
+Now, make a new release by creating a new directory for it (these are
+Savannah conventions so that it shows up in the Files list real nice):
+
+mkdir stable.pkg
+mkdir stable.pkg 0.6.3
+
+We can now copy the tar archive we made earlier into the release directory:
+
+cp ../../../lwip-0.6.3.tar.gz .
+
+Finally, synchronize this directory upwards to Savannah:
+
+rsync -n -e "ssh -1" -t -u -v -r *.pkg likewise@savannah.nongnu.org:/upload/lwip
+
+This does a "dry run": no files are modified! After you have confirmed that
+this is what you intended to do, remove "-n" and actually synchronize for
+real. The release should now be available here:
+
+http://savannah.nongnu.org/files/?group=lwip
+
+---
+Explanation of rsync options used:
+
+-t: preserve file timestamps
+-u: do not overwrite existing files, unless they are older
+-v: be verbose (long format file attributes)
+-r: recurse into directories
+-n: dry-run, do not modify anything. 
+---
+
+Additionally, you may post a news item on Savannah, like this:
+
+A new 0.6.3 release is now available here:
+http://savannah.nongnu.org/files/?group=lwip&highlight=0.6.3
+
+You will have to submit this via the user News interface, then approve
+this via the Administrator News interface.

doc/sys_arch.txt

@@ -1,9 +1,7 @@
-sys_arch interface for lwIP 0.5
+sys_arch interface for lwIP 0.6++
 
 Author: Adam Dunkels
 
-$Id: sys_arch.txt,v 1.1 2002/10/19 12:59:33 likewise Exp $
-
 The operating system emulation layer provides a common interface
 between the lwIP code and the underlying operating system kernel. The
 general idea is that porting lwIP to new architectures requires only
@@ -18,6 +16,11 @@ functionality. Previous versions of lwIP required the sys_arch to
 implement timer scheduling as well but as of lwIP 0.5 this is
 implemented in a higher layer.
 
+In addition to the source file providing the functionality of sys_arch,
+the OS emulation layer must provide several header files defining
+macros used throughout lwip.  The files required and the macros they
+must define are listed below the sys_arch description.
+
 Semaphores can be either counting or binary - lwIP works with both
 kinds. Mailboxes are used for message passing and can be implemented
 either as a queue which allows multiple messages to be posted to a
@@ -44,28 +47,24 @@ The following functions must be implemented by the sys_arch:
 
 - void sys_sem_free(sys_sem_t sem)
 
-  Deallocates a semaphore. 
+  Deallocates a semaphore.
 
 - void sys_sem_signal(sys_sem_t sem)
 
   Signals a semaphore.
 
-- u16_t sys_arch_sem_wait(sys_sem_t sem, u16_t timeout)
+- u32_t sys_arch_sem_wait(sys_sem_t sem, u32_t timeout)
 
   Blocks the thread while waiting for the semaphore to be
   signaled. If the "timeout" argument is non-zero, the thread should
   only be blocked for the specified time (measured in
   milliseconds).
 
-  If the timeout argument is non-zero, the return value is the amount
-  of time spent waiting for the semaphore to be signaled. If the
-  semaphore wasn't signaled within the specified time, the return
-  value is zero. If the thread didn't have to wait for the semaphore
-  (i.e., it was already signaled), care must be taken to ensure that
-  the function does not return a zero value since this is used to
-  indicate that a timeout occured. A suitable way to implement this is
-  to check if the time spent waiting is zero and if so, the value 1 is
-  returned.
+  If the timeout argument is non-zero, the return value is the number of
+  milliseconds spent waiting for the semaphore to be signaled. If the
+  semaphore wasn't signaled within the specified time, the return value is
+  SYS_ARCH_TIMEOUT. If the thread didn't have to wait for the semaphore
+  (i.e., it was already signaled), the function may return zero.
 
   Notice that lwIP implements a function with a similar name,
   sys_sem_wait(), that uses the sys_arch_sem_wait() function.
@@ -84,7 +83,7 @@ The following functions must be implemented by the sys_arch:
 
   Posts the "msg" to the mailbox.
 
-- u16_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u16_t timeout)
+- u32_t sys_arch_mbox_fetch(sys_mbox_t mbox, void **msg, u32_t timeout)
 
   Blocks the thread until a message arrives in the mailbox, but does
   not block the thread longer than "timeout" milliseconds (similar to
@@ -93,10 +92,9 @@ The following functions must be implemented by the sys_arch:
   ptr"). The "msg" parameter maybe NULL to indicate that the message
   should be dropped.
 
-  The return values are the same as for the sys_arch_sem_wait()
-  function and the function must not return zero even if a message was
-  present in the mailbox and the time spent waiting was zero
-  milliseconds. 
+  The return values are the same as for the sys_arch_sem_wait() function:
+  Number of milliseconds spent waiting or SYS_ARCH_TIMEOUT if there was a
+  timeout.
 
   Note that a function with a similar name, sys_mbox_fetch(), is
   implemented by lwIP. 
@@ -117,9 +115,74 @@ If threads are supported by the underlying operating system and if
 such functionality is needed in lwIP, the following function will have
 to be implemented as well:
 
-- void sys_thread_new(void (* thread)(void *arg), void *arg)
+- sys_thread_t sys_thread_new(void (* thread)(void *arg), void *arg, int prio)
 
-  Starts a new thread that will begin its execution in the function
-  "thread()". The "arg" argument will be passed as an argument to the
-  thread() function.
+  Starts a new thread with priority "prio" that will begin its execution in the
+  function "thread()". The "arg" argument will be passed as an argument to the
+  thread() function. The id of the new thread is returned. Both the id and
+  the priority are system dependent.
 
+- sys_prot_t sys_arch_protect(void)
+
+  This optional function does a "fast" critical region protection and returns
+  the previous protection level. This function is only called during very short
+  critical regions. An embedded system which supports ISR-based drivers might
+  want to implement this function by disabling interrupts. Task-based systems
+  might want to implement this by using a mutex or disabling tasking. This
+  function should support recursive calls from the same task or interrupt. In
+  other words, sys_arch_protect() could be called while already protected. In
+  that case the return value indicates that it is already protected.
+
+  sys_arch_protect() is only required if your port is supporting an operating
+  system.
+
+- void sys_arch_unprotect(sys_prot_t pval)
+
+  This optional function does a "fast" set of critical region protection to the
+  value specified by pval. See the documentation for sys_arch_protect() for
+  more information. This function is only required if your port is supporting
+  an operating system.
+
+-------------------------------------------------------------------------------
+Additional files required for the "OS support" emulation layer:
+-------------------------------------------------------------------------------
+
+cc.h       - Architecture environment, some compiler specific, some
+             environment specific (probably should move env stuff 
+             to sys_arch.h.)
+
+  Typedefs for the types used by lwip -
+    u8_t, s8_t, u16_t, s16_t, u32_t, s32_t, mem_ptr_t
+
+  Platform specific diagnostic output -
+    LWIP_PLATFORM_DIAG(x)    - non-fatal, print a message.
+    LWIP_PLATFORM_ASSERT(x)  - fatal, print message and abandon execution.
+
+  "lightweight" synchronization mechanisms -
+    SYS_ARCH_DECL_PROTECT(x) - declare a protection state variable.
+    SYS_ARCH_PROTECT(x)      - enter protection mode.
+    SYS_ARCH_UNPROTECT(x)    - leave protection mode.
+
+  If the compiler does not provide memset() this file must include a
+  definition of it, or include a file which defines it.
+
+  This file must either include a system-local <errno.h> which defines
+  the standard *nix error codes, or it should #define LWIP_PROVIDE_ERRNO
+  to make lwip/arch.h define the codes which are used throughout.
+
+
+perf.h     - Architecture specific performance measurement.
+  Measurement calls made throughout lwip, these can be defined to nothing.
+    PERF_START               - start measuring something.
+    PERF_STOP(x)             - stop measuring something, and record the result.
+
+sys_arch.h - Tied to sys_arch.c
+
+  Arch dependent types for the following objects:
+    sys_sem_t, sys_mbox_t, sys_thread_t,
+  And, optionally:
+    sys_prot_t
+
+  Defines to set vars of sys_mbox_t and sys_sem_t to NULL.
+    SYS_MBOX_NULL NULL
+    SYS_SEM_NULL NULL

proj/minimal/Makefile

@@ -1,94 +0,0 @@
-# Copyright (c) 2001, 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. Neither the name of the Institute nor the names of its contributors 
-#    may be used to endorse or promote products derived from this software 
-#    without specific prior written permission. 
-#
-# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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 <adam@sics.se>
-#
-# $Id: Makefile,v 1.1 2002/10/19 12:59:33 likewise Exp $
-
-CCDEP=gcc
-CC=gcc
-CFLAGS=-g -Wall -DIPv4 -Os -fpack-struct
-LWIPARCH=unix
-ARFLAGS=rs
-LWIPDIR=../../src
-
-CFLAGS:=$(CFLAGS) \
-	-I$(LWIPDIR)/include -I$(LWIPDIR)/arch/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
-	-Iapps -I.
-
-# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
-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/tcp.c $(LWIPDIR)/core/tcp_input.c \
-        $(LWIPDIR)/core/tcp_output.c $(LWIPDIR)/core/udp.c 
-CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \
-	$(LWIPDIR)/core/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c
-
-# NETIFFILES: Files implementing various generic network interface functions.'
-NETIFFILES=$(LWIPDIR)/netif/etharp.c mintapif.c
-
-# LWIPFILES: All the above.
-LWIPFILES=$(COREFILES) $(CORE4FILES) $(NETIFFILES)
-LWIPFILESW=$(wildcard $(LWIPFILES))
-LWIPOBJS=$(notdir $(LWIPFILESW:.c=.o))
-
-# APPFILES
-APPFILES=echo.c 
-
-LWIPLIB=liblwip4.a
-APPLIB=liblwipapps.a
-APPOBJS=$(notdir $(APPFILES:.c=.o))
-
-%.o:
-	$(CC) $(CFLAGS) -c $(<:.o=.c)
-
-all ipv4 compile: minimal
-.PHONY: all
-
-clean:
-	rm -f *.o $(LWIPLIB) $(APPLIB) minimal .depend* *.core core
-
-depend dep: .depend
-
-include .depend
-
-$(APPLIB): $(APPOBJS)
-	$(AR) $(ARFLAGS) $(APPLIB) $?
-
-$(LWIPLIB): $(LWIPOBJS)
-	$(AR) $(ARFLAGS) $(LWIPLIB) $?
-
-.depend: main.c $(LWIPFILES) $(APPFILES)
-	$(CCDEP) $(CFLAGS) -MM $^ > .depend || rm -f .depend
-
-minimal: .depend $(LWIPLIB) $(APPLIB) main.o $(APPFILES)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o minimal main.o $(APPLIB) $(LWIPLIB)
-
-

proj/minimal/README

@@ -1,3 +0,0 @@
-This is an example of a very minimal lwIP project. It runs in a single
-thread and runs a single example application - an echo server. The
-echo application is implemented using the raw API.

proj/minimal/echo.c

@@ -1,220 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-#include "lwip/stats.h"
-#include "lwip/tcp.h"
-
-struct echo_state {
-  struct pbuf *p;
-  u8_t failed;
-#define FAILED_MAX 8
-};
-/*-----------------------------------------------------------------------------------*/
-static void
-echo_err(void *arg, err_t err)
-{
-  struct echo_state *es = arg;
-
-  if(arg != NULL) {
-    pbuf_free(es->p);
-    mem_free(arg);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-close_conn(struct tcp_pcb *pcb, struct echo_state *es)
-{
-  tcp_arg(pcb, NULL);
-#if 0
-  tcp_sent(pcb, NULL);  
-  tcp_recv(pcb, NULL);
-#endif /* 0 */
-  if(es != NULL) {
-    pbuf_free(es->p);
-    mem_free(es);
-  }
-  tcp_close(pcb);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-send_buf(struct tcp_pcb *pcb, struct echo_state *es)
-{
-  struct pbuf *q;
-  
-  do {
-    q = es->p;
-    es->p = pbuf_dechain(q);
-    if(tcp_write(pcb, q->payload, q->len, 1) == ERR_MEM) {
-      pbuf_chain(q, es->p);
-      es->p = q;
-      return;
-    }
-    tcp_recved(pcb, q->len);
-    pbuf_free(q);
-  } while(es->p != NULL);   
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-echo_poll(void *arg, struct tcp_pcb *pcb)
-{
-  struct echo_state *es;
-
-  if(arg == NULL) {
-    return tcp_close(pcb);
-  }
-  
-  es = arg;
-
-  if(es->failed >= FAILED_MAX) {
-    close_conn(pcb, es);
-    tcp_abort(pcb);
-    return ERR_ABRT;
-  }
-  
-  if(es->p != NULL) {
-    ++es->failed;
-    send_buf(pcb, es);
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-echo_sent(void *arg, struct tcp_pcb *pcb, u16_t len)
-{
-  struct echo_state *es;
-  
-  es = arg;
-
-  if(es != NULL && es->p != NULL) {
-    send_buf(pcb, es);
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-echo_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
-{
-  struct echo_state *es;
-  
-  es = arg;
-
-  if(p == NULL) {
-    close_conn(pcb, es);
-    return ERR_OK;
-  }
-  
-  if(es->p != NULL) {
-    pbuf_chain(es->p, p);
-  } else {
-    es->p = p;
-  }
-
-  send_buf(pcb, es);
-  
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-echo_accept(void *arg, struct tcp_pcb *pcb, err_t err)
-{
-  struct echo_state *es;
-
-  tcp_setprio(pcb, TCP_PRIO_MIN);
-  
-  /* Allocate memory for the structure that holds the state of the
-     connection. */
-  es = mem_malloc(sizeof(struct echo_state));
-
-  if(es == NULL) {
-    return ERR_MEM;
-  }
-  
-  /* Initialize the structure. */
-  es->p = NULL;
-  es->failed = 0;
-
-  /* Tell TCP that this is the structure we wish to be passed for our
-     callbacks. */
-  tcp_arg(pcb, es);
-
-  /* Tell TCP that we wish to be informed of incoming data by a call
-     to the http_recv() function. */
-#if 0
-  tcp_recv(pcb, echo_recv);
-  
-  tcp_err(pcb, echo_err);
-#endif  /* 0 */
-  
-  tcp_poll(pcb, echo_poll, 2);
-
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-echo_init(void)
-{
-  struct tcp_pcb *pcb;
-
-  pcb = tcp_new();
-  tcp_bind(pcb, IP_ADDR_ANY, 7);
-  pcb = tcp_listen(pcb);
-#if 0
-  tcp_accept(pcb, echo_accept);
-#endif /* 0 */
-}
-/*-----------------------------------------------------------------------------------*/
-err_t
-lwip_tcp_event(void *arg, struct tcp_pcb *pcb,
-	       enum lwip_event ev, struct pbuf *p,
-	       u16_t size, err_t err)
-{
-  switch(ev) {
-  case LWIP_EVENT_ACCEPT:
-    return echo_accept(arg, pcb, err);
-  case LWIP_EVENT_SENT:
-    return echo_sent(arg, pcb, size);
-  case LWIP_EVENT_RECV:
-    return echo_recv(arg, pcb, p, err);
-  case LWIP_EVENT_ERR:
-    echo_err(arg, err);
-    break;
-  case LWIP_EVENT_POLL:
-    return echo_poll(arg, pcb);
-  default:
-    break;
-  }
-  
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-

proj/minimal/lwipopts.h

@@ -1,168 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
-
-#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                1000
-
-/* 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           8
-/* 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        8
-
-/* 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_APIMSG: the number of struct api_msg, used for
-   communication between the TCP/IP stack and the sequential
-   programs. */
-#define MEMP_NUM_API_MSG        0
-/* MEMP_NUM_TCPIPMSG: 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      0
-/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously 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          8
-
-/* 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
-
-/* ---------- 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 not parsed). If
-   defined to 0, all packets with IP options are dropped. */
-#define IP_OPTIONS              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
-
-/* ---------- UDP options ---------- */
-#define LWIP_UDP                0
-#define UDP_TTL                 255
-
-
-/* ---------- 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__ */

proj/minimal/main.c

@@ -1,101 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include "lwip/mem.h"
-#include "lwip/memp.h"
-#include "lwip/sys.h"
-
-#include "lwip/stats.h"
-
-#include "lwip/ip.h"
-#include "lwip/udp.h"
-#include "lwip/tcp.h"
-
-#include "mintapif.h"
-
-/*-----------------------------------------------------------------------------------*/
-int
-main(int argc, char **argv)
-{
-  struct ip_addr ipaddr, netmask, gw;
-  struct netif *netif;
-  
-#ifdef PERF
-  perf_init("/tmp/minimal.perf");
-#endif /* PERF */
-#ifdef STATS
-  stats_init();
-#endif /* STATS */
-
-  mem_init();
-  memp_init();
-  pbuf_init(); 
-  netif_init();
-  ip_init();
-  udp_init();
-  tcp_init();
-  printf("TCP/IP initialized.\n");
-  
-  IP4_ADDR(&gw, 192,168,0,1);
-  IP4_ADDR(&ipaddr, 192,168,0,2);
-  IP4_ADDR(&netmask, 255,255,255,0);
-
-  netif = netif_add(&ipaddr, &netmask, &gw, mintapif_init, ip_input);
-  
-  netif_set_default(netif);
-
-  echo_init();
-  
-  printf("Applications started.\n");
-    
-
-  while(1) {
-    
-    if(mintapif_wait(netif, 100) == MINTAPIF_TIMEOUT) {
-      tcp_tmr();
-    }
-    
-  }
-  
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-

proj/minimal/mintapif.c

@@ -1,354 +0,0 @@
-/*-----------------------------------------------------------------------------------*/
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-#ifdef linux
-#include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_tun.h>
-#define DEVTAP "/dev/net/tun"
-#else  /* linux */
-#define DEVTAP "/dev/tap0"
-#endif /* linux */
-
-#include "lwip/stats.h"
-#include "lwip/mem.h"
-#include "netif/etharp.h"
-
-#include "mintapif.h"
-
-/* Define those to better describe your network interface. */
-#define IFNAME0 'e'
-#define IFNAME1 't'
-
-struct mintapif {
-  struct eth_addr *ethaddr;
-  /* Add whatever per-interface state that is needed here. */
-  u32_t lasttime;
-  int fd;
-};
-
-static const struct eth_addr ethbroadcast = {{0xff,0xff,0xff,0xff,0xff,0xff}};
-
-/* Forward declarations. */
-static void  mintapif_input(struct netif *netif);
-static err_t mintapif_output(struct netif *netif, struct pbuf *p,
-			       struct ip_addr *ipaddr);
-
-/*-----------------------------------------------------------------------------------*/
-static void
-low_level_init(struct netif *netif)
-{
-  struct mintapif *mintapif;
-  char buf[1024];
-
-  mintapif = netif->state;
-  
-  /* Obtain MAC address from network interface. */
-  mintapif->ethaddr->addr[0] = 1;
-  mintapif->ethaddr->addr[1] = 2;
-  mintapif->ethaddr->addr[2] = 3;
-  mintapif->ethaddr->addr[3] = 4;
-  mintapif->ethaddr->addr[4] = 5;
-  mintapif->ethaddr->addr[5] = 6;
-
-  /* Do whatever else is needed to initialize interface. */  
-  
-  mintapif->fd = open(DEVTAP, O_RDWR);
-  if(mintapif->fd == -1) {
-    perror("tapif: tapif_init: open");
-    exit(1);
-  }
-
-#ifdef linux
-  {
-    struct ifreq ifr;
-    memset(&ifr, 0, sizeof(ifr));
-    ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
-    if (ioctl(mintapif->fd, TUNSETIFF, (void *) &ifr) < 0) {
-      perror(buf);
-      exit(1);
-    }
-  }
-#endif /* Linux */
-
-  snprintf(buf, sizeof(buf), "ifconfig tap0 inet %d.%d.%d.%d",
-           ip4_addr1(&(netif->gw)),
-           ip4_addr2(&(netif->gw)),
-           ip4_addr3(&(netif->gw)),
-           ip4_addr4(&(netif->gw)));
-  
-  system(buf);
-
-  mintapif->lasttime = 0;
-
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_output():
- *
- * Should do the actual transmission of the packet. The packet is
- * contained in the pbuf that is passed to the function. This pbuf
- * might be chained.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-
-static err_t
-low_level_output(struct netif *netif, struct pbuf *p)
-{
-  struct mintapif *mintapif;
-  struct pbuf *q;
-  char buf[1500];
-  char *bufptr;
-
-  mintapif = netif->state;
-  
-  /* initiate transfer(); */
-  
-  bufptr = &buf[0];
-  
-  for(q = p; q != NULL; q = q->next) {
-    /* Send the data from the pbuf to the interface, one pbuf at a
-       time. The size of the data in each pbuf is kept in the ->len
-       variable. */    
-    /* send data from(q->payload, q->len); */
-    bcopy(q->payload, bufptr, q->len);
-    bufptr += q->len;
-  }
-
-  /* signal that packet should be sent(); */
-  if(write(mintapif->fd, buf, p->tot_len) == -1) {
-    perror("tapif: write");
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_input():
- *
- * Should allocate a pbuf and transfer the bytes of the incoming
- * packet from the interface into the pbuf.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static struct pbuf *
-low_level_input(struct mintapif *mintapif)
-{
-  struct pbuf *p, *q;
-  u16_t len;
-  char buf[1500];
-  char *bufptr;
-
-  /* Obtain the size of the packet and put it into the "len"
-     variable. */
-  len = read(mintapif->fd, buf, sizeof(buf));
-
-  /*  if(((double)rand()/(double)RAND_MAX) < 0.1) {
-    printf("drop\n");
-    return NULL;
-    }*/
-
-  
-  /* We allocate a pbuf chain of pbufs from the pool. */
-  p = pbuf_alloc(PBUF_LINK, len, PBUF_POOL);
-  
-  if(p != NULL) {
-    /* We iterate over the pbuf chain until we have read the entire
-       packet into the pbuf. */
-    bufptr = &buf[0];
-    for(q = p; q != NULL; q = q->next) {
-      /* Read enough bytes to fill this pbuf in the chain. The
-         avaliable data in the pbuf is given by the q->len
-         variable. */
-      /* read data into(q->payload, q->len); */
-      bcopy(bufptr, q->payload, q->len);
-      bufptr += q->len;
-    }
-    /* acknowledge that packet has been read(); */
-  } else {
-    /* drop packet(); */
-    printf("Could not allocate pbufs\n");
-  }
-
-  return p;  
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * mintapif_output():
- *
- * This function is called by the TCP/IP stack when an IP packet
- * should be sent. It calls the function called low_level_output() to
- * do the actuall transmission of the packet.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static err_t
-mintapif_output(struct netif *netif, struct pbuf *p,
-		  struct ip_addr *ipaddr)
-{
-  p = etharp_output(netif, ipaddr, p);
-  if(p != NULL) {
-    return low_level_output(netif, p);
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * mintapif_input():
- *
- * This function should be called when a packet is ready to be read
- * from the interface. It uses the function low_level_input() that
- * should handle the actual reception of bytes from the network
- * interface.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static void
-mintapif_input(struct netif *netif)
-{
-  struct mintapif *mintapif;
-  struct eth_hdr *ethhdr;
-  struct pbuf *p, *q;
-
-
-  mintapif = netif->state;
-  
-  p = low_level_input(mintapif);
-
-  if(p != NULL) {
-
-#ifdef LINK_STATS
-    stats.link.recv++;
-#endif /* LINK_STATS */
-
-    ethhdr = p->payload;
-
-    q = NULL;
-    switch(htons(ethhdr->type)) {
-    case ETHTYPE_IP:
-      q = etharp_ip_input(netif, p);
-      pbuf_header(p, -14);
-      netif->input(p, netif);
-      break;
-    case ETHTYPE_ARP:
-      q = etharp_arp_input(netif, mintapif->ethaddr, p);
-      break;
-    default:
-      pbuf_free(p);
-      break;
-    }
-    if(q != NULL) {
-      low_level_output(netif, q);
-      pbuf_free(q);
-    }
-
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * mintapif_init():
- *
- * Should be called at the beginning of the program to set up the
- * network interface. It calls the function low_level_init() to do the
- * actual setup of the hardware.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-void
-mintapif_init(struct netif *netif)
-{
-  struct mintapif *mintapif;
-    
-  mintapif = mem_malloc(sizeof(struct mintapif));
-  netif->state = mintapif;
-  netif->name[0] = IFNAME0;
-  netif->name[1] = IFNAME1;
-  netif->output = mintapif_output;
-  netif->linkoutput = low_level_output;
-  
-  mintapif->ethaddr = (struct eth_addr *)&(netif->hwaddr[0]);
-  
-  low_level_init(netif);
-}
-/*-----------------------------------------------------------------------------------*/
-enum mintapif_signal
-mintapif_wait(struct netif *netif, u16_t time)
-{
-  fd_set fdset;
-  struct timeval tv, now;
-  struct timezone tz;
-  int ret;
-  struct mintapif *mintapif;
-
-  mintapif = netif->state;
-
-  while(1) {
-  
-    if(mintapif->lasttime >= (u32_t)time * 1000) {
-      mintapif->lasttime = 0;
-      return MINTAPIF_TIMEOUT;
-    }
-    
-    tv.tv_sec = 0;
-    tv.tv_usec = (u32_t)time * 1000 - mintapif->lasttime;
-    
-    
-    FD_ZERO(&fdset);
-    FD_SET(mintapif->fd, &fdset);
-    
-    gettimeofday(&now, &tz);
-    ret = select(mintapif->fd + 1, &fdset, NULL, NULL, &tv);
-    if(ret == 0) {
-      mintapif->lasttime = 0;    
-      return MINTAPIF_TIMEOUT;
-    } 
-    gettimeofday(&tv, &tz);
-    mintapif->lasttime += (tv.tv_sec - now.tv_sec) * 1000000 + (tv.tv_usec - now.tv_usec);
-
-    mintapif_input(netif);
-  }
-  
-  return MINTAPIF_PACKET;
-}

proj/minimal/mintapif.h

@@ -1,45 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __MINTAPIF_H__
-#define __MINTAPIF_H__
-
-#include "lwip/netif.h"
-
-enum mintapif_signal {
-  MINTAPIF_TIMEOUT,
-  MINTAPIF_PACKET
-};
-
-void mintapif_init(struct netif *netif);
-enum mintapif_signal mintapif_wait(struct netif *netif, u16_t time);
-
-#endif /* __MINTAPIF_H__ */

proj/unixsim/Makefile

@@ -1,111 +0,0 @@
-# Copyright (c) 2001, 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. Neither the name of the Institute nor the names of its contributors 
-#    may be used to endorse or promote products derived from this software 
-#    without specific prior written permission. 
-#
-# THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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 <adam@sics.se>
-#
-# $Id: Makefile,v 1.1 2002/10/19 12:59:37 likewise Exp $
-
-CCDEP=gcc
-CC=gcc
-CFLAGS=-g -Wall -DIPv4 -DLWIP_DEBUG -pedantic
-LDFLAGS=-lpcap
-LWIPARCH=unix
-ARFLAGS=rs
-LWIPDIR=../../src
-
-CFLAGS:=$(CFLAGS) \
-	-I$(LWIPDIR)/include -I$(LWIPDIR)/arch/$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
-	-Iapps -I.
-
-# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
-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/tcp.c $(LWIPDIR)/core/tcp_input.c \
-        $(LWIPDIR)/core/tcp_output.c $(LWIPDIR)/core/udp.c 
-CORE4FILES=$(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/ip.c \
-	$(LWIPDIR)/core/inet.c $(LWIPDIR)/core/ipv4/ip_addr.c
-
-
-# APIFILES: The files which implement the sequential and socket APIs.
-APIFILES=$(LWIPDIR)/api/api_lib.c $(LWIPDIR)/api/api_msg.c $(LWIPDIR)/api/tcpip.c \
-	$(LWIPDIR)/api/err.c $(LWIPDIR)/api/sockets.c 
-
-# NETIFFILES: Files implementing various generic network interface functions.'
-NETIFFILES=$(LWIPDIR)/netif/loopif.c \
-	$(LWIPDIR)/netif/tcpdump.c $(LWIPDIR)/netif/etharp.c
-
-# ARCHFILES: Archiecture specific files.
-ARCHFILES=$(wildcard $(LWIPDIR)/arch/$(LWIPARCH)/*.c $(LWIPDIR)/arch/$(LWIPARCH)/netif/*.c)
-
-# APPFILES: Applications.
-APPFILES=apps/fs.c apps/httpd.c \
-	apps/udpecho.c apps/tcpecho.c \
-	apps/shell.c 
-
-# LWIPFILES: All the above.
-LWIPFILES=$(COREFILES) $(CORE4FILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
-LWIPFILESW=$(wildcard $(LWIPFILES))
-LWIPOBJS=$(notdir $(LWIPFILESW:.c=.o))
-
-LWIPLIB=liblwip4.a
-APPLIB=liblwipapps.a
-APPOBJS=$(notdir $(APPFILES:.c=.o))
-
-%.o:
-	$(CC) $(CFLAGS) -c $(<:.o=.c)
-
-all ipv4 compile: simhost simnode simrouter
-.PHONY: all
-
-clean:
-	rm -f *.o $(LWIPLIB) $(APPLIB) simhost simnode simrouter *.s .depend* *.core core
-
-depend dep: .depend
-
-include .depend
-
-$(APPLIB): $(APPOBJS)
-	$(AR) $(ARFLAGS) $(APPLIB) $?
-
-$(LWIPLIB): $(LWIPOBJS)
-	$(AR) $(ARFLAGS) $(LWIPLIB) $?
-
-.depend: simhost.c simnode.c simrouter.c $(LWIPFILES) $(APPFILES)
-	$(CCDEP) $(CFLAGS) -MM $^ > .depend || rm -f .depend
-
-simhost: .depend $(LWIPLIB) $(APPLIB) simhost.o $(APPFILES)
-	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -o simhost simhost.o $(APPLIB) $(LWIPLIB)
-
-simrouter: .depend $(LWIPLIB) $(APPLIB) simrouter.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -o simrouter simrouter.o $(APPLIB) $(LWIPLIB) 
-
-simnode: .depend $(LWIPLIB) $(APPLIB) simnode.o 
-	$(CC) $(CFLAGS) $(LDFLAGS) -pthread -o simnode simnode.o $(APPLIB) $(LWIPLIB)
-

proj/unixsim/README

@@ -1,47 +0,0 @@
-This directory contains an example of how a project using lwIP might
-look. It is also the development platform of lwIP, since it can be run
-as a user process under FreeBSD or Linux. There are also a number of
-example applications (including a simple web server) in the apps/
-directory.
-
-Some short instructions on how to build and run lwIP on a FreeBSD or
-Linux host. For FreeBSD, the tap interface must be enabled in the
-kernel configuration and the kernel must be recompiled. The tap
-interface is enabled by adding the line "pseudo-device tap" in the
-kernel configuration. See Chapter 9 in the FreeBSD handbook for
-instructions on how to build a custom FreeBSD kernel.
-
-* Compile the code. This must be done by using GNU Make. Under
-  FreeBSD, GNU Make can be found in the ports collection under
-  /usr/ports/devel/gmake (type "make install distclean" to
-  install). Under Linux, GNU Make is the default "make".
-
-  > gmake         (FreeBSD)
-
-  > make          (Linux)
-
-* The compilation process produces the executable file "simhost". To
-  run this, you have to be root.
-
-  > su            (Type password for the root account)
-  # ./simhost
-
-* The lwIP TCP/IP stack is now running with IP address
-  192.168.0.2. Some things that you can try:
-
-  To see the packets that are going to and from the lwIP stack, run
-  tcpdump:
-
-  # tcpdump -l -n -i tap0
-
-  You can ping lwIP:
-
-  > ping 192.168.0.2
-
-  For a telnet shell, run:
-
-  > telnet 192.168.0.2
-  
-  Finally, "simhost" also includes a simple web server; the URL is
-  of course http://192.168.0.2/.
-

proj/unixsim/apps/fs.c

@@ -1,55 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#include "lwip/def.h"
-#include "fs.h"
-#include "fsdata.h"
-#include "fsdata.c"
-
-/*-----------------------------------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------------------------------*/
-int
-fs_open(char *name, struct fs_file *file)
-{
-  struct fsdata_file_noconst *f;
-
-  for(f = (struct fsdata_file_noconst *)FS_ROOT; f != NULL; f = (struct fsdata_file_noconst *)f->next) {
-    if(!strcmp(name, f->name)) {
-      file->data = f->data;
-      file->len = f->len;
-      return 1;
-    }
-  }
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/

proj/unixsim/apps/fs.h

@@ -1,44 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __FS_H__
-#define __FS_H__
-
-struct fs_file {
-  char *data;
-  int len;
-};
-
-/* file must be allocated by caller and will be filled in
-   by the function. */
-int fs_open(char *name, struct fs_file *file);
-
-#endif /* __FS_H__ */

proj/unixsim/apps/fs/documentation.html

@@ -1,191 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - Documentation</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-[Documentation]
-
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>Documentation</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-<ul>
-<li><a href="os.html">Using lwIP with and without an operating
-system</a>.
-<br><br>
-
-<li>The lwIP source archive contains documentation on how to port lwIP
-and how to write applications using the native API. They can also be
-found here: <a href="doc/sys_arch.txt">sys_arch.txt</a>, <a
-href="doc/rawapi.txt">rawapi.txt</a>. 
-<br><br>
-
-<li>Selected messages from the mailinglist: <a
-href="maillist/msg00231.html">lwIP memory buffers and allocators</a>,
-<a href="maillist/msg00227.html">Threads, semaphores and raw interface 
-question</a>, <a href="maillist/msg00242.html">Threads, semaphores and
-raw interface question [2]</a>. <a href="maillist/msg00460.html">Some notes on using lwIP with the development enviroment ADS
-1.1 from ARM.</a>
-<br><br>
-
-<li>A report describing the design and implementation of an old
-version of lwIP. The algorithms and data structures used both in the
-protocol implementations and in the sub systems such as the memory and
-buffer management systems are described. Also included in this report
-is a reference manual for the lwIP sequential API and some code
-examples of using lwIP. <a href="doc/lwip.pdf">PDF</a>, <a
-href="doc/lwip.ps.gz">.ps.gz</a>.
-
-<br><br>
-
-<li>Slides from a presentation that talks a bit about lwIP: <a
-href="doc/pres.pdf">PDF</a> (86k), <a href="doc/pres.ps.gz">.ps.gz</a>
-(36k). 
-</ul>
-
-<p align="justify">
-For more documentation regarding lwIP and a proxy architecture to
-support TCP/IP communication for small clients, look in <a
-href="/~adam/publications.html">Adam Dunkels' masters thesis</a>. 
-</p>
-
-
-<p align="justify">
-The <a href="mailinglist.html">lwIP mailing list</a> can be used to
-discuss lwIP.
-</p>
-
-<p align="justify">
-For questions or suggestions, please contact the author at <a
-href="mailto:Adam Dunkels <adam@sics.se>">Adam Dunkels
-&lt;adam@sics.se&gt;</a>.  
-</p>
-
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:01 $
-</i></font>
-</p>        
-        
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-[Documentation]
-
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fs/download.html

@@ -1,232 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - Download</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-[Download]
-
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>Download</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-
-<p align="justify">        
-lwIP is avaliable for download provided that you read and accept <a
-href="licence.html">this</a> BSD-style license.
-</p>
-
-<h3>Release versions</h3>
-<p align="justify">
-The latest version is 0.5.3. (Older versions are also provided for an
-unknown reason.)
-</p>
-<ul>
-<li>Version 0.5.3 (latest): <a
-href="download/?f=lwip-0.5.3.tar.gz">lwip-0.5.3.tar.gz</a> 
-<br><br>
-
-<li>
-<font size="-2">
-Obsolete versions: <a
-href="download/?f=lwip-0.5.2.tar.gz">lwip-0.5.2.tar.gz</a>
-<a
-href="download/?f=lwip-0.5.1.tar.gz">lwip-0.5.1.tar.gz</a>
-<a
-href="download/?f=lwip-0.5.0.tar.gz">lwip-0.5.0.tar.gz</a>
-<a
-href="download/?f=lwip-0.4.2.tar.gz">lwip-0.4.2.tar.gz</a>
-<a
-href="download/?f=lwip-0.4.1.tar.gz">lwip-0.4.1.tar.gz</a> 
-<a
-href="download/?f=lwip-0.4.tar.gz">lwip-0.4.tar.gz</a> 
-<a
-href="download/?f=lwip-0.3.1.tar.gz">lwip-0.3.1.tar.gz</a> 
-<a
-href="download/?f=lwip-0.3.tar.gz">lwip-0.3.tar.gz</a> 
-<a
-href="download/?f=lwip-0.2.tar.gz">lwip-0.2.tar.gz</a>
-</font>
-<br>
-</ul>
-
-<h3>Development version</h3>
-<p align="justify">
-The latest development code from the CVS is also avaliable <a
-href="download/?f=lwip-cvs.tar.gz">here</a>. Note that this code may
-very well be unstable and might not even compile.
-</p>
-
-<h3>Source code online</h3>
-<p align="justify">
-Joe MacDonald has put an HTML version of the latest lwIP source code
-online at <a
-href="http://www.deserted.net/lwIP/">http://www.deserted.net/lwIP/</a>. 
-</p>
-
-<h3>Ports</h3>
-<p align="justify">
-Florian Shulze has ported lwIP to DJGPP/MS-DOS and to Visual C++
-6.0/Win32. They can be downloaded <a
-href="http://homepages.fh-giessen.de/~hg10836/dev/djgpp/lwipdjgpptest-0.1.zip">here</a>
-(DJGPP/MS-DOS) and <a
-href="http://homepages.fh-giessen.de/~hg10836/crowproductions/dev/lwip-win32-msvc-0.1.zip">here</a>
-(Visual C++ 6.0/Win32).
-</p>
-
-<h3>Add-ons/drivers/applications</h3>
-
-<h4>DHCP client</h4>
-<p align="justify">
-Leon Woestenberg from Axon Digital Design B.V. has written a CS8900a
-network interface driver and is currently developing a DHCP client for
-lwIP. They can both be found <a
-href="http://www.esrac.ele.tue.nl/~leon/lwip/">here</a>. The plan is
-to eventually integrate Leon's DHCP client in the main lwIP 
-distribution.
-</p>
-
-<h4>IGMPv2 implementation</h4>
-<p align="justify">
-Steve Reynolds of Citel Technologies Ltd. has donated his IGMPv2
-implementation for lwIP to the community. It is avaliable for download
-<a href="download/igmpfiles.zip">here</a> (note that the copyright and
-license differs slightly from lwIP - read the license in the igmp.c
-file). The plan is to integrate his code into the main lwIP
-distribution.
-</p>
-
-<h4>Alternative BSD socket layer</h4>
-<p align="justify">
-Paul Sheer has incorporated lwIP into his PaulOS system and has
-written an alternative BSD socket layer. It is avaliable for download
-<a href="download/bsdsocket.c">here</a>. It is copyright Paul Sheer
-and licensed under the <a
-href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. 
-</p>
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:06 $
-</i></font>
-</p>
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-[Download]
-
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fs/licence.html

@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - lwIP source code licence</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>lwIP source code licence</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-Copyright (c) 2001, Swedish Institute of Computer Science.
-All rights reserved.<br>
-<br>
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:<br>
-<ol>
-<li> Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.<br> 
-<br>
-<li> 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.<br> 
-<br>
-<li> Neither the name of the Institute nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission. <br> 
-</ol>
-<br>
-THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS `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 INSTITUTE OR CONTRIBUTORS 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. <br>
-
-
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:01 $
-</i></font>
-</p>
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fs/links.html

@@ -1,266 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - Links</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-[Links]
-
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>Links</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-lwIP pages:
-<ul>
-<li><a href="http://www.esrac.ele.tue.nl/~leon/lwip/">Leon Woestenberg's lwIP page</a>
-</ul>
-
-Companies using lwIP in their products:
-<ul>
-<li>UK based <a href="http://www.tangentdevices.co.uk/">Tangent Devices Ltd</a> are incorporating lwIP in their film
-and video post-production equipment.
-<li><a href="http://www.axon.tv">Axon Digital Design BV</a> in The
-Netherlands is merging lwIP with their current IP stack for use in the
-Synapse modular broadcasting system.
-</ul>
-
-Projects using lwIP:
-<ul>
-<li><a href="http://www.cdt.luth.se/projects/arena/">The ARENA Project</a> - Hockey players equipped with pulse and breathing sensors running lwIP.<br> 
-<li><a href="http://bart.sm.luth.se/eis2001/">The Embedded Internet Systems 2001 Student Project</a> - Flow meter and belt tension sensors
-running lwIP.<br>
-<li><a href="http://dcdev.allusion.net/">KOS</a> - The KOS operating system for
-Sega Dreamcast uses lwIP.<br>
-</ul>
-
-Other small TCP/IP implementations:
-<ul>
-<li><a href="http://dunkels.com/adam/uip/">uIP</a> - A very small TCP/IP 
-implementation, suitable for systems with hundreds of bytes free RAM
-and a few kilobytes of free code space.<br>
-<li><a href="http://ucip.sourceforge.net/">uC/IP</a> - uC/IP is a BSD-based
-TCP/IP protocol stack for microcontrollers.<br>
-<li><a href="http://liquorice.sourceforge.net">Liquorice</a> - Liquorice
-includes a TCP/IP stack.<br>
-<li><a href="http://www.nenie.org/cpcip/">CPC/IP</a> - A TCP/IP stack for
-Amstrad CPCs.<br>
-<li><a href="http://lng.sourceforge.net/">LUnix</a> - LUnix contains a small
-TCP/IP stack.<br>
-<li><a href="http://www.sweetcherrie.com/jolz64/jos/">JOS</a> - JOS includes a
-TCP/IP implementation.<br>
-<li><a href="http://www.csonline.net/bpaddock/tinytcp/default.htm">TinyTCP</a> - A very slim
-TCP, IP, and FTP implementation.<br>
-<li><a href="http://kyllikki.fluff.org/hardware/wwwpic2/">WWWpic2</a> - Small
-HTTP/TCP/IP implementation for a PIC.<br>
-<li><a href="http://www.rmbeales.fsnet.co.uk/files/html/picserver/picservd.htm">PIC Web Server</a> - Small HTTP/TCP/IP/SLIP PIC implementation.<br>
-</ul>
-
-Very small web servers:
-<ul>
-<li><a href="http://world.std.com/~fwhite/ace/">webACE</a> - World's Smallest
-Web Server.<br>
-<li><a href="http://www-ccs.cs.umass.edu/~shri/iPic.html">iPIC</a> - A Match
-Head Sized Web Server.<br>
-</ul>
-
-Related RFCs:
-<ul>
-<li>J. Postel, <a
-href="ftp://ftp.ietf.org/rfc/rfc791.txt">Internet Protocol</a>, RFC791, September 1981.
-<li>J. Postel, <a
-href="ftp://ftp.ietf.org/rfc/rfc792.txt">Internet Control Message Protocol</a>, RFC792, September 1981.
-<li>J. Postel, <a
-href="ftp://ftp.ietf.org/rfc/rfc768.txt">User Datagram Protocol</a>, RFC768, August 1980.
-<li>J. Postel, <a
-href="ftp://ftp.ietf.org/rfc/rfc793.txt">Transmission Control Protocol</a>, RFC793, September 1981.
-<li>D. D. Clark, <a
-href="ftp://ftp.ietf.org/rfc/rfc813.txt">Window and Acknowledgement Strategy in TCP</a>, RFC813, July 1982.
-<li>D. D. Clark, <a
-href="ftp://ftp.ietf.org/rfc/rfc817.txt">Modularity and Efficiency in Protocol Implementation</a>, RFC817, July 1982.
-<li>R. Braden, <a
-href="ftp://ftp.ietf.org/rfc/rfc1122.txt">Requirements for Internet Hosts -- Communication Layers</a>, RFC1122, October 1989.
-<li>T. Mallory and A. Kullberg, <a
-href="ftp://ftp.ietf.org/rfc/rfc1141.txt">Incremental Updating of the Internet Checksum</a>, RFC1141, January 1990.
-<li>A. Rijsinghani, <a
-href="ftp://ftp.ietf.org/rfc/rfc1624.txt">Computation of the Internet Checksum via Incremental Update</a>, RFC1624, May 1994.
-<li>R. Braden, <a
-href="ftp://ftp.ietf.org/rfc/rfc1337.txt">TIME-WAIT Assasination Hazards in TCP</a>, RFC1337, May 1992.
-<li>B. Carpenter, <a
-href="ftp://ftp.ietf.org/rfc/rfc1958.txt">Architectural Principles of the Internet</a>, RFC1958, June 1996.
-<li>M. Allman, V. Paxson and W. Stevens, <a
-href="ftp://ftp.ietf.org/rfc/rfc2581.txt">TCP Congestion Control</a>, RFC2581, April 1999.
-<li>S. Parker and C. Schmechel, <a
-href="ftp://ftp.ietf.org/rfc/rfc2398.txt">Some Testing Tools for TCP Implementors</a>, RFC2398, August 1998.
-</ul>
-
-Related publications:
-<ul>
-<li>V. Jacobson. Congestion avoidance and control. In <i>Proceedings of
-the SIGCOMM '88 Conference</i>, Stanford, California, August 1988.
-<li>V. Jacobson. 4.3BSD TCP header prediction. <i>ACM Computer
-Communications Review</i>, 20(2), April 1990.
-<li>P. Karn and C. Partridge. Improving round-trip time estimates
-in reliablie transport protocols. In <i>Proceedings of the SIGCOMM '87
-Conference</i>, Stowe, Vermont, August 1987.
-<li>J. Kay and J. Pasquale. Profiling and Reducing Processing
-Overheads in TCP/IP. <i>IEEE/ACM Transactions of Networking</i>, 4(6), December 1996.
-<li>L. Larzon, M. Degermark, and S. Pink. UDP Lite for
-real-time multimedia applications. In <i>Proceedings of the IEEE
-International Conference of Communications</i>, Vancouver, British
-Columbia, Canada, June 1999.
-<li>P. E. McKenney and K. F. Dove. Efcient demultiplexing of
-incoming TCP packets. In <i>Proceedings of the SIGCOMM '92 Conference</i>, Baltimore, Maryland, August 1992.
-<li>C. Partridge and S. Pink. A faster UDP. <i>IEEE/ACM Transactions
-in Networking</i>, 1(4), August 1993.
-</ul>
-
-
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:02 $
-</i></font>
-</p>        
-        
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-[Links]
-
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fs/mailinglist.html

@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - Mailing list</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-[Mailing list]
-
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>Mailing list</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-
-<p align="justify">
-The lwIP mailing list is the place to discuss lwIP. All topics related
-to lwIP, such as porting or using lwIP, writing device drivers or
-application programs for lwIP can be discussed here.
-</p>
-
-<h3>Archives</h3>
-<p align="justify">
-Archives can be found <a href="maillist/">here</a>.
-</p>
-
-<h3>Subscribe</h3>
-<p align="justify">
-To subscribe, send a mail to <a
-href="mailto:majordomo@sics.se">majordomo@sics.se</a> with the message
-<pre>
-subscribe lwip
-
-</pre>
-in the message body. The subject should be kept blank.
-</p>
-<p align="justify">
-In a few minutes, you should receive a welcome message and some
-information regarding the subscription, including instructions for
-unsubscribing. Save those messages for future reference. 
-</p>
-
-<p align="justify">
-You are now an lwIP mailing list subscriber!
-</p>
-
-<h3>Post</h3>
-<p align="justify">
-Posting to the lwIP mailing list is a simple as sending a mail to the
-address <a href="mailto:lwip@sics.se">lwip@sics.se</a>.
-</p>
-
-<h3>Unsubscribe</h3>
-<p align="justify">
-To subscribe, send a mail to <a
-href="mailto:majordomo@sics.se">majordomo@sics.se</a> with the message
-<pre>
-unsubscribe lwip
-
-</pre>
-in the message body. The subject should be kept blank.
-</p>
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:02 $
-</i></font>
-</p>        
-        
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-[Mailing list]
-
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fs/os.html

@@ -1,225 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-<html>
-<head><title>lwIP - A Lightweight TCP/IP Stack - OS vs non-OS</title></head>
-
-
-<body bgcolor="white">
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td>
-<center><h1>lwIP - A Lightweight TCP/IP Stack</h1></center>
-</td></tr></table>
-
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-</td></tr>
-<tr>
-<td><center><h2>OS vs non-OS</h2></center>
-</td></tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0"><tr>
-<td width="50">
-&nbsp;
-</td>
-<td bgcolor="white" width="540">
-
-<h2>Using lwIP with or without an operating system</h2>
-
-<p align="justify">
-There has been a few questions about how lwIP can be used in a
-standalone environment (i.e., an environment without a multi-threaded
-operating system) lately. The purpose of this document is to describe
-how lwIP is designed to be used with and without a multi-threaded
-operating system.
-</p>
-
-<center><img src="os.png"></center>
-
-<h3>The lwIP single-threaded core</h3>
-<p align="justify">
-The core of lwIP consists of the actual implementations of the IP,
-ICMP, UDP, and TCP protocols, as well as the support functions such as
-buffer and memory management. The core components are the only ones
-that are needed when lwIP is to be run in a single-threaded (non-OS)
-environment. 
-</p>
-<p align="justify">
-The core components can be viewed as a software library which has the
-following interface:
-</p>
-<ul>
-<li><tt>ip_input(pbuf, netif)</tt>: Takes an IP packet and the incoming network
-interface as arguments and does the TCP/IP processing for the packet.
-<li><tt>tcp_tmr()</tt>: Should be called every 100 ms. Does all TCP
-timer processing such as doing retransmissions.
-</ul>
-<p align="justify">
-Because none of the core functions ever needs to block when run in a
-single-threaded environment, the <tt>sys_arch</tt> (the operating
-system abstraction layer) does not need to implement locking
-semaphores or mailboxes. In future versions of lwIP, the dependancy of
-the <tt>sys_arch</tt> will be removed in the single-threaded case.
-</p>
-<p align="justify">
-A simple main loop for a single-threaded system might look
-like this:
-</p>
-<pre>
-  while(1) {
-    if(poll_driver(netif) == PACKET_READY) {
-      pbuf = get_packet(netif);
-      ip_input(pbuf, netif);
-    }
-
-    if(clock() - last_time == 100 * CLOCK_MS) {
-      tcp_tmr();
-      last_time = clock();
-    }    
-  }
-</pre>
-
-<h3>lwIP in a multi-threaded system</h3>
-<p align="justify">
-lwIP is designed to be able to be run in a multi-threaded system with
-applications running in concurrent threads. The model used in this
-case is that all TCP/IP processing is done in a single thread. The
-application thread communicate with the TCP/IP thread using the
-sequential API.
-</p>
-
-<center><img src="threads.png"></center>
-
-<p align="justify">
-The inter-thread communication is implemented in the two files
-<tt>api_lib.c</tt> and <tt>api_msg.c</tt>. The former contains the
-functions used by the application programs and the latter implements
-the TCP/IP stack interface. A third file, <tt>tcpip.c</tt>, handles
-incoming packets and timer events as described in the previous
-section. 
-</p>
-
-<p align="justify">
-When run in a multi-threaded environment, incoming packets are handled
-by the function <tt>tcpip_input()</tt>, which takes the same arguments
-as the <tt>ip_input()</tt> function. The difference between the two
-functions is that the <tt>tcpip_input()</tt> function does not process
-the incoming packet immediately. It merely puts the packet on a queue
-which later is drained by the TCP/IP thread.
-</p>
-
-<p align="justify">
-When being run in a multi-threaded system, timer events are taken care
-of internally in <tt>tcpip.c</tt>.
-</p>
-
-<p align="right">        
-<font size="-1"><i>
-$Date: 2002/10/19 13:00:03 $
-</i></font>
-</p>        
-        
-
-</td>
-<td width="50">
-&nbsp;
-</td>
-</tr></table>
-
-<table width="640" border="0" cellpadding="0"
-cellspacing="0">
-<tr><td align="center">
-
-<hr>
-
-
-
-
-<a href="index.html">Introduction</a>
-
-|
-
-<a href="news.html">News</a>
-
-|
-
-<a href="documentation.html">Documentation</a>
-
-|
-
-<a href="mailinglist.html">Mailing list</a>
-
-|
-
-<a href="changelog.html">Changelog</a>
-
-|
-
-<a href="download.html">Download</a>
-
-|
-
-<a href="links.html">Links</a>
-
-
-
-<hr>
-
-</td></tr><tr>
-<td>
-<div align="right">
-<a href="http://www.sics.se/~adam/">Adam Dunkels</a></div>
-</td>
-</tr>
-</table>
-
-</body>
-</html>

proj/unixsim/apps/fsdata.h

@@ -1,49 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __FSDATA_H__
-#define __FSDATA_H__
-
-struct fsdata_file {
-  const struct fsdata_file *next;
-  const char *name;
-  const char *data;
-  const int len;
-};
-
-struct fsdata_file_noconst {
-  struct fsdata_file *next;
-  char *name;
-  char *data;
-  int len;
-};
-
-#endif /* __FSDATA_H__ */

proj/unixsim/apps/httpd.c

@@ -1,244 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include "lwip/stats.h"
-
-#include "httpd.h"
-
-#include "lwip/tcp.h"
-
-#include "fs.h"
-
-struct http_state {
-  char *file;
-  u32_t left;
-  u8_t retries;
-};
-
-/*-----------------------------------------------------------------------------------*/
-static void
-conn_err(void *arg, err_t err)
-{
-  struct http_state *hs;
-
-  hs = arg;
-  mem_free(hs);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-close_conn(struct tcp_pcb *pcb, struct http_state *hs)
-{
-  tcp_arg(pcb, NULL);
-  tcp_sent(pcb, NULL);
-  tcp_recv(pcb, NULL);
-  mem_free(hs);
-  tcp_close(pcb);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-send_data(struct tcp_pcb *pcb, struct http_state *hs)
-{
-  err_t err;
-  u16_t len;
-
-  /* We cannot send more data than space avaliable in the send
-     buffer. */     
-  if(tcp_sndbuf(pcb) < hs->left) {
-    len = tcp_sndbuf(pcb);
-  } else {
-    len = hs->left;
-  }
-
-  do {
-    err = tcp_write(pcb, hs->file, len, 0);
-    if(err == ERR_MEM) {
-      len /= 2;
-    }
-  } while(err == ERR_MEM && len > 1);  
-  
-  if(err == ERR_OK) {
-    hs->file += len;
-    hs->left -= len;
-    /*  } else {
-	printf("send_data: error %s len %d %d\n", lwip_strerr(err), len, tcp_sndbuf(pcb));*/
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-http_poll(void *arg, struct tcp_pcb *pcb)
-{
-  struct http_state *hs;
-
-  hs = arg;
-  
-  /*  printf("Polll\n");*/
-  if(hs == NULL) {
-    /*    printf("Null, close\n");*/
-    tcp_abort(pcb);
-    return ERR_ABRT;
-  } else {
-    ++hs->retries;
-    if(hs->retries == 4) {
-      tcp_abort(pcb);
-      return ERR_ABRT;
-    }
-    send_data(pcb, hs);
-  }
-
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-http_sent(void *arg, struct tcp_pcb *pcb, u16_t len)
-{
-  struct http_state *hs;
-
-  hs = arg;
-
-  hs->retries = 0;
-  
-  if(hs->left > 0) {    
-    send_data(pcb, hs);
-  } else {
-    close_conn(pcb, hs);
-  }
-
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-http_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
-{
-  int i;
-  char *data;
-  struct fs_file file;
-  struct http_state *hs;
-
-  hs = arg;
-
-  if(err == ERR_OK && p != NULL) {
-
-    /* Inform TCP that we have taken the data. */
-    tcp_recved(pcb, p->tot_len);
-    
-    if(hs->file == NULL) {
-      data = p->payload;
-      
-      if(strncmp(data, "GET ", 4) == 0) {
-	for(i = 0; i < 40; i++) {
-	  if(((char *)data + 4)[i] == ' ' ||
-	     ((char *)data + 4)[i] == '\r' ||
-	     ((char *)data + 4)[i] == '\n') {
-	    ((char *)data + 4)[i] = 0;
-	  }
-	}
-
-	if(*(char *)(data + 4) == '/' &&
-	   *(char *)(data + 5) == 0) {
-	  fs_open("/index.html", &file);
-	} else if(!fs_open((char *)data + 4, &file)) {
-	  fs_open("/404.html", &file);	 
-	}
-	hs->file = file.data;
-	hs->left = file.len;
-	/*	printf("data %p len %ld\n", hs->file, hs->left);*/
-
-	pbuf_free(p);
-	send_data(pcb, hs);
-
-	/* Tell TCP that we wish be to informed of data that has been
-	   successfully sent by a call to the http_sent() function. */
-	tcp_sent(pcb, http_sent);
-      } else {
-	pbuf_free(p);
-	close_conn(pcb, hs);
-      }
-    } else {
-      pbuf_free(p);
-    }
-  }
-
-  if(err == ERR_OK && p == NULL) {
-    close_conn(pcb, hs);
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-http_accept(void *arg, struct tcp_pcb *pcb, err_t err)
-{
-  struct http_state *hs;
-
-  tcp_setprio(pcb, TCP_PRIO_MIN);
-  
-  /* Allocate memory for the structure that holds the state of the
-     connection. */
-  hs = mem_malloc(sizeof(struct http_state));
-
-  if(hs == NULL) {
-    printf("http_accept: Out of memory\n");
-    return ERR_MEM;
-  }
-  
-  /* Initialize the structure. */
-  hs->file = NULL;
-  hs->left = 0;
-  hs->retries = 0;
-  
-  /* Tell TCP that this is the structure we wish to be passed for our
-     callbacks. */
-  tcp_arg(pcb, hs);
-
-  /* Tell TCP that we wish to be informed of incoming data by a call
-     to the http_recv() function. */
-  tcp_recv(pcb, http_recv);
-
-  tcp_err(pcb, conn_err);
-  
-  tcp_poll(pcb, http_poll, 4);
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-httpd_init(void)
-{
-  struct tcp_pcb *pcb;
-
-  pcb = tcp_new();
-  tcp_bind(pcb, IP_ADDR_ANY, 80);
-  pcb = tcp_listen(pcb);
-  tcp_accept(pcb, http_accept);
-}
-/*-----------------------------------------------------------------------------------*/
-

proj/unixsim/apps/httpd.h

@@ -1,37 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __HTTPD_H__
-#define __HTTPD_H__
-
-void httpd_init(void);
-
-#endif /* __HTTPD_H__ */

proj/unixsim/apps/makefsdata

@@ -1,97 +0,0 @@
-#!/usr/bin/perl
-
-open(OUTPUT, "> fsdata.c");
-
-chdir("fs");
-open(FILES, "find . -type f |");
-
-while($file = <FILES>) {
-
-    # Do not include files in CVS directories nor backup files.
-    if($file =~ /(CVS|~)/) {
-    	next;
-    }
-    
-    chop($file);
-    
-    open(HEADER, "> /tmp/header") || die $!;
-    if($file =~ /404/) {
-	print(HEADER "HTTP/1.0 404 File not found\r\n");
-    } else {
-	print(HEADER "HTTP/1.0 200 OK\r\n");
-    }
-    print(HEADER "Server: lwIP/pre-0.6 (http://www.sics.se/~adam/lwip/)\r\n");
-    if($file =~ /\.html$/) {
-	print(HEADER "Content-type: text/html\r\n");
-    } elsif($file =~ /\.gif$/) {
-	print(HEADER "Content-type: image/gif\r\n");
-    } elsif($file =~ /\.png$/) {
-	print(HEADER "Content-type: image/png\r\n");
-    } elsif($file =~ /\.jpg$/) {
-	print(HEADER "Content-type: image/jpeg\r\n");
-    } elsif($file =~ /\.class$/) {
-	print(HEADER "Content-type: application/octet-stream\r\n");
-    } elsif($file =~ /\.ram$/) {
-	print(HEADER "Content-type: audio/x-pn-realaudio\r\n");    
-    } else {
-	print(HEADER "Content-type: text/plain\r\n");
-    }
-    print(HEADER "\r\n");
-    close(HEADER);
-
-    unless($file =~ /\.plain$/ || $file =~ /cgi/) {
-	system("cat /tmp/header $file > /tmp/file");
-    } else {
-	system("cp $file /tmp/file");
-    }
-    
-    open(FILE, "/tmp/file");
-    unlink("/tmp/file");
-    unlink("/tmp/header");
-
-    $file =~ s/\.//;
-    $fvar = $file;
-    $fvar =~ s-/-_-g;
-    $fvar =~ s-\.-_-g;
-    print(OUTPUT "static const char data".$fvar."[] = {\n");
-    print(OUTPUT "\t/* $file */\n\t");
-    for($j = 0; $j < length($file); $j++) {
-	printf(OUTPUT "%#02x, ", unpack("C", substr($file, $j, 1)));
-    }
-    printf(OUTPUT "0,\n");
-    
-    
-    $i = 0;        
-    while(read(FILE, $data, 1)) {
-        if($i == 0) {
-            print(OUTPUT "\t");
-        }
-        printf(OUTPUT "%#02x, ", unpack("C", $data));
-        $i++;
-        if($i == 10) {
-            print(OUTPUT "\n");
-            $i = 0;
-        }
-    }
-    print(OUTPUT "};\n\n");
-    close(FILE);
-    push(@fvars, $fvar);
-    push(@files, $file);
-}
-
-for($i = 0; $i < @fvars; $i++) {
-    $file = $files[$i];
-    $fvar = $fvars[$i];
-
-    if($i == 0) {
-        $prevfile = "NULL";
-    } else {
-        $prevfile = "file" . $fvars[$i - 1];
-    }
-    print(OUTPUT "const struct fsdata_file file".$fvar."[] = {{$prevfile, data$fvar, ");
-    print(OUTPUT "data$fvar + ". (length($file) + 1) .", ");
-    print(OUTPUT "sizeof(data$fvar) - ". (length($file) + 1) ."}};\n\n");
-}
-
-print(OUTPUT "#define FS_ROOT file$fvars[$i - 1]\n\n");
-print(OUTPUT "#define FS_NUMFILES $i");

proj/unixsim/apps/shell.h

@@ -1,37 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __SHELL_H__
-#define __SHELL_H__
-
-void shell_init(void);
-
-#endif /* __SHELL_H__ */

proj/unixsim/apps/tcpecho.c

@@ -1,88 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/sys.h"
-#include "lwip/api.h"
-/*-----------------------------------------------------------------------------------*/
-static void 
-tcpecho_thread(void *arg)
-{
-  struct netconn *conn, *newconn;
-  err_t err;
-
-  /* Create a new connection identifier. */
-  conn = netconn_new(NETCONN_TCP);
-
-  /* Bind connection to well known port number 7. */
-  netconn_bind(conn, NULL, 7);
-
-  /* Tell connection to go into listening mode. */
-  netconn_listen(conn);
-
-  while(1) {
-
-    /* Grab new connection. */
-    newconn = netconn_accept(conn);
-    /*printf("accepted new connection %p\n", newconn);*/
-    /* Process the new connection. */
-    if(newconn != NULL) {
-      struct netbuf *buf;
-      void *data;
-      u16_t len;
-      
-      while((buf = netconn_recv(newconn)) != NULL) {
-	/*printf("Recved\n");*/
-	do {
-	  netbuf_data(buf, &data, &len);
-	  err = netconn_write(newconn, data, len, NETCONN_COPY);
-	  if(err != ERR_OK) {
-	    /*	    printf("tcpecho: netconn_write: error \"%s\"\n", lwip_strerr(err));*/
-	  }
-	} while(netbuf_next(buf) >= 0);
-	netbuf_delete(buf);	
-      }
-      /*printf("Got EOF, looping\n");*/
-      /* Close connection and discard connection identifier. */
-      netconn_delete(newconn);
-    }
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-tcpecho_init(void)
-{
-  sys_thread_new(tcpecho_thread, NULL);  
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-

proj/unixsim/apps/tcpecho.h

@@ -1,38 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#ifndef __TCPECHO_H__
-#define __TCPECHO_H__
-
-void tcpecho_init(void);
-
-#endif /* __TCPECHO_H__ */

proj/unixsim/apps/udpecho.c

@@ -1,65 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/api.h"
-#include "lwip/sys.h"
-
-/*-----------------------------------------------------------------------------------*/
-void 
-udpecho_thread(void *arg)
-{
-  static struct netconn *conn;
-  static struct netbuf *buf;
-  static struct ip_addr *addr;
-  static unsigned short port;
-  char buffer[4096];
-  
-  conn = netconn_new(NETCONN_UDP);
-  netconn_bind(conn, NULL, 7);
-
-  while(1) {
-    buf = netconn_recv(conn);
-    addr = netbuf_fromaddr(buf);
-    port = netbuf_fromport(buf);
-    netconn_connect(conn, addr, port);
-    netconn_send(conn, buf);
-    netbuf_copy(buf, buffer, sizeof(buffer));
-    printf("got %s\n", buffer);
-    netbuf_delete(buf);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-udpecho_init(void)
-{
-  sys_thread_new(udpecho_thread, NULL);
-}

proj/unixsim/apps/udpecho.h

@@ -1,37 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __UDPECHO_H__
-#define __UDPECHO_H__
-
-void udpecho_init(void);
-
-#endif /* __UDPECHO_H__ */

proj/unixsim/lwipopts.h

@@ -1,171 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
-
-/* ---------- 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           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
-
-/* 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           16
-/* 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        5
-/* 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
-/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
-   timeouts. */
-#define MEMP_NUM_SYS_TIMEOUT    3
-
-
-/* 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         2
-/* MEMP_NUM_NETCONN: the number of struct netconns. */
-#define MEMP_NUM_NETCONN        4
-/* MEMP_NUM_APIMSG: the number of struct api_msg, used for
-   communication between the TCP/IP stack and the sequential
-   programs. */
-#define MEMP_NUM_API_MSG        8
-/* MEMP_NUM_TCPIPMSG: 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      8
-
-/* These two control is reclaimer functions should be compiled
-   in. Should always be turned on (1). */
-#define MEM_RECLAIM             1
-#define MEMP_RECLAIM            1
-
-/* ---------- Pbuf options ---------- */
-/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
-#define PBUF_POOL_SIZE          6
-
-/* 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         1
-
-/* 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                 1024
-
-/* 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
-
-/* ---------- 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              1
-
-/* 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              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
-
-/* ---------- UDP options ---------- */
-#define LWIP_UDP                1
-#define UDP_TTL                 255
-
-
-/* ---------- 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__ */

proj/unixsim/simhost.c

@@ -1,189 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include <unistd.h>
-
-#include "lwip/opt.h"
-
-#include "lwip/mem.h"
-#include "lwip/memp.h"
-#include "lwip/sys.h"
-
-#include "lwip/stats.h"
-
-
-#include "lwip/tcpip.h"
-
-#include "netif/tapif.h"
-#include "netif/tunif.h"
-
-#include "netif/unixif.h"
-#include "netif/dropif.h"
-#include "netif/pcapif.h"
-#include "netif/loopif.h"
-
-#include "netif/tcpdump.h"
-
-
-
-
-#include "lwip/ip_addr.h"
-
-#include "arch/perf.h"
-
-#include "httpd.h"
-#include "udpecho.h"
-#include "tcpecho.h"
-#include "shell.h"
-
-/*-----------------------------------------------------------------------------------*/
-static void
-tcp_timeout(void *data)
-{
-#if TCP_DEBUG
-  tcp_debug_print_pcbs();
-#endif /* TCP_DEBUG */
-  sys_timeout(5000, tcp_timeout, NULL);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-tcpip_init_done(void *arg)
-{
-  sys_sem_t *sem;
-  sem = arg;
-  sys_sem_signal(*sem);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-main_thread(void *arg)
-{
-  struct ip_addr ipaddr, netmask, gw;
-  sys_sem_t sem;
-
-  netif_init();
-
-  sem = sys_sem_new(0);
-  tcpip_init(tcpip_init_done, &sem);
-  sys_sem_wait(sem);
-  sys_sem_free(sem);
-  printf("TCP/IP initialized.\n");
-  
-#if LWIP_DHCP
-  {
-    struct netif *netif;
-    IP4_ADDR(&gw, 0,0,0,0);
-    IP4_ADDR(&ipaddr, 0,0,0,0);
-    IP4_ADDR(&netmask, 0,0,0,0);
-
-    netif = netif_add(&ipaddr, &netmask, &gw, tapif_init,
-		      tcpip_input);
-    netif_set_default(netif);
-    dhcp_init();
-    dhcp_start(netif);
-  }
-#else
-  IP4_ADDR(&gw, 192,168,0,1);
-  IP4_ADDR(&ipaddr, 192,168,0,2);
-  IP4_ADDR(&netmask, 255,255,255,0);
-  
-  /*  netif_set_default(netif_add(&ipaddr, &netmask, &gw, tapif_init,
-      tcpip_input));*/
-  netif_set_default(netif_add(&ipaddr, &netmask, &gw, tapif_init,
-			      tcpip_input));
-#endif
-  /* Only used for testing purposes: */
-  /*  IP4_ADDR(&gw, 193,10,66,1);
-  IP4_ADDR(&ipaddr, 193,10,66,107);
-  IP4_ADDR(&netmask, 255,255,252,0);
-  
-  netif_add(&ipaddr, &netmask, &gw, pcapif_init,
-  tcpip_input);*/
-  
-  IP4_ADDR(&gw, 127,0,0,1);
-  IP4_ADDR(&ipaddr, 127,0,0,1);
-  IP4_ADDR(&netmask, 255,0,0,0);
-  
-  netif_add(&ipaddr, &netmask, &gw, loopif_init,
-	    tcpip_input);
-   
-  tcpecho_init();
-  shell_init();
-  httpd_init();
-  udpecho_init();
-  
-  printf("Applications started.\n");
-
-  /*  sys_timeout(5000, tcp_timeout, NULL);*/
-
-#ifdef MEM_PERF
-  mem_perf_init("/tmp/memstats.client");
-#endif /* MEM_PERF */
-
-  /* Block for ever. */
-  sem = sys_sem_new(0);
-  sys_sem_wait(sem);
-}
-/*-----------------------------------------------------------------------------------*/
-int
-main(int argc, char **argv)
-{
-#ifdef PERF
-  perf_init("/tmp/simhost.perf");
-#endif /* PERF */
-#ifdef STATS
-  stats_init();
-#endif /* STATS */
-  sys_init();
-  mem_init();
-  memp_init();
-  pbuf_init();
-
-  tcpdump_init();
-
-  
-  printf("System initialized.\n");
-    
-  sys_thread_new((void *)(main_thread), NULL);
-  pause();
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-

proj/unixsim/simnode.c

@@ -1,157 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include <unistd.h>
-
-
-#include "lwip/mem.h"
-#include "lwip/memp.h"
-#include "lwip/sys.h"
-
-#include "lwip/stats.h"
-
-
-#include "lwip/tcpip.h"
-
-
-#include "netif/unixif.h"
-#include "netif/dropif.h"
-
-#include "netif/loopif.h"
-
-#include "netif/tcpdump.h"
-
-#include "netif/sioslipif.h"
-
-
-#include "lwip/ip_addr.h"
-
-#include "arch/perf.h"
-
-#include "httpd.h"
-#include "udpecho.h"
-#include "tcpecho.h"
-#include "shell.h"
-
-/*-----------------------------------------------------------------------------------*/
-static void
-tcp_timeout(void *data)
-{
-#if TCP_DEBUG
-  tcp_debug_print_pcbs();
-#endif /* TCP_DEBUG */
-  sys_timeout(5000, tcp_timeout, NULL);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-tcpip_init_done(void *arg)
-{
-  sys_sem_t *sem;
-  sem = arg;
-  sys_sem_signal(*sem);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-main_thread(void *arg)
-{
-  struct ip_addr ipaddr, netmask, gw;
-  sys_sem_t sem;
-
-    
-  IP4_ADDR(&gw, 192,168,1,1);
-  IP4_ADDR(&ipaddr, 192,168,1,2);
-  IP4_ADDR(&netmask, 255,255,255,0);
-
-  netif_set_default(netif_add(&ipaddr, &netmask, &gw, unixif_init_client,
-			      tcpip_input));
-  /*  netif_set_default(netif_add(&ipaddr, &netmask, &gw, sioslipif_init1,
-			      tcpip_input)); */
-
-  
-  sem = sys_sem_new(0);
-  tcpip_init(tcpip_init_done, &sem);
-  sys_sem_wait(sem);
-  sys_sem_free(sem);
-  printf("TCP/IP initialized.\n");
-
-  tcpecho_init();
-  shell_init();
-  httpd_init();
-  udpecho_init();
-
-  printf("Applications started.\n");
-    
-  sys_timeout(5000, tcp_timeout, NULL);
-
-#ifdef MEM_PERF
-  mem_perf_init("/tmp/memstats.client");
-#endif /* MEM_PERF */
-
-  sem = sys_sem_new(0);
-  sys_sem_wait(sem);
-
-}
-/*-----------------------------------------------------------------------------------*/
-int
-main(int argc, char **argv)
-{
-#ifdef PERF
-  perf_init("/tmp/client.perf");
-#endif /* PERF */
-#ifdef STATS
-  stats_init();
-#endif /* STATS */
-  sys_init();
-  mem_init();
-  memp_init();
-  pbuf_init();
-
-  tcpdump_init();
-
-  
-  printf("System initialized.\n");
-    
-  sys_thread_new((void *)(main_thread), NULL);
-  pause();
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-

proj/unixsim/simrouter.c

@@ -1,167 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include <unistd.h>
-
-
-#include "lwip/mem.h"
-#include "lwip/memp.h"
-#include "lwip/sys.h"
-
-#include "lwip/stats.h"
-
-
-#include "lwip/tcpip.h"
-
-#include "netif/tapif.h"
-
-#include "netif/unixif.h"
-#include "netif/dropif.h"
-
-#include "netif/loopif.h"
-
-#include "netif/tcpdump.h"
-
-#include "netif/sioslipif.h"
-
-
-#include "lwip/ip_addr.h"
-
-#include "arch/perf.h"
-
-#include "httpd.h"
-#include "udpecho.h"
-#include "tcpecho.h"
-#include "shell.h"
-
-/*-----------------------------------------------------------------------------------*/
-static void
-tcp_timeout(void *data)
-{
-#if TCP_DEBUG
-  tcp_debug_print_pcbs();
-#endif /* TCP_DEBUG */
-  sys_timeout(5000, tcp_timeout, NULL);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-tcpip_init_done(void *arg)
-{
-  sys_sem_t *sem;
-  sem = arg;
-  sys_sem_signal(*sem);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-main_thread(void *arg)
-{
-  struct ip_addr ipaddr, netmask, gw;
-  sys_sem_t sem;
-
-    
-  IP4_ADDR(&gw, 192,168,0,1);
-  IP4_ADDR(&ipaddr, 192,168,0,2);
-  IP4_ADDR(&netmask, 255,255,255,0);
-
-  netif_set_default(netif_add(&ipaddr, &netmask, &gw, tapif_init,
-			      tcpip_input));
-
-  IP4_ADDR(&gw, 192,168,1,1);
-  IP4_ADDR(&ipaddr, 192,168,1,1);
-  IP4_ADDR(&netmask, 255,255,255,0);
-  netif_set_default(netif_add(&ipaddr, &netmask, &gw, unixif_init_server,
-			      tcpip_input));
-
-  system("route add 192.168.1.1 192.168.0.2");
-  system("route add 192.168.1.2 192.168.0.2");
-
-  
-  /*netif_set_default(netif_add(&ipaddr, &netmask, &gw, sioslipif_init1,
-			      tcpip_input)); */
-
-  
-  sem = sys_sem_new(0);
-  tcpip_init(tcpip_init_done, &sem);
-  sys_sem_wait(sem);
-  sys_sem_free(sem);
-  printf("TCP/IP initialized.\n");
-
-  tcpecho_init();
-  shell_init();
-  httpd_init();
-  udpecho_init();
-
-  printf("Applications started.\n");
-    
-  sys_timeout(5000, tcp_timeout, NULL);
-
-#ifdef MEM_PERF
-  mem_perf_init("/tmp/memstats.client");
-#endif /* MEM_PERF */
-  sem = sys_sem_new(0);
-  sys_sem_wait(sem);
-}
-/*-----------------------------------------------------------------------------------*/
-int
-main(int argc, char **argv)
-{
-#ifdef PERF
-  perf_init("/tmp/client.perf");
-#endif /* PERF */
-#ifdef STATS
-  stats_init();
-#endif /* STATS */
-  sys_init();
-  mem_init();
-  memp_init();
-  pbuf_init();
-
-  tcpdump_init();
-
-  
-  printf("System initialized.\n");
-    
-  sys_thread_new((void *)(main_thread), NULL);
-  pause();
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-

src/FILES

@@ -1,7 +1,5 @@
 api/      - The code for the API.	   
 
-arch/     - Architectural specific files are kept here.
-
 core/     - The core files including protocol implementations, memory
             and buffer management etc.
 	    

src/api/api_lib.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -33,21 +33,19 @@
 /* This is the part of the API that is linked with
    the application */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 #include "lwip/api.h"
 #include "lwip/api_msg.h"
 #include "lwip/memp.h"
 
-#include "lwip/debug.h"
 
-/*-----------------------------------------------------------------------------------*/
 struct
 netbuf *netbuf_new(void)
 {
   struct netbuf *buf;
 
-  buf = memp_mallocp(MEMP_NETBUF);
-  if(buf != NULL) {
+  buf = memp_malloc(MEMP_NETBUF);
+  if (buf != NULL) {
     buf->p = NULL;
     buf->ptr = NULL;
     return buf;
@@ -55,99 +53,99 @@ netbuf *netbuf_new(void)
     return NULL;
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_delete(struct netbuf *buf)
 {
-  if(buf != NULL) {
-    if(buf->p != NULL) {
+  if (buf != NULL) {
+    if (buf->p != NULL) {
       pbuf_free(buf->p);
       buf->p = buf->ptr = NULL;
     }
-    memp_freep(MEMP_NETBUF, buf);
+    memp_free(MEMP_NETBUF, buf);
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 void *
 netbuf_alloc(struct netbuf *buf, u16_t size)
 {
   /* Deallocate any previously allocated memory. */
-  if(buf->p != NULL) {
+  if (buf->p != NULL) {
     pbuf_free(buf->p);
   }
   buf->p = pbuf_alloc(PBUF_TRANSPORT, size, PBUF_RAM);
-  if(buf->p == NULL) {
+  if (buf->p == NULL) {
      return NULL;
   }
   buf->ptr = buf->p;
   return buf->p->payload;
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_free(struct netbuf *buf)
 {
-  if(buf->p != NULL) {
+  if (buf->p != NULL) {
     pbuf_free(buf->p);
   }
   buf->p = buf->ptr = NULL;
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_ref(struct netbuf *buf, void *dataptr, u16_t size)
 {
-  if(buf->p != NULL) {
+  if (buf->p != NULL) {
     pbuf_free(buf->p);
   }
-  buf->p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_ROM);
+  buf->p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_REF);
   buf->p->payload = dataptr;
   buf->p->len = buf->p->tot_len = size;
   buf->ptr = buf->p;
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_chain(struct netbuf *head, struct netbuf *tail)
 {
   pbuf_chain(head->p, tail->p);
   head->ptr = head->p;
-  memp_freep(MEMP_NETBUF, tail);
+  memp_free(MEMP_NETBUF, tail);
 }
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 netbuf_len(struct netbuf *buf)
 {
   return buf->p->tot_len;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netbuf_data(struct netbuf *buf, void **dataptr, u16_t *len)
 {
-  if(buf->ptr == NULL) {
+  if (buf->ptr == NULL) {
     return ERR_BUF;
   }
   *dataptr = buf->ptr->payload;
   *len = buf->ptr->len;
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+
 s8_t
 netbuf_next(struct netbuf *buf)
 {
-  if(buf->ptr->next == NULL) {
+  if (buf->ptr->next == NULL) {
     return -1;
   }
   buf->ptr = buf->ptr->next;
-  if(buf->ptr->next == NULL) {
+  if (buf->ptr->next == NULL) {
     return 1;
   }
   return 0;
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_first(struct netbuf *buf)
 {
   buf->ptr = buf->p;
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_copy_partial(struct netbuf *buf, void *dataptr, u16_t len, u16_t offset)
 {
@@ -156,79 +154,119 @@ netbuf_copy_partial(struct netbuf *buf, void *dataptr, u16_t len, u16_t offset)
 
   left = 0;
 
-  if(buf == NULL) {
+  if(buf == NULL || dataptr == NULL) {
     return;
   }
   
   /* This implementation is bad. It should use bcopy
      instead. */
   for(p = buf->p; left < len && p != NULL; p = p->next) {
-    if(offset != 0 && offset >= p->len) {
+    if (offset != 0 && offset >= p->len) {
       offset -= p->len;
     } else {    
       for(i = offset; i < p->len; ++i) {
-	((char *)dataptr)[left] = ((char *)p->payload)[i];
-	if(++left >= len) {
-	  return;
-	}
+  ((char *)dataptr)[left] = ((char *)p->payload)[i];
+  if (++left >= len) {
+    return;
+  }
       }
       offset = 0;
     }
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 netbuf_copy(struct netbuf *buf, void *dataptr, u16_t len)
 {
   netbuf_copy_partial(buf, dataptr, len, 0);
 }
-/*-----------------------------------------------------------------------------------*/
+
 struct ip_addr *
 netbuf_fromaddr(struct netbuf *buf)
 {
   return buf->fromaddr;
 }
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 netbuf_fromport(struct netbuf *buf)
 {
   return buf->fromport;
 }
-/*-----------------------------------------------------------------------------------*/
+
 struct
-netconn *netconn_new(enum netconn_type t)
+netconn *netconn_new_with_proto_and_callback(enum netconn_type t, u16_t proto,
+                                   void (*callback)(struct netconn *, enum netconn_evt, u16_t len))
 {
   struct netconn *conn;
+  struct api_msg *msg;
 
-  conn = memp_mallocp(MEMP_NETCONN);
-  if(conn == NULL) {
+  conn = memp_malloc(MEMP_NETCONN);
+  if (conn == NULL) {
     return NULL;
   }
+  
+  conn->err = ERR_OK;
   conn->type = t;
   conn->pcb.tcp = NULL;
 
-  if((conn->mbox = sys_mbox_new()) == SYS_MBOX_NULL) {
-    memp_freep(MEMP_NETCONN, conn);
+  if ((conn->mbox = sys_mbox_new()) == SYS_MBOX_NULL) {
+    memp_free(MEMP_NETCONN, conn);
     return NULL;
   }
   conn->recvmbox = SYS_MBOX_NULL;
   conn->acceptmbox = SYS_MBOX_NULL;
   conn->sem = SYS_SEM_NULL;
   conn->state = NETCONN_NONE;
+  conn->socket = 0;
+  conn->callback = callback;
+  conn->recv_avail = 0;
+
+  if((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
+    memp_free(MEMP_NETCONN, conn);
+    return NULL;
+  }
+  
+  msg->type = API_MSG_NEWCONN;
+  msg->msg.msg.bc.port = proto; /* misusing the port field */
+  msg->msg.conn = conn;
+  api_msg_post(msg);  
+  sys_mbox_fetch(conn->mbox, NULL);
+  memp_free(MEMP_API_MSG, msg);
+
+  if ( conn->err != ERR_OK ) {
+    memp_free(MEMP_NETCONN, conn);
+    return NULL;
+  }
+
   return conn;
 }
-/*-----------------------------------------------------------------------------------*/
+
+
+struct
+netconn *netconn_new(enum netconn_type t)
+{
+  return netconn_new_with_proto_and_callback(t,0,NULL);
+}
+
+struct
+netconn *netconn_new_with_callback(enum netconn_type t,
+                                   void (*callback)(struct netconn *, enum netconn_evt, u16_t len))
+{
+  return netconn_new_with_proto_and_callback(t,0,callback);
+}
+
+
 err_t
 netconn_delete(struct netconn *conn)
 {
   struct api_msg *msg;
   void *mem;
   
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_OK;
   }
   
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return ERR_MEM;
   }
   
@@ -236,15 +274,15 @@ netconn_delete(struct netconn *conn)
   msg->msg.conn = conn;
   api_msg_post(msg);  
   sys_mbox_fetch(conn->mbox, NULL);
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
 
   /* Drain the recvmbox. */
-  if(conn->recvmbox != SYS_MBOX_NULL) {
-    while(sys_arch_mbox_fetch(conn->recvmbox, &mem, 1) != 0) {
-      if(conn->type == NETCONN_TCP) {
-	pbuf_free((struct pbuf *)mem);
+  if (conn->recvmbox != SYS_MBOX_NULL) {
+    while (sys_arch_mbox_fetch(conn->recvmbox, &mem, 1) != SYS_ARCH_TIMEOUT) {
+      if (conn->type == NETCONN_TCP) {
+  pbuf_free((struct pbuf *)mem);
       } else {
-	netbuf_delete((struct netbuf *)mem);
+  netbuf_delete((struct netbuf *)mem);
       }
     }
     sys_mbox_free(conn->recvmbox);
@@ -253,8 +291,8 @@ netconn_delete(struct netconn *conn)
  
 
   /* Drain the acceptmbox. */
-  if(conn->acceptmbox != SYS_MBOX_NULL) {
-    while(sys_arch_mbox_fetch(conn->acceptmbox, &mem, 1) != 0) {
+  if (conn->acceptmbox != SYS_MBOX_NULL) {
+    while (sys_arch_mbox_fetch(conn->acceptmbox, &mem, 1) != SYS_ARCH_TIMEOUT) {
       netconn_delete((struct netconn *)mem);
     }
     
@@ -264,44 +302,56 @@ netconn_delete(struct netconn *conn)
 
   sys_mbox_free(conn->mbox);
   conn->mbox = SYS_MBOX_NULL;
-  if(conn->sem != SYS_SEM_NULL) {
+  if (conn->sem != SYS_SEM_NULL) {
     sys_sem_free(conn->sem);
   }
   /*  conn->sem = SYS_SEM_NULL;*/
   memp_free(MEMP_NETCONN, conn);
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+
 enum netconn_type
 netconn_type(struct netconn *conn)
 {
   return conn->type;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
-netconn_peer(struct netconn *conn, struct ip_addr **addr,
-	     u16_t *port)
+netconn_peer(struct netconn *conn, struct ip_addr *addr,
+       u16_t *port)
 {
-  switch(conn->type) {
+  switch (conn->type) {
+  case NETCONN_RAW:
+    /* return an error as connecting is only a helper for upper layers */
+    return ERR_CONN;
   case NETCONN_UDPLITE:
   case NETCONN_UDPNOCHKSUM:
   case NETCONN_UDP:
-    *addr = &(conn->pcb.udp->remote_ip);
+    if (conn->pcb.udp == NULL ||
+  ((conn->pcb.udp->flags & UDP_FLAGS_CONNECTED) == 0))
+     return ERR_CONN;
+    *addr = (conn->pcb.udp->remote_ip);
     *port = conn->pcb.udp->remote_port;
     break;
   case NETCONN_TCP:
-    *addr = &(conn->pcb.tcp->remote_ip);
+    if (conn->pcb.tcp == NULL)
+      return ERR_CONN;
+    *addr = (conn->pcb.tcp->remote_ip);
     *port = conn->pcb.tcp->remote_port;
     break;
   }
   return (conn->err = ERR_OK);
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_addr(struct netconn *conn, struct ip_addr **addr,
-	     u16_t *port)
+       u16_t *port)
 {
-  switch(conn->type) {
+  switch (conn->type) {
+  case NETCONN_RAW:
+    *addr = &(conn->pcb.raw->local_ip);
+    *port = conn->pcb.raw->protocol;
+    break;
   case NETCONN_UDPLITE:
   case NETCONN_UDPNOCHKSUM:
   case NETCONN_UDP:
@@ -315,25 +365,25 @@ netconn_addr(struct netconn *conn, struct ip_addr **addr,
   }
   return (conn->err = ERR_OK);
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_bind(struct netconn *conn, struct ip_addr *addr,
-	    u16_t port)
+      u16_t port)
 {
   struct api_msg *msg;
 
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
 
-  if(conn->type != NETCONN_TCP &&
+  if (conn->type != NETCONN_TCP &&
      conn->recvmbox == SYS_MBOX_NULL) {
-    if((conn->recvmbox = sys_mbox_new()) == SYS_MBOX_NULL) {
+    if ((conn->recvmbox = sys_mbox_new()) == SYS_MBOX_NULL) {
       return ERR_MEM;
     }
   }
   
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return (conn->err = ERR_MEM);
   }
   msg->type = API_MSG_BIND;
@@ -342,28 +392,29 @@ netconn_bind(struct netconn *conn, struct ip_addr *addr,
   msg->msg.msg.bc.port = port;
   api_msg_post(msg);
   sys_mbox_fetch(conn->mbox, NULL);
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
+
 err_t
 netconn_connect(struct netconn *conn, struct ip_addr *addr,
-		   u16_t port)
+       u16_t port)
 {
   struct api_msg *msg;
   
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
 
 
-  if(conn->recvmbox == SYS_MBOX_NULL) {
-    if((conn->recvmbox = sys_mbox_new()) == SYS_MBOX_NULL) {
+  if (conn->recvmbox == SYS_MBOX_NULL) {
+    if ((conn->recvmbox = sys_mbox_new()) == SYS_MBOX_NULL) {
       return ERR_MEM;
     }
   }
   
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return ERR_MEM;
   }
   msg->type = API_MSG_CONNECT;
@@ -372,91 +423,128 @@ netconn_connect(struct netconn *conn, struct ip_addr *addr,
   msg->msg.msg.bc.port = port;
   api_msg_post(msg);
   sys_mbox_fetch(conn->mbox, NULL);
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
+err_t
+netconn_disconnect(struct netconn *conn)
+{
+  struct api_msg *msg;
+  
+  if (conn == NULL) {
+    return ERR_VAL;
+  }
+
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
+    return ERR_MEM;
+  }
+  msg->type = API_MSG_DISCONNECT;
+  msg->msg.conn = conn;  
+  api_msg_post(msg);
+  sys_mbox_fetch(conn->mbox, NULL);
+  memp_free(MEMP_API_MSG, msg);
+  return conn->err;
+
+}
+
 err_t
 netconn_listen(struct netconn *conn)
 {
   struct api_msg *msg;
 
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
 
-  if(conn->acceptmbox == SYS_MBOX_NULL) {
+  if (conn->acceptmbox == SYS_MBOX_NULL) {
     conn->acceptmbox = sys_mbox_new();
-    if(conn->acceptmbox == SYS_MBOX_NULL) {
+    if (conn->acceptmbox == SYS_MBOX_NULL) {
       return ERR_MEM;
     }
   }
   
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return (conn->err = ERR_MEM);
   }
   msg->type = API_MSG_LISTEN;
   msg->msg.conn = conn;
   api_msg_post(msg);
   sys_mbox_fetch(conn->mbox, NULL);
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
 struct netconn *
 netconn_accept(struct netconn *conn)
 {
   struct netconn *newconn;
   
-  if(conn == NULL) {
+  if (conn == NULL) {
     return NULL;
   }
   
   sys_mbox_fetch(conn->acceptmbox, (void **)&newconn);
-
+  /* Register event with callback */
+  if (conn->callback)
+      (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, 0);
+  
   return newconn;
 }
-/*-----------------------------------------------------------------------------------*/
+
 struct netbuf *
 netconn_recv(struct netconn *conn)
 {
   struct api_msg *msg;
   struct netbuf *buf;
   struct pbuf *p;
+  u16_t len;
     
-  if(conn == NULL) {
+  if (conn == NULL) {
     return NULL;
   }
   
-  if(conn->recvmbox == SYS_MBOX_NULL) {
+  if (conn->recvmbox == SYS_MBOX_NULL) {
     conn->err = ERR_CONN;
     return NULL;
   }
 
-  if(conn->err != ERR_OK) {
+  if (conn->err != ERR_OK) {
     return NULL;
   }
 
-  if(conn->type == NETCONN_TCP) {
-    if(conn->pcb.tcp->state == LISTEN) {
+  if (conn->type == NETCONN_TCP) {
+    if (conn->pcb.tcp->state == LISTEN) {
       conn->err = ERR_CONN;
       return NULL;
     }
 
 
-    buf = memp_mallocp(MEMP_NETBUF);
+    buf = memp_malloc(MEMP_NETBUF);
 
-    if(buf == NULL) {
+    if (buf == NULL) {
       conn->err = ERR_MEM;
       return NULL;
     }
     
     sys_mbox_fetch(conn->recvmbox, (void **)&p);
+
+    if (p != NULL)
+    {
+        len = p->tot_len;
+        conn->recv_avail -= len;
+    }
+    else
+        len = 0;
     
-    /* If we are closed, we indicate that we no longer wish to recieve
+    /* Register event with callback */
+      if (conn->callback)
+        (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len);
+
+    /* If we are closed, we indicate that we no longer wish to receive
        data by setting conn->recvmbox to SYS_MBOX_NULL. */
-    if(p == NULL) {
-      memp_freep(MEMP_NETBUF, buf);
+    if (p == NULL) {
+      memp_free(MEMP_NETBUF, buf);
       sys_mbox_free(conn->recvmbox);
       conn->recvmbox = SYS_MBOX_NULL;
       return NULL;
@@ -468,13 +556,13 @@ netconn_recv(struct netconn *conn)
     buf->fromaddr = NULL;
 
     /* Let the stack know that we have taken the data. */
-    if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+    if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
       conn->err = ERR_MEM;
       return buf;
     }
     msg->type = API_MSG_RECV;
     msg->msg.conn = conn;
-    if(buf != NULL) {
+    if (buf != NULL) {
       msg->msg.msg.len = buf->p->tot_len;
     } else {
       msg->msg.msg.len = 1;
@@ -482,70 +570,74 @@ netconn_recv(struct netconn *conn)
     api_msg_post(msg);
 
     sys_mbox_fetch(conn->mbox, NULL);
-    memp_freep(MEMP_API_MSG, msg);
+    memp_free(MEMP_API_MSG, msg);
   } else {
     sys_mbox_fetch(conn->recvmbox, (void **)&buf);
+  conn->recv_avail -= buf->p->tot_len;
+    /* Register event with callback */
+    if (conn->callback)
+        (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, buf->p->tot_len);
   }
 
   
 
     
-  DEBUGF(API_LIB_DEBUG, ("netconn_recv: received %p (err %d)\n", buf, conn->err));
+  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_recv: received %p (err %d)\n", (void *)buf, conn->err));
 
 
   return buf;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_send(struct netconn *conn, struct netbuf *buf)
 {
   struct api_msg *msg;
 
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
 
-  if(conn->err != ERR_OK) {
+  if (conn->err != ERR_OK) {
     return conn->err;
   }
 
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return (conn->err = ERR_MEM);
   }
 
-  DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %d bytes\n", buf->p->tot_len));
+  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %d bytes\n", buf->p->tot_len));
   msg->type = API_MSG_SEND;
   msg->msg.conn = conn;
   msg->msg.msg.p = buf->p;
   api_msg_post(msg);
 
   sys_mbox_fetch(conn->mbox, NULL);
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_write(struct netconn *conn, void *dataptr, u16_t size, u8_t copy)
 {
   struct api_msg *msg;
   u16_t len;
   
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
 
-  if(conn->err != ERR_OK) {
+  if (conn->err != ERR_OK) {
     return conn->err;
   }
   
-  if(conn->sem == SYS_SEM_NULL) {
+  if (conn->sem == SYS_SEM_NULL) {
     conn->sem = sys_sem_new(0);
-    if(conn->sem == SYS_SEM_NULL) {
+    if (conn->sem == SYS_SEM_NULL) {
       return ERR_MEM;
     }
   }
 
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return (conn->err = ERR_MEM);
   }
   msg->type = API_MSG_WRITE;
@@ -553,36 +645,36 @@ netconn_write(struct netconn *conn, void *dataptr, u16_t size, u8_t copy)
         
 
   conn->state = NETCONN_WRITE;
-  while(conn->err == ERR_OK && size > 0) {
+  while (conn->err == ERR_OK && size > 0) {
     msg->msg.msg.w.dataptr = dataptr;
     msg->msg.msg.w.copy = copy;
     
-    if(conn->type == NETCONN_TCP) {
-      if(tcp_sndbuf(conn->pcb.tcp) == 0) {
-	sys_sem_wait(conn->sem);
-	if(conn->err != ERR_OK) {
-	  goto ret;
-	}
+    if (conn->type == NETCONN_TCP) {
+      if (tcp_sndbuf(conn->pcb.tcp) == 0) {
+  sys_sem_wait(conn->sem);
+  if (conn->err != ERR_OK) {
+    goto ret;
+  }
       }
-      if(size > tcp_sndbuf(conn->pcb.tcp)) {
-	/* We cannot send more than one send buffer's worth of data at a
-	   time. */
-	len = tcp_sndbuf(conn->pcb.tcp);
+      if (size > tcp_sndbuf(conn->pcb.tcp)) {
+  /* We cannot send more than one send buffer's worth of data at a
+     time. */
+  len = tcp_sndbuf(conn->pcb.tcp);
       } else {
-	len = size;
+  len = size;
       }
     } else {
       len = size;
     }
     
-    DEBUGF(API_LIB_DEBUG, ("netconn_write: writing %d bytes (%d)\n", len, copy));
+    LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_write: writing %d bytes (%d)\n", len, copy));
     msg->msg.msg.w.len = len;
     api_msg_post(msg);
     sys_mbox_fetch(conn->mbox, NULL);    
-    if(conn->err == ERR_OK) {
+    if (conn->err == ERR_OK) {
       dataptr = (void *)((char *)dataptr + len);
       size -= len;
-    } else if(conn->err == ERR_MEM) {
+    } else if (conn->err == ERR_MEM) {
       conn->err = ERR_OK;
       sys_sem_wait(conn->sem);
     } else {
@@ -590,24 +682,25 @@ netconn_write(struct netconn *conn, void *dataptr, u16_t size, u8_t copy)
     }
   }
  ret:
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   conn->state = NETCONN_NONE;
-  if(conn->sem != SYS_SEM_NULL) {
+  if (conn->sem != SYS_SEM_NULL) {
     sys_sem_free(conn->sem);
     conn->sem = SYS_SEM_NULL;
   }
+  
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_close(struct netconn *conn)
 {
   struct api_msg *msg;
 
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
-  if((msg = memp_mallocp(MEMP_API_MSG)) == NULL) {
+  if ((msg = memp_malloc(MEMP_API_MSG)) == NULL) {
     return (conn->err = ERR_MEM);
   }
 
@@ -617,23 +710,19 @@ netconn_close(struct netconn *conn)
   msg->msg.conn = conn;
   api_msg_post(msg);
   sys_mbox_fetch(conn->mbox, NULL);
-  if(conn->err == ERR_MEM &&
+  if (conn->err == ERR_MEM &&
      conn->sem != SYS_SEM_NULL) {
     sys_sem_wait(conn->sem);
     goto again;
   }
   conn->state = NETCONN_NONE;
-  memp_freep(MEMP_API_MSG, msg);
+  memp_free(MEMP_API_MSG, msg);
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 netconn_err(struct netconn *conn)
 {
   return conn->err;
 }
-/*-----------------------------------------------------------------------------------*/
-
-
-
 

src/api/api_msg.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -30,51 +30,61 @@
  *
  */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 #include "lwip/arch.h"
 #include "lwip/api_msg.h"
 #include "lwip/memp.h"
 #include "lwip/sys.h"
 #include "lwip/tcpip.h"
 
-/*-----------------------------------------------------------------------------------*/
-static err_t
-recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
+#if LWIP_RAW
+static int
+recv_raw(void *arg, struct raw_pcb *pcb, struct pbuf *p,
+    struct ip_addr *addr)
 {
+  struct netbuf *buf;
   struct netconn *conn;
 
   conn = arg;
+  if (!conn) return 0;
 
-  if(conn == NULL) {
-    pbuf_free(p);
-    return ERR_VAL;
+  if (conn->recvmbox != SYS_MBOX_NULL) {
+    if (!(buf = memp_malloc(MEMP_NETBUF))) {
+      return 0;
+    }
+    pbuf_ref(p);
+    buf->p = p;
+    buf->ptr = p;
+    buf->fromaddr = addr;
+    buf->fromport = pcb->protocol;
+
+    conn->recv_avail += p->tot_len;
+    /* Register event with callback */
+    if (conn->callback)
+        (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, p->tot_len);
+    sys_mbox_post(conn->recvmbox, buf);
   }
 
-  if(conn->recvmbox != SYS_MBOX_NULL) {
-    conn->err = err;
-    sys_mbox_post(conn->recvmbox, p);
-  }  
-  return ERR_OK;
+  return 0; /* do not eat the packet */
 }
-/*-----------------------------------------------------------------------------------*/
+#endif
 #if LWIP_UDP
 static void
 recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
-	 struct ip_addr *addr, u16_t port)
+   struct ip_addr *addr, u16_t port)
 {
   struct netbuf *buf;
   struct netconn *conn;
 
   conn = arg;
   
-  if(conn == NULL) {
+  if (conn == NULL) {
     pbuf_free(p);
     return;
   }
-
-  if(conn->recvmbox != SYS_MBOX_NULL) {
-    buf = memp_mallocp(MEMP_NETBUF);
-    if(buf == NULL) {
+  if (conn->recvmbox != SYS_MBOX_NULL) {
+    buf = memp_malloc(MEMP_NETBUF);
+    if (buf == NULL) {
       pbuf_free(p);
       return;
     } else {
@@ -83,38 +93,79 @@ recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
       buf->fromaddr = addr;
       buf->fromport = port;
     }
-    
+
+  conn->recv_avail += p->tot_len;
+    /* Register event with callback */
+    if (conn->callback)
+        (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, p->tot_len);
     sys_mbox_post(conn->recvmbox, buf);
   }
 }
 #endif /* LWIP_UDP */
-/*-----------------------------------------------------------------------------------*/
+#if LWIP_TCP
+
+static err_t
+recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
+{
+  struct netconn *conn;
+  u16_t len;
+  
+  conn = arg;
+
+  if (conn == NULL) {
+    pbuf_free(p);
+    return ERR_VAL;
+  }
+
+  if (conn->recvmbox != SYS_MBOX_NULL) {
+        
+    conn->err = err;
+    if (p != NULL) {
+        len = p->tot_len;
+        conn->recv_avail += len;
+    }
+    else
+        len = 0;
+    /* Register event with callback */
+    if (conn->callback)
+        (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, len);
+    sys_mbox_post(conn->recvmbox, p);
+  }  
+  return ERR_OK;
+}
+
+
 static err_t
 poll_tcp(void *arg, struct tcp_pcb *pcb)
 {
   struct netconn *conn;
 
   conn = arg;
-  if(conn != NULL &&
+  if (conn != NULL &&
      (conn->state == NETCONN_WRITE || conn->state == NETCONN_CLOSE) &&
      conn->sem != SYS_SEM_NULL) {
     sys_sem_signal(conn->sem);
   }
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+
 static err_t
 sent_tcp(void *arg, struct tcp_pcb *pcb, u16_t len)
 {
   struct netconn *conn;
 
   conn = arg;
-  if(conn != NULL && conn->sem != SYS_SEM_NULL) {
+  if (conn != NULL && conn->sem != SYS_SEM_NULL) {
     sys_sem_signal(conn->sem);
   }
+
+  if (conn && conn->callback)
+      if (tcp_sndbuf(conn->pcb.tcp) > TCP_SNDLOWAT)
+          (*conn->callback)(conn, NETCONN_EVT_SENDPLUS, len);
+  
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 err_tcp(void *arg, err_t err)
 {
@@ -126,20 +177,26 @@ err_tcp(void *arg, err_t err)
 
   
   conn->err = err;
-  if(conn->recvmbox != SYS_MBOX_NULL) {
+  if (conn->recvmbox != SYS_MBOX_NULL) {
+    /* Register event with callback */
+    if (conn->callback)
+      (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, 0);
     sys_mbox_post(conn->recvmbox, NULL);
   }
-  if(conn->mbox != SYS_MBOX_NULL) {
+  if (conn->mbox != SYS_MBOX_NULL) {
     sys_mbox_post(conn->mbox, NULL);
   }
-  if(conn->acceptmbox != SYS_MBOX_NULL) {
+  if (conn->acceptmbox != SYS_MBOX_NULL) {
+     /* Register event with callback */
+    if (conn->callback)
+      (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, 0);
     sys_mbox_post(conn->acceptmbox, NULL);
   }
-  if(conn->sem != SYS_SEM_NULL) {
+  if (conn->sem != SYS_SEM_NULL) {
     sys_sem_signal(conn->sem);
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 setup_tcp(struct netconn *conn)
 {
@@ -152,39 +209,41 @@ setup_tcp(struct netconn *conn)
   tcp_poll(pcb, poll_tcp, 4);
   tcp_err(pcb, err_tcp);
 }
-/*-----------------------------------------------------------------------------------*/
+
 static err_t
 accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
 {
-  sys_mbox_t *mbox;
+  sys_mbox_t mbox;
   struct netconn *newconn;
+  struct netconn *conn;
   
 #if API_MSG_DEBUG
 #if TCP_DEBUG
   tcp_debug_print_state(newpcb->state);
 #endif /* TCP_DEBUG */
 #endif /* API_MSG_DEBUG */
-  mbox = (sys_mbox_t *)arg;
-  newconn = memp_mallocp(MEMP_NETCONN);
-  if(newconn == NULL) {
+  conn = (struct netconn *)arg;
+  mbox = conn->acceptmbox;
+  newconn = memp_malloc(MEMP_NETCONN);
+  if (newconn == NULL) {
     return ERR_MEM;
   }
   newconn->type = NETCONN_TCP;
   newconn->pcb.tcp = newpcb;
   setup_tcp(newconn);
   newconn->recvmbox = sys_mbox_new();
-  if(newconn->recvmbox == SYS_MBOX_NULL) {
+  if (newconn->recvmbox == SYS_MBOX_NULL) {
     memp_free(MEMP_NETCONN, newconn);
     return ERR_MEM;
   }
   newconn->mbox = sys_mbox_new();
-  if(newconn->mbox == SYS_MBOX_NULL) {
+  if (newconn->mbox == SYS_MBOX_NULL) {
     sys_mbox_free(newconn->recvmbox);
     memp_free(MEMP_NETCONN, newconn);
     return ERR_MEM;
   }
   newconn->sem = sys_sem_new(0);
-  if(newconn->sem == SYS_SEM_NULL) {
+  if (newconn->sem == SYS_SEM_NULL) {
     sys_mbox_free(newconn->recvmbox);
     sys_mbox_free(newconn->mbox);
     memp_free(MEMP_NETCONN, newconn);
@@ -192,20 +251,97 @@ accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
   }
   newconn->acceptmbox = SYS_MBOX_NULL;
   newconn->err = err;
-  sys_mbox_post(*mbox, newconn);
+  /* Register event with callback */
+  if (conn->callback)
+  {
+    (*conn->callback)(conn, NETCONN_EVT_RCVPLUS, 0);
+    /* We have to set the callback here even though
+     * the new socket is unknown. Mark the socket as -1. */
+    newconn->callback = conn->callback;
+    newconn->socket = -1;
+  }
+  
+  sys_mbox_post(mbox, newconn);
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+#endif /* LWIP_TCP */
+
 static void
 do_newconn(struct api_msg_msg *msg)
 {
+   if(msg->conn->pcb.tcp != NULL) {
+   /* This "new" connection already has a PCB allocated. */
+   /* Is this an error condition? Should it be deleted? 
+      We currently just are happy and return. */
+     sys_mbox_post(msg->conn->mbox, NULL);
+     return;
+   }
+
+   msg->conn->err = ERR_OK;
+
+   /* Allocate a PCB for this connection */
+   switch(msg->conn->type) {
+#if LWIP_RAW
+   case NETCONN_RAW:
+      msg->conn->pcb.raw = raw_new(msg->msg.bc.port); /* misusing the port field */
+      raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
+     break;
+#endif
+#if LWIP_UDP
+   case NETCONN_UDPLITE:
+      msg->conn->pcb.udp = udp_new();
+      if(msg->conn->pcb.udp == NULL) {
+         msg->conn->err = ERR_MEM;
+         break;
+      }
+      udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_UDPLITE);
+      udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
+      break;
+   case NETCONN_UDPNOCHKSUM:
+      msg->conn->pcb.udp = udp_new();
+      if(msg->conn->pcb.udp == NULL) {
+         msg->conn->err = ERR_MEM;
+         break;
+      }
+      udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_NOCHKSUM);
+      udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
+      break;
+   case NETCONN_UDP:
+      msg->conn->pcb.udp = udp_new();
+      if(msg->conn->pcb.udp == NULL) {
+         msg->conn->err = ERR_MEM;
+         break;
+      }
+      udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
+      break;
+#endif /* LWIP_UDP */
+#if LWIP_TCP
+   case NETCONN_TCP:
+      msg->conn->pcb.tcp = tcp_new();
+      if(msg->conn->pcb.tcp == NULL) {
+         msg->conn->err = ERR_MEM;
+         break;
+      }
+      setup_tcp(msg->conn);
+      break;
+#endif
+   }
+   
+  
+  sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
+
 static void
 do_delconn(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      raw_remove(msg->conn->pcb.raw);
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
@@ -216,33 +352,50 @@ do_delconn(struct api_msg_msg *msg)
       udp_remove(msg->conn->pcb.udp);
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP      
     case NETCONN_TCP:
-      if(msg->conn->pcb.tcp->state == LISTEN) {
-	tcp_accept(msg->conn->pcb.tcp, NULL);	
-	tcp_close(msg->conn->pcb.tcp);
+      if (msg->conn->pcb.tcp->state == LISTEN) {
+  tcp_arg(msg->conn->pcb.tcp, NULL);
+  tcp_accept(msg->conn->pcb.tcp, NULL);  
+  tcp_close(msg->conn->pcb.tcp);
       } else {
-	tcp_arg(msg->conn->pcb.tcp, NULL);
-	tcp_sent(msg->conn->pcb.tcp, NULL);
-	tcp_recv(msg->conn->pcb.tcp, NULL);	
-	tcp_poll(msg->conn->pcb.tcp, NULL, 0);
-	tcp_err(msg->conn->pcb.tcp, NULL);
-	if(tcp_close(msg->conn->pcb.tcp) != ERR_OK) {
-	  tcp_abort(msg->conn->pcb.tcp);
-	}
+  tcp_arg(msg->conn->pcb.tcp, NULL);
+  tcp_sent(msg->conn->pcb.tcp, NULL);
+  tcp_recv(msg->conn->pcb.tcp, NULL);  
+  tcp_poll(msg->conn->pcb.tcp, NULL, 0);
+  tcp_err(msg->conn->pcb.tcp, NULL);
+  if (tcp_close(msg->conn->pcb.tcp) != ERR_OK) {
+    tcp_abort(msg->conn->pcb.tcp);
+  }
       }
+#endif
+    default:  
     break;
     }
   }
-  if(msg->conn->mbox != SYS_MBOX_NULL) {
+  /* Trigger select() in socket layer */
+  if (msg->conn->callback)
+  {
+      (*msg->conn->callback)(msg->conn, NETCONN_EVT_RCVPLUS, 0);
+      (*msg->conn->callback)(msg->conn, NETCONN_EVT_SENDPLUS, 0);
+  }
+  
+  if (msg->conn->mbox != SYS_MBOX_NULL) {
     sys_mbox_post(msg->conn->mbox, NULL);
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_bind(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp == NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp == NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      msg->conn->pcb.raw = raw_new(msg->msg.bc.port); /* misusing the port field as protocol */
+      raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       msg->conn->pcb.udp = udp_new();
@@ -259,30 +412,42 @@ do_bind(struct api_msg_msg *msg)
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_new();
       setup_tcp(msg->conn);
-      break;
+#endif /* LWIP_TCP */
+    default:  
+    break;
     }
   }
-  switch(msg->conn->type) {
+  switch (msg->conn->type) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    msg->conn->err = raw_bind(msg->conn->pcb.raw,msg->msg.bc.ipaddr);
+    break;
+#endif
 #if LWIP_UDP
   case NETCONN_UDPLITE:
     /* FALLTHROUGH */
   case NETCONN_UDPNOCHKSUM:
     /* FALLTHROUGH */
   case NETCONN_UDP:
-    udp_bind(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
+    msg->conn->err = udp_bind(msg->conn->pcb.udp, msg->msg.bc.ipaddr, msg->msg.bc.port);
     break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP
   case NETCONN_TCP:
     msg->conn->err = tcp_bind(msg->conn->pcb.tcp,
-			      msg->msg.bc.ipaddr, msg->msg.bc.port);
+            msg->msg.bc.ipaddr, msg->msg.bc.port);
+#endif /* LWIP_TCP */
+  default:
     break;
   }
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+#if LWIP_TCP
+
 static err_t
 do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
 {
@@ -290,67 +455,81 @@ do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
 
   conn = arg;
 
-  if(conn == NULL) {
+  if (conn == NULL) {
     return ERR_VAL;
   }
   
   conn->err = err;
-
-  if(conn->type == NETCONN_TCP && err == ERR_OK) {
+  if (conn->type == NETCONN_TCP && err == ERR_OK) {
     setup_tcp(conn);
   }    
-  
   sys_mbox_post(conn->mbox, NULL);
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+#endif  
+
 static void
 do_connect(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp == NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp == NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      msg->conn->pcb.raw = raw_new(msg->msg.bc.port); /* misusing the port field as protocol */
+      raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       msg->conn->pcb.udp = udp_new();
-      if(msg->conn->pcb.udp == NULL) {
-	msg->conn->err = ERR_MEM;
-	sys_mbox_post(msg->conn->mbox, NULL);
-	return;
+      if (msg->conn->pcb.udp == NULL) {
+  msg->conn->err = ERR_MEM;
+  sys_mbox_post(msg->conn->mbox, NULL);
+  return;
       }
       udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_UDPLITE);
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
     case NETCONN_UDPNOCHKSUM:
       msg->conn->pcb.udp = udp_new();
-      if(msg->conn->pcb.udp == NULL) {
-	msg->conn->err = ERR_MEM;
-	sys_mbox_post(msg->conn->mbox, NULL);
-	return;
+      if (msg->conn->pcb.udp == NULL) {
+  msg->conn->err = ERR_MEM;
+  sys_mbox_post(msg->conn->mbox, NULL);
+  return;
       }
       udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_NOCHKSUM);
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
     case NETCONN_UDP:
       msg->conn->pcb.udp = udp_new();
-      if(msg->conn->pcb.udp == NULL) {
-	msg->conn->err = ERR_MEM;
-	sys_mbox_post(msg->conn->mbox, NULL);
-	return;
+      if (msg->conn->pcb.udp == NULL) {
+  msg->conn->err = ERR_MEM;
+  sys_mbox_post(msg->conn->mbox, NULL);
+  return;
       }
       udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_new();      
-      if(msg->conn->pcb.tcp == NULL) {
-	msg->conn->err = ERR_MEM;
-	sys_mbox_post(msg->conn->mbox, NULL);
-	return;
+      if (msg->conn->pcb.tcp == NULL) {
+  msg->conn->err = ERR_MEM;
+  sys_mbox_post(msg->conn->mbox, NULL);
+  return;
       }
+#endif
+    default:
       break;
     }
   }
-  switch(msg->conn->type) {
+  switch (msg->conn->type) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    raw_connect(msg->conn->pcb.raw, msg->msg.bc.ipaddr);
+    sys_mbox_post(msg->conn->mbox, NULL);
+    break;
+#endif
 #if LWIP_UDP
   case NETCONN_UDPLITE:
     /* FALLTHROUGH */
@@ -361,63 +540,106 @@ do_connect(struct api_msg_msg *msg)
     sys_mbox_post(msg->conn->mbox, NULL);
     break;
 #endif 
+#if LWIP_TCP      
   case NETCONN_TCP:
     /*    tcp_arg(msg->conn->pcb.tcp, msg->conn);*/
     setup_tcp(msg->conn);
     tcp_connect(msg->conn->pcb.tcp, msg->msg.bc.ipaddr, msg->msg.bc.port,
-		do_connected);
+    do_connected);
     /*tcp_output(msg->conn->pcb.tcp);*/
+#endif
+
+  default:
     break;
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
+static void
+do_disconnect(struct api_msg_msg *msg)
+{
+
+  switch (msg->conn->type) {
+#if LWIP_RAW
+  case NETCONN_RAW:
+    /* Do nothing as connecting is only a helper for upper lwip layers */
+    break;
+#endif
+#if LWIP_UDP
+  case NETCONN_UDPLITE:
+    /* FALLTHROUGH */
+  case NETCONN_UDPNOCHKSUM:
+    /* FALLTHROUGH */
+  case NETCONN_UDP:
+    udp_disconnect(msg->conn->pcb.udp);
+    break;
+#endif 
+  case NETCONN_TCP:
+    break;
+  }
+  sys_mbox_post(msg->conn->mbox, NULL);
+}
+
+
 static void
 do_listen(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      LWIP_DEBUGF(API_MSG_DEBUG, ("api_msg: listen RAW: cannot listen for RAW.\n"));
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
       /* FALLTHROUGH */
     case NETCONN_UDP:
-      DEBUGF(API_MSG_DEBUG, ("api_msg: listen UDP: cannot listen for UDP.\n"));
+      LWIP_DEBUGF(API_MSG_DEBUG, ("api_msg: listen UDP: cannot listen for UDP.\n"));
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP      
     case NETCONN_TCP:
       msg->conn->pcb.tcp = tcp_listen(msg->conn->pcb.tcp);
-      if(msg->conn->pcb.tcp == NULL) {
-	msg->conn->err = ERR_MEM;
+      if (msg->conn->pcb.tcp == NULL) {
+  msg->conn->err = ERR_MEM;
       } else {
-	if(msg->conn->acceptmbox == SYS_MBOX_NULL) {
-	  msg->conn->acceptmbox = sys_mbox_new();
-	  if(msg->conn->acceptmbox == SYS_MBOX_NULL) {
-	    msg->conn->err = ERR_MEM;
-	    break;
-	  }
-	}
-	tcp_arg(msg->conn->pcb.tcp, (void *)&(msg->conn->acceptmbox));
-	tcp_accept(msg->conn->pcb.tcp, accept_function);
+  if (msg->conn->acceptmbox == SYS_MBOX_NULL) {
+    msg->conn->acceptmbox = sys_mbox_new();
+    if (msg->conn->acceptmbox == SYS_MBOX_NULL) {
+      msg->conn->err = ERR_MEM;
+      break;
+    }
+  }
+  tcp_arg(msg->conn->pcb.tcp, msg->conn);
+  tcp_accept(msg->conn->pcb.tcp, accept_function);
       }
+#endif
+    default:
       break;
     }
   }
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_accept(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      LWIP_DEBUGF(API_MSG_DEBUG, ("api_msg: accept RAW: cannot accept for RAW.\n"));
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
     case NETCONN_UDPNOCHKSUM:
       /* FALLTHROUGH */
     case NETCONN_UDP:    
-      DEBUGF(API_MSG_DEBUG, ("api_msg: accept UDP: cannot accept for UDP.\n"));
+      LWIP_DEBUGF(API_MSG_DEBUG, ("api_msg: accept UDP: cannot accept for UDP.\n"));
       break;
 #endif /* LWIP_UDP */
     case NETCONN_TCP:
@@ -425,12 +647,17 @@ do_accept(struct api_msg_msg *msg)
     }
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_send(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      raw_send(msg->conn->pcb.raw, msg->msg.p);
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
@@ -446,24 +673,33 @@ do_send(struct api_msg_msg *msg)
   }
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_recv(struct api_msg_msg *msg)
 {
-  if(msg->conn->pcb.tcp != NULL) {
-    if(msg->conn->type == NETCONN_TCP) {
+#if LWIP_TCP
+  if (msg->conn->pcb.tcp != NULL) {
+    if (msg->conn->type == NETCONN_TCP) {
       tcp_recved(msg->conn->pcb.tcp, msg->msg.len);
     }
   }
+#endif  
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_write(struct api_msg_msg *msg)
 {
+#if LWIP_TCP  
   err_t err;
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+#endif  
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      msg->conn->err = ERR_VAL;
+      break;
+#endif
 #if LWIP_UDP 
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
@@ -473,29 +709,45 @@ do_write(struct api_msg_msg *msg)
       msg->conn->err = ERR_VAL;
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP 
     case NETCONN_TCP:      
       err = tcp_write(msg->conn->pcb.tcp, msg->msg.w.dataptr,
                       msg->msg.w.len, msg->msg.w.copy);
       /* This is the Nagle algorithm: inhibit the sending of new TCP
-	 segments when new outgoing data arrives from the user if any
-	 previously transmitted data on the connection remains
-	 unacknowledged. */
-      if(err == ERR_OK && msg->conn->pcb.tcp->unacked == NULL) {
-	tcp_output(msg->conn->pcb.tcp);
+   segments when new outgoing data arrives from the user if any
+   previously transmitted data on the connection remains
+   unacknowledged. */
+      if(err == ERR_OK && (msg->conn->pcb.tcp->unacked == NULL || (msg->conn->pcb.tcp->flags & TF_NODELAY)) ) {
+  tcp_output(msg->conn->pcb.tcp);
       }
       msg->conn->err = err;
+      if (msg->conn->callback)
+          if (err == ERR_OK)
+          {
+              if (tcp_sndbuf(msg->conn->pcb.tcp) <= TCP_SNDLOWAT)
+                  (*msg->conn->callback)(msg->conn, NETCONN_EVT_SENDMINUS, msg->msg.w.len);
+          }
+#endif
+    default:
       break;
     }
   }
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 static void
 do_close(struct api_msg_msg *msg)
 {
   err_t err;
-  if(msg->conn->pcb.tcp != NULL) {
-    switch(msg->conn->type) {
+
+  err = ERR_OK;
+
+  if (msg->conn->pcb.tcp != NULL) {
+    switch (msg->conn->type) {
+#if LWIP_RAW
+    case NETCONN_RAW:
+      break;
+#endif
 #if LWIP_UDP
     case NETCONN_UDPLITE:
       /* FALLTHROUGH */
@@ -504,23 +756,27 @@ do_close(struct api_msg_msg *msg)
     case NETCONN_UDP:
       break;
 #endif /* LWIP_UDP */
+#if LWIP_TCP
     case NETCONN_TCP:
-      if(msg->conn->pcb.tcp->state == LISTEN) {
-	err = tcp_close(msg->conn->pcb.tcp);
+      if (msg->conn->pcb.tcp->state == LISTEN) {
+  err = tcp_close(msg->conn->pcb.tcp);
       }
       msg->conn->err = err;      
+#endif
+    default:      
       break;
     }
   }
   sys_mbox_post(msg->conn->mbox, NULL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 typedef void (* api_msg_decode)(struct api_msg_msg *msg);
 static api_msg_decode decode[API_MSG_MAX] = {
   do_newconn,
   do_delconn,
   do_bind,
   do_connect,
+  do_disconnect,
   do_listen,
   do_accept,
   do_send,
@@ -533,12 +789,12 @@ api_msg_input(struct api_msg *msg)
 {  
   decode[msg->type](&(msg->msg));
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 api_msg_post(struct api_msg *msg)
 {
   tcpip_apimsg(msg);
 }
-/*-----------------------------------------------------------------------------------*/
+
 
 

src/api/err.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -35,25 +35,25 @@
 #ifdef LWIP_DEBUG
 
 static char *err_strerr[] = {"Ok.",
-			     "Out of memory error.",
-			     "Buffer error.",
-			     "Connection aborted.",
-			     "Connection reset.",
-			     "Connection closed.",
-			     "Not connected.",
-			     "Illegal value.",
-			     "Illegal argument.",
-			     "Routing problem.",
-			     "Address in use."
+           "Out of memory error.",
+           "Buffer error.",
+           "Connection aborted.",
+           "Connection reset.",
+           "Connection closed.",
+           "Not connected.",
+           "Illegal value.",
+           "Illegal argument.",
+           "Routing problem.",
+           "Address in use."
 };
 
-/*-----------------------------------------------------------------------------------*/
+
 char *
 lwip_strerr(err_t err)
 {
   return err_strerr[-err];
 
 }
-/*-----------------------------------------------------------------------------------*/
+
 
 #endif /* LWIP_DEBUG */

src/api/tcpip.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -30,8 +30,6 @@
  *
  */
 
-#include "lwip/debug.h"
-
 #include "lwip/opt.h"
 
 #include "lwip/sys.h"
@@ -48,56 +46,81 @@
 static void (* tcpip_init_done)(void *arg) = NULL;
 static void *tcpip_init_done_arg;
 static sys_mbox_t mbox;
+#if LWIP_TCP
+static int tcpip_tcp_timer_active = 0;
+
+
 
-/*-----------------------------------------------------------------------------------*/
 static void
 tcpip_tcp_timer(void *arg)
 {
+  (void)arg;
+
   tcp_tmr();
-  sys_timeout(TCP_TMR_INTERVAL, (sys_timeout_handler)tcpip_tcp_timer, NULL);
+  if (tcp_active_pcbs || tcp_tw_pcbs) {
+    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
+  } else {
+  tcpip_tcp_timer_active = 0;
+  }
 }
-/*-----------------------------------------------------------------------------------*/
+
+void
+tcp_timer_needed(void)
+{
+  if (!tcpip_tcp_timer_active && (tcp_active_pcbs || tcp_tw_pcbs)) {
+  tcpip_tcp_timer_active = 1;
+    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
+  }
+}
+#endif /* LWIP_TCP */
 
 static void
 tcpip_thread(void *arg)
 {
   struct tcpip_msg *msg;
 
-  ip_init();
-  udp_init();
-  tcp_init();
+  (void)arg;
 
-  sys_timeout(TCP_TMR_INTERVAL, (sys_timeout_handler)tcpip_tcp_timer, NULL);
-  
-  if(tcpip_init_done != NULL) {
+  ip_init();
+#if LWIP_UDP  
+  udp_init();
+#endif
+#if LWIP_TCP
+  tcp_init();
+#endif
+  if (tcpip_init_done != NULL) {
     tcpip_init_done(tcpip_init_done_arg);
   }
 
-  while(1) {                          /* MAIN Loop */
+  while (1) {                          /* MAIN Loop */
     sys_mbox_fetch(mbox, (void *)&msg);
-    switch(msg->type) {
+    switch (msg->type) {
     case TCPIP_MSG_API:
-      DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", msg));
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", (void *)msg));
       api_msg_input(msg->msg.apimsg);
       break;
     case TCPIP_MSG_INPUT:
-      DEBUGF(TCPIP_DEBUG, ("tcpip_thread: IP packet %p\n", msg));
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: IP packet %p\n", (void *)msg));
       ip_input(msg->msg.inp.p, msg->msg.inp.netif);
       break;
+    case TCPIP_MSG_CALLBACK:
+      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK %p\n", (void *)msg));
+      msg->msg.cb.f(msg->msg.cb.ctx);
+      break;
     default:
       break;
     }
-    memp_freep(MEMP_TCPIP_MSG, msg);
+    memp_free(MEMP_TCPIP_MSG, msg);
   }
 }
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 tcpip_input(struct pbuf *p, struct netif *inp)
 {
   struct tcpip_msg *msg;
   
-  msg = memp_mallocp(MEMP_TCPIP_MSG);
-  if(msg == NULL) {
+  msg = memp_malloc(MEMP_TCPIP_MSG);
+  if (msg == NULL) {
     pbuf_free(p);    
     return ERR_MEM;  
   }
@@ -108,13 +131,30 @@ tcpip_input(struct pbuf *p, struct netif *inp)
   sys_mbox_post(mbox, msg);
   return ERR_OK;
 }
-/*-----------------------------------------------------------------------------------*/
+
+err_t
+tcpip_callback(void (*f)(void *ctx), void *ctx)
+{
+  struct tcpip_msg *msg;
+  
+  msg = memp_malloc(MEMP_TCPIP_MSG);
+  if (msg == NULL) {
+    return ERR_MEM;  
+  }
+  
+  msg->type = TCPIP_MSG_CALLBACK;
+  msg->msg.cb.f = f;
+  msg->msg.cb.ctx = ctx;
+  sys_mbox_post(mbox, msg);
+  return ERR_OK;
+}
+
 void
 tcpip_apimsg(struct api_msg *apimsg)
 {
   struct tcpip_msg *msg;
-  msg = memp_mallocp(MEMP_TCPIP_MSG);
-  if(msg == NULL) {
+  msg = memp_malloc(MEMP_TCPIP_MSG);
+  if (msg == NULL) {
     memp_free(MEMP_API_MSG, apimsg);
     return;
   }
@@ -122,16 +162,16 @@ tcpip_apimsg(struct api_msg *apimsg)
   msg->msg.apimsg = apimsg;
   sys_mbox_post(mbox, msg);
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 tcpip_init(void (* initfunc)(void *), void *arg)
 {
   tcpip_init_done = initfunc;
   tcpip_init_done_arg = arg;
   mbox = sys_mbox_new();
-  sys_thread_new((void *)tcpip_thread, NULL);
+  sys_thread_new(tcpip_thread, NULL, TCPIP_THREAD_PRIO);
 }
-/*-----------------------------------------------------------------------------------*/
+
 
 
 

src/arch/6502/README

@@ -1 +0,0 @@
-The 6502 code is far from complete.

src/arch/6502/include/arch/cc.h

@@ -1,47 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __CC_H__
-#define __CC_H__
-
-typedef unsigned   char    u8_t;
-typedef signed     char    s8_t;
-typedef unsigned   short   u16_t;
-typedef signed     short   s16_t;
-typedef unsigned   long    u32_t;
-typedef signed     long    s32_t;
-
-#define PACK_STRUCT_BEGIN
-#define PACK_STRUCT_STRUCT
-#define PACK_STRUCT_END
-#define PACK_STRUCT_FIELD(x) x
-
-#endif /* __CC_H__ */

src/arch/6502/include/arch/cpu.h

@@ -1,37 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __CPU_H__
-#define __CPU_H__
-
-#define BYTE_ORDER LITTLE_ENDIAN
-
-#endif /* __CPU_H__ */

src/arch/6502/include/arch/lib.h

@@ -1,40 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __LIB_H__
-#define __LIB_H__
-
-int strlen(const char *str);
-int strncmp(const char *str1, const char *str2, int len);
-void bcopy(const void *src, void *dest, int len);
-void bzero(void *data, int n);
-
-#endif /* __LIB_H__ */

src/arch/6502/include/arch/perf.h

@@ -1,38 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __PERF_H__
-#define __PERF_H__
-
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-
-#endif /* __PERF_H__ */

src/arch/6502/include/arch/sys_arch.h

@@ -1,41 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __SYS_C64_H__
-#define __SYS_C64_H__
-
-#define SYS_MBOX_NULL 0
-
-typedef int sys_sem_t;
-typedef int sys_mbox_t;
-typedef int sys_thread_t;
-
-#endif /* __SYS_C64_H__ */

src/arch/6502/lib_arch.c

@@ -1,63 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-/* These are generic implementations of various library functions used
- * throughout the lwIP code. When porting, those should be optimized
- * for the particular processor architecture, preferably coded in
- * assembler.
- */
-
-#include "lwip/arch.h"
-
-/*-----------------------------------------------------------------------------------*/
-void
-bcopy(const void *src, void *dst, unsigned int size)
-{
-  char *csrc, *cdst;
-  unsigned int i;
-
-  csrc = (char *)src;
-  cdst = dst;
-  
-  for(i = 0; i < size; ++i) {
-    cdst[i] = csrc[i];
-  }    
-}
-/*-----------------------------------------------------------------------------------*/
-void
-bzero(void *s, int n)
-{
-  for(--n ;n >= 0; --n) {
-    ((char *)s)[n] = 0;
-  }
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/6502/sys_c64.c

@@ -1,120 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include <c64.h>
-#include <time.h>
-
-#include "lwip/sys.h"
-#include "lwip/def.h"
-
-struct sys_timeouts timeouts;
-
-/*-----------------------------------------------------------------------------------*/
-void
-sys_arch_block(u16_t time)
-{
-  u16_t ticks;
-  
-  ticks = time * (CLK_TCK / 1000) + clock();
-  printf("ticks %d\n", ticks);
-
-  while(clock() != ticks);  
-}
-/*-----------------------------------------------------------------------------------*/
-sys_mbox_t
-sys_mbox_new(void)
-{
-  return SYS_MBOX_NULL;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_free(sys_mbox_t mbox)
-{
-  return;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_post(sys_mbox_t mbox, void *data)
-{
-  return;
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t 
-sys_arch_mbox_fetch(sys_mbox_t mbox, void **data, u16_t timeout)
-{
-  sys_arch_block(timeout);
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-sys_sem_t
-sys_sem_new(u8_t count)
-{
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t
-sys_arch_sem_wait(sys_sem_t sem, u16_t timeout)
-{
-  sys_arch_block(timeout);
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_signal(sys_sem_t sem)
-{
-  return;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_free(sys_sem_t sem)
-{
-  return;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_init(void)
-{
-  timeouts.next = NULL;
-  return;
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_timeouts *
-sys_arch_timeouts(void)
-{
-  return &timeouts;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_thread_new(void (* function)(void *arg), void *arg)
-{
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/FILES

@@ -1,15 +0,0 @@
-6502/      - Architectural files for the 6502 CPU.
-
-rtxc/      - Architectural files for the RTXC operating system.
-
-unix/      - Architectural files for testing on unix-like systems
-             (assuming gcc and pthreads).
-
-Each subdirectory (may) also include:
-
-perf.c     - Optional file that should be implemented when running
-             performance tests of lwIP.
-
-sys.c      - Implementation of the operating system emulation layer.
-
-netif/	   - Architectural specific network interfaces.

src/arch/rtxc/include/arch/cc.h

@@ -1,47 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __CC_H__
-#define __CC_H__
-
-typedef unsigned   char    u8_t;
-typedef signed     char    s8_t;
-typedef unsigned   short   u16_t;
-typedef signed     short   s16_t;
-typedef unsigned   long    u32_t;
-typedef signed     long    s32_t;
-
-#define PACK_STRUCT_BEGIN
-#define PACK_STRUCT_STRUCT
-#define PACK_STRUCT_END
-#define PACK_STRUCT_FIELD(x) x
-
-#endif /* __CC_H__ */

src/arch/rtxc/include/arch/cpu.h

@@ -1,37 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __CPU_H__
-#define __CPU_H__
-
-#define BYTE_ORDER LITTLE_ENDIAN
-
-#endif /* __CPU_H__ */

src/arch/rtxc/include/arch/lib.h

@@ -1,40 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __LIB_H__
-#define __LIB_H__
-
-#include <string.h>
-
-#define bcopy(s, d, l) memcpy(d, s, l)
-#define bzero(d, l)    memset(d, 0, l)
-
-#endif /* __LIB_H__ */

src/arch/rtxc/include/arch/perf.h

@@ -1,38 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __PERF_H__
-#define __PERF_H__
-
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-
-#endif /* __PERF_H__ */

src/arch/rtxc/include/arch/sys_arch.h

@@ -1,45 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __SYS_RTXC_H__
-#define __SYS_RTXC_H__
-
-#include "rtxcapi.h"
-
-#define SYS_MBOX_NULL (QUEUE)0
-#define SYS_SEM_NULL  (SEMA)0
-
-typedef SEMA sys_sem_t;
-typedef QUEUE sys_mbox_t;
-typedef TASK sys_thread_t;
-
-#endif /* __SYS_RTXC_H__ */
-

src/arch/rtxc/include/netif/cs8900if.h

@@ -1,41 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __NETIF_CS8900IF_H__
-#define __NETIF_CS8900IF_H__
-
-#include "lwip/netif.h"
-
-void cs8900if_init(struct netif *);
-u8_t cs8900if_poll(struct netif *);
-void cs8900if_input(struct netif *); 
-
-#endif /* __NETIF_CS8900IF_H__ */

src/arch/rtxc/include/netif/sioslipif.h

@@ -1,39 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __NETIF_SIOSLIPIF_H__
-#define __NETIF_SIOSLIPIF_H__
-
-#include "lwip/netif.h"
-
-void sioslipif_init(struct netif *);
-
-#endif /* __NETIF_SIOSLIPIF_H__ */

src/arch/rtxc/lib.c

@@ -1,63 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-/* These are generic implementations of various library functions used
- * throughout the lwIP code. When porting, those should be optimized
- * for the particular processor architecture, preferably coded in
- * assembler.
- */
-
-#if 0 /* Define to 1 if these are really needed. */
-/*-----------------------------------------------------------------------------------*/
-void
-bcopy(const void *src, void *dst, unsigned int size)
-{
-  char *csrc, *cdst;
-  unsigned int i;
-
-  csrc = (char *)src;
-  cdst = dst;
-  
-  for(i = 0; i < size; ++i) {
-    cdst[i] = csrc[i];
-  }    
-}
-/*-----------------------------------------------------------------------------------*/
-void
-bzero(void *s, int n)
-{
-  for(--n ;n >= 0; --n) {
-    ((char *)s)[n] = 0;
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-#endif /* 0 */

src/arch/rtxc/netif/FILES

@@ -1 +0,0 @@
-sioslipif.c - Implementation of the SLIP protocol on top of a serial line.

src/arch/rtxc/netif/sioslipif.c

@@ -1,170 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-#include "lwip/def.h"
-#include "netif/sioslipif.h"
-#include "lwip/pbuf.h"
-#include "lwip/sys.h"
-
-#define SLIP_END     0300
-#define SLIP_ESC     0333
-#define SLIP_ESC_END 0334
-#define SLIP_ESC_ESC 0335
-
-/* This variable is used for passing the netif pointer between the
-   threads. */
-static struct netif *netif_pass;
-
-static int infd, outfd;
-/*-----------------------------------------------------------------------------------*/
-static void
-sio_send(u8_t c)
-{
-  write(outfd, &c, 1);
-}
-/*-----------------------------------------------------------------------------------*/
-static u8_t
-sio_recv(void)
-{
-  u8_t c;
-  read(infd, &c, 1);
-  return c;
-}
-/*-----------------------------------------------------------------------------------*/
-static int
-sioslipif_output(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr)
-{
-  struct pbuf *q;
-  int i;
-  u8_t c;
-  
-  /* Send pbuf out on the serial I/O device. */
-  sio_send(SLIP_END);
-  
-  for(q = p; q != NULL; q = q->next) {
-    for(i = 0; i < q->len; i++) {
-      c = ((u8_t *)q->payload)[i];
-      switch(c) {
-      case SLIP_END:
-        sio_send(SLIP_ESC);
-        sio_send(SLIP_ESC_END);
-        break;
-      case SLIP_ESC:
-        sio_send(SLIP_ESC);
-        sio_send(SLIP_ESC_ESC);
-        break;
-      default:
-        sio_send(c);
-        break;
-      }
-    }
-  }
-  sio_send(SLIP_END);
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-static struct pbuf *
-sioslipif_input(void)
-{
-  u8_t c;
-  struct pbuf *p, *q;
-  int recved;
-  int i;
-
-  p = pbuf_alloc(PBUF_LINK, PBUF_MAX_SIZE, PBUF_POOL);
-  q = p;
-  recved = i = 0;
-  
-  while(1) {
-    c = sio_recv();
-    switch(c) {
-    case SLIP_END:
-      if(recved > 0) {
-        /* Received whole packet. */
-        pbuf_realloc(p, recved);
-        return p;
-      }
-      break;
-    case SLIP_ESC:
-      c = sio_recv();
-      switch(c) {
-      case SLIP_ESC_END:
-        c = SLIP_END;
-        break;
-      case SLIP_ESC_ESC:
-        c = SLIP_ESC;
-        break;
-      }
-      /* FALLTHROUGH */
-    default:
-      if(recved < p->tot_len && q != NULL) {
-        ((u8_t *)q->payload)[i] = c;
-        recved++;
-        i++;
-        if(i >= q->len) {
-          i = 0;
-          q = q->next;
-        }
-      }
-      break;
-    }
-    
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-sioslipif_loop(void)
-{
-  struct pbuf *p;
-  struct netif *netif;
-
-  netif = netif_pass;
-  while(1) {
-    p = sioslipif_input();    
-    netif->input(p, netif);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sioslipif_init(struct netif *netif)
-{
-  netif->state = NULL;
-  netif->name[0] = 's';
-  netif->name[1] = 'l';
-  netif->output = sioslipif_output;
-
-  netif_pass = netif;
-  sys_thread_new((void *)sioslipif_loop, NULL);
-  /* Do some magic to make it possible to receive data from the serial I/O device. */
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/rtxc/perf.c

@@ -1,38 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "arch/perf.h"
-
-void
-perf_init(char *fname)
-{
-}

src/arch/rtxc/sys_arch.c

@@ -1,271 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include "lwip/def.h"
-#include "lwip/sys.h"
-#include "lwip/mem.h"
-
-#include "rtxcapi.h"
-#include "csema.h"
-#include "cclock.h"
-#include "cqueue.h"
-#include "cres.h"
-#include "cpart.h"
-#include "ctask.h"
-
-struct timeoutlist {
-  struct sys_timeouts timeouts;
-  TASK pid;
-};
-
-#define SYS_THREAD_MAX 2
-
-static struct timeoutlist timeoutlist[SYS_THREAD_MAX];
-static u16_t nextthread = 0;
-
-/*-----------------------------------------------------------------------------------*/
-sys_mbox_t
-sys_mbox_new(void)
-{
-  QUEUE mbox;  
-  KS_dequeuew(IP_MBOXQ, &mbox);
-  KS_purgequeue(mbox);
-  return mbox;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_free(sys_mbox_t mbox)
-{
-  KS_enqueue(IP_MBOXQ, &mbox);
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_post(sys_mbox_t mbox, void *data)
-{
-  if(KS_enqueue(mbox, &data) != RC_GOOD) {
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t
-sys_arch_mbox_fetch(sys_mbox_t mbox, void **data, u16_t timeout)
-{
-  KSRC ret;
-  u16_t wtime = 1;
-  
-  if(timeout == 0) {
-    DEBUGF(SYS_DEBUG, ("PID: %d sys_mbox_fetch: without timeouts\n",KS_inqtask()));
-    KS_dequeuew(mbox, data);
-    
-  } else { 
-  
-    ret = KS_dequeuet(mbox, data, (TICKS)timeout/CLKTICK);
-    if(ret == RC_TIMEOUT) {
-      /* The call timed out, so we return 0. */
-      wtime = 0;
-    } else {
-      /* Calculate time we waited for the message to arrive. */
-      
-      /* XXX: we cheat and just pretend that we waited for half the timeout value! */
-      wtime = timeout / 2;
-      
-      /* Make sure we don't return 0 here. */
-      if(wtime == 0) {
-	wtime = 1;
-      }
-    }
-  }
-  return wtime;
-}
-/*-----------------------------------------------------------------------------------*/
-sys_sem_t
-sys_sem_new(u8_t count)
-{
-  SEMA sem;
-  KS_dequeuew(IP_SEMQ, &sem);
-  KS_pend(sem);
-  if(count > 0) {
-    KS_signal(sem);
-  }
-  return sem;
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t
-sys_arch_sem_wait(sys_sem_t sem, u16_t timeout)
-{
-  KSRC ret;
-  u16_t wtime = 1;
-  
-  if(timeout == 0) {
-    DEBUGF(SYS_DEBUG, ("PID: %d sys_mbox_fetch: without timeouts\n",KS_inqtask()));
-    KS_wait(sem);
-    
-  } else { 
-    ret = KS_waitt(sem, (TICKS)timeout/CLKTICK);  
-    if(ret == RC_TIMEOUT) {
-      /* The call timed out, so we return 0. */
-      wtime = 0;
-    } else {
-      /* Calculate time we waited for the message to arrive. */
-      
-      /* XXX: we cheat and just pretend that we waited for half the timeout value! */
-      wtime = timeout / 2;
-      
-      /* Make sure we don't return 0 here. */
-      if(wtime == 0) {
-	wtime = 1;
-      }
-    }
-  }
-  return wtime;
-
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_signal(sys_sem_t sem)
-{
-  KS_signal(sem);
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_free(sys_sem_t sem)
-{
-  KS_enqueue(IP_SEMQ, &sem);
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_init(void)
-{
-  /* posta in alla semaforer i IP_SEMQ, posta in alla mboxar i
-     IP_MBOXQ */
-  QUEUE mbox;
-  SEMA  sem;
-  
-  mbox = IP_Q_01; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_02; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_03; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_04; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_05; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_06; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_07; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_08; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_09; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_10; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_11; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_12; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_13; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_14; KS_enqueue(IP_MBOXQ, &mbox);
-  mbox = IP_Q_15; KS_enqueue(IP_MBOXQ, &mbox);
-  sem  = IP_S_01; KS_enqueue(IP_SEMQ,  &sem);
-  sem  = IP_S_02; KS_enqueue(IP_SEMQ,  &sem);
-  sem  = IP_S_03; KS_enqueue(IP_SEMQ,  &sem);
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_timeouts *
-sys_arch_timeouts(void)
-{
-  int i;
-  TASK pid;
-  struct timeoutlist *tl;  
-  
-  DEBUGF(SYS_DEBUG, ("PID: %d sys_mbox_fetch: timeoutlist not empty\n",KS_inqtask()));
-  pid = KS_inqtask();
-  for(i = 0; i < nextthread; i++) {
-    tl = &timeoutlist[i];
-    if(tl->pid == pid) {
-      DEBUGF(SYS_DEBUG, ("PID: %d sys_mbox_fetch: corresponding pid found!\n",KS_inqtask()));
-      return &(tl->timeouts);
-    }
-  }
-
-  /* Error! */
-  return NULL;
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_thread_arg {
-  void (* thread)(void *);
-  void *threadarg;
-  SEMA sem;
-};
-/*-----------------------------------------------------------------------------------*/
-static void
-sys_thread(void)
-{
-  struct sys_thread_arg *arg;
-  void (* thread)(void *);
-  void *threadarg;
-  
-  arg = KS_inqtask_arg(0);
-  if(arg != NULL) {
-
-    timeoutlist[nextthread].timeouts.next = NULL;
-    timeoutlist[nextthread].pid = KS_inqtask();
-
-    ++nextthread;
-    
-    thread = arg->thread;
-    threadarg = arg->threadarg;
-    KS_signal(arg->sem);
-    thread(threadarg);
-  }
-  KS_terminate(0);
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_thread_new(void (* function)(void *arg), void *arg) 
-{
-  TASK newtask;
-  PRIORITY pri = 2;       /* This may have to be changed. */
-  char *stack;
-  int stacksize = 512;   /* This may have to be changed. */
-  struct sys_thread_arg threadarg;
-  
-  
-  newtask = KS_alloc_task();
-  stack = KS_allocw(MAP512);
-  
-  KS_deftask(newtask, pri, (char ks_stk *)stack, (size_t)stacksize, (void (*)(void))sys_thread);
-  
-  threadarg.thread = function;
-  threadarg.threadarg = arg;
-  threadarg.sem = THRDSYNC;
-  KS_deftask_arg(newtask, &threadarg);    
-  KS_execute(newtask);
-  KS_wait(THRDSYNC);
-}
-
-
-
-
-
-

src/arch/unix/include/arch/cc.h

@@ -1,51 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_CC_H__
-#define __ARCH_CC_H__
-
-typedef unsigned   char    u8_t;
-typedef signed     char    s8_t;
-/*typedef unsigned   short   u8_t;
-  typedef signed     short   s8_t; */
-typedef unsigned   short   u16_t;
-typedef signed     short   s16_t;
-typedef unsigned   long    u32_t;
-typedef signed     long    s32_t;
-
-typedef u32_t mem_ptr_t;
-
-#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
-#define PACK_STRUCT_STRUCT __attribute__((packed))
-#define PACK_STRUCT_BEGIN
-#define PACK_STRUCT_END
-
-#endif /* __ARCH_CC_H__ */

src/arch/unix/include/arch/cpu.h

@@ -1,39 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_CPU_H__
-#define __ARCH_CPU_H__
-
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif /* BYTE_ORDER */
-
-#endif /* __ARCH_CPU_H__ */

src/arch/unix/include/arch/init.h

@@ -1,41 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_INIT_H__
-#define __ARCH_INIT_H__
-
-#define TCPIP_INIT_DONE(arg) sys_sem_signal(*(sys_sem_t *)arg)
-
-#endif /* __ARCH_INIT_H__ */
-
-
-
-

src/arch/unix/include/arch/lib.h

@@ -1,44 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_LIB_H__
-#define __ARCH_LIB_H__
-
-#ifndef _STRING_H_
-#ifndef _STRING_H
-int strlen(const char *str);
-int strncmp(const char *str1, const char *str2, int len);
-void bcopy(const void *src, void *dest, int len);
-void bzero(void *data, int n);
-#endif /* _STRING_H */
-#endif /* _STRING_H_ */
-
-#endif /* __ARCH_LIB_H__ */

src/arch/unix/include/arch/perf.h

@@ -1,63 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_PERF_H__
-#define __ARCH_PERF_H__
-
-#include <sys/times.h>
-
-#ifdef PERF
-#define PERF_START  { \
-                         unsigned long __c1l, __c1h, __c2l, __c2h; \
-                         __asm__(".byte 0x0f, 0x31" : "=a" (__c1l), "=d" (__c1h))
-#define PERF_STOP(x)   __asm__(".byte 0x0f, 0x31" : "=a" (__c2l), "=d" (__c2h)); \
-                       perf_print(__c1l, __c1h, __c2l, __c2h, x);}
-
-/*#define PERF_START do { \
-                     struct tms __perf_start, __perf_end; \
-                     times(&__perf_start)
-#define PERF_STOP(x) times(&__perf_end); \
-                     perf_print_times(&__perf_start, &__perf_end, x);\
-                     } while(0)*/
-#else /* PERF */
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-#endif /* PERF */
-
-void perf_print(unsigned long c1l, unsigned long c1h,
-		unsigned long c2l, unsigned long c2h,
-		char *key);
-
-void perf_print_times(struct tms *start, struct tms *end, char *key);
-
-void perf_init(char *fname);
-
-#endif /* __ARCH_PERF_H__ */

src/arch/unix/include/arch/sys_arch.h

@@ -1,48 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __ARCH_SYS_ARCH_H__
-#define __ARCH_SYS_ARCH_H__
-
-#define SYS_MBOX_NULL NULL
-#define SYS_SEM_NULL  NULL
-
-struct sys_sem;
-typedef struct sys_sem * sys_sem_t;
-
-struct sys_mbox;
-typedef struct sys_mbox *sys_mbox_t;
-
-struct sys_thread;
-typedef struct sys_thread * sys_thread_t;
-
-#endif /* __ARCH_SYS_ARCH_H__ */
-

src/arch/unix/include/netif/dropif.h

@@ -1,41 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __DROPIF_H__
-#define __DROPIF_H__
-
-#include "lwip/netif.h"
-
-#include "lwip/pbuf.h"
-
-void dropif_init(struct netif *netif);
-
-#endif /* __DROPIF_H__ */

src/arch/unix/include/netif/pcapif.h

@@ -1,39 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __PCAPIF_H__
-#define __PCAPIF_H__
-
-#include "lwip/netif.h"
-
-void pcapif_init(struct netif *netif);
-
-#endif /* __PCAPIF_H__ */

src/arch/unix/include/netif/sioslipif.h

@@ -1,43 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __NETIF_SIOSLIPIF_H__
-#define __NETIF_SIOSLIPIF_H__
-
-#include "lwip/netif.h"
-
-void sioslipif_init(struct netif *);
-
-
-void sioslipif_init1(struct netif *);
-void sioslipif_init2(struct netif *);
-
-#endif /* __NETIF_SIOSLIPIF_H__ */

src/arch/unix/include/netif/tapif.h

@@ -1,39 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __TAPIF_H__
-#define __TAPIF_H__
-
-#include "lwip/netif.h"
-
-void tapif_init(struct netif *netif);
-
-#endif /* __TAPIF_H__ */

src/arch/unix/include/netif/tunif.h

@@ -1,42 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __TUNIF_H__
-#define __TUNIF_H__
-
-#include "lwip/netif.h"
-
-#include "lwip/pbuf.h"
-
-void tunif_init(struct netif *netif);
-void tunif_init_thread(struct netif *netif);
-
-#endif /* __TUNIF_H__ */

src/arch/unix/include/netif/unixif.h

@@ -1,40 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-#ifndef __UNIXIF_H__
-#define __UNIXIF_H__
-
-#include "lwip/netif.h"
-
-void unixif_init_server(struct netif *netif);
-void unixif_init_client(struct netif *netif);
-
-#endif /* __UNIXIF_H__ */

src/arch/unix/lwip_chksum.c

@@ -1,73 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include "lwip/arch.h"
-
-#include "lwip/def.h"
-#include "lwip/inet.h"
-
-
-/*-----------------------------------------------------------------------------------*/
-/* lwip_chksum:
- *
- * Sums up all 16 bit words in a memory portion. Also includes any odd byte.
- * This function is used by the other checksum functions.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-#if 0
-u16_t
-lwip_chksum(void *dataptr, int len)
-{
-  u32_t acc;
-    
-  for(acc = 0; len > 1; len -= 2) {
-    acc += *((u16_t *)dataptr)++;
-  }
-
-  /* add up any odd byte */
-  if(len == 1) {
-    acc += htons((u16_t)((*(u8_t *)dataptr) & 0xff) << 8);
-    DEBUGF(INET_DEBUG, ("inet: chksum: odd byte %d\n", *(u8_t *)dataptr));
-  }
-  acc = (acc >> 16) + (acc & 0xffffUL);
-
-  if(acc & 0xffff0000 != 0) {
-    acc = (acc >> 16) + (acc & 0xffffUL);
-  }
-
-  return (u16_t)acc;
-}
-/*-----------------------------------------------------------------------------------*/
-#endif

src/arch/unix/netif/delif.c

@@ -1,310 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include <stdlib.h> 
-
-#include "lwip/def.h"
-#include "netif/delif.h"
-
-#ifdef linux
-#include "netif/tapif.h"
-#else /* linux */
-#include "netif/tunif.h"
-#endif /* linux */
-
-#include "lwip/sys.h"
-
-
-#define DELIF_INPUT_DROPRATE 0.1
-#define DELIF_OUTPUT_DROPRATE 0.1
-
-#define DELIF_INPUT_DELAY  500      /* Miliseconds. */
-#define DELIF_OUTPUT_DELAY 500      /* Miliseconds. */
-
-#define DELIF_TIMEOUT 10
-
-struct delif {
-  err_t (* input)(struct pbuf *p, struct netif *inp);
-  struct netif *netif;
-};
-
-struct delif_pbuf {
-  struct delif_pbuf *next;
-  struct pbuf *p;
-  struct ip_addr *ipaddr;
-  unsigned int time;
-};
-
-static struct delif_pbuf *input_list = NULL;
-static struct delif_pbuf *output_list = NULL;
-/*-----------------------------------------------------------------------------------*/
-static void
-delif_input_timeout(void *arg)
-{
-  struct netif *netif;
-  struct delif *delif;
-  struct delif_pbuf *dp;
-  unsigned int timeout, now;
-
-  timeout = DELIF_TIMEOUT;
-  
-  netif = arg;
-  delif = netif->state;
-
-  
-  /* Check if there is anything on the input list. */
-  dp = input_list;
-  while(dp != NULL) {
-    now = sys_now();
-    
-    if(dp->time <= now) {
-      delif->input(dp->p, netif);
-      if(dp->next != NULL) {
-	if(dp->next->time > now) {
-	  timeout = dp->next->time - now;
-	} else {
-	  timeout = 0;
-	}
-	DEBUGF(DELIF_DEBUG, ("delif_output_timeout: timeout %u.\n", timeout));
-
-      }
-      input_list = dp->next;
-      free(dp);
-      dp = input_list;
-    } else {
-      dp = dp->next;	
-    }
-  }
-  
-  sys_timeout(timeout, delif_input_timeout, arg);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-delif_output_timeout(void *arg)
-{
-  struct netif *netif;
-  struct delif *delif;
-  struct delif_pbuf *dp;
-  unsigned int timeout, now;
-
-  timeout = DELIF_TIMEOUT;
-
-  netif = arg;
-  delif = netif->state;
-  
-  /* Check if there is anything on the output list. */
-  dp = output_list;
-  while(dp != NULL) {
-    now = sys_now();
-    if(dp->time <= now) {
-      DEBUGF(DELIF_DEBUG, ("delif_output_timeout: now %u dp->time %u\n",
-	     now, dp->time));
-      delif->netif->output(delif->netif, dp->p, dp->ipaddr);
-      if(dp->next != NULL) {
-	if(dp->next->time > now) {
-	  timeout = dp->next->time - now;
-	} else {
-	  timeout = 0;
-	}
-	DEBUGF(DELIF_DEBUG, ("delif_output_timeout: timeout %u.\n", timeout));
-	
-      }
-      pbuf_free(dp->p);
-      
-      output_list = dp->next;
-      free(dp);
-      dp = output_list;
-    } else {
-      dp = dp->next;	
-    }
-  }
-
-  
-  sys_timeout(timeout, delif_output_timeout, arg);
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-delif_output(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr)
-{
-  struct delif_pbuf *dp, *np;
-  struct pbuf *q;
-  int i, j;
-  char *data;
-
-  DEBUGF(DELIF_DEBUG, ("delif_output\n"));
-    
-#ifdef DELIF_OUTPUT_DROPRATE
-  if(((double)rand()/(double)RAND_MAX) < DELIF_OUTPUT_DROPRATE) {
-    DEBUGF(DELIF_DEBUG, ("delif_output: Packet dropped\n"));
-    return 0;
-  }
-#endif /* DELIF_OUTPUT_DROPRATE */
-
-  
-  DEBUGF(DELIF_DEBUG, ("delif_output\n"));
-
-
-  dp = malloc(sizeof(struct delif_pbuf));
-  data = malloc(p->tot_len);
-    
-  i = 0;
-  for(q = p; q != NULL; q = q->next) {
-    for(j = 0; j < q->len; j++) {
-      data[i] = ((char *)q->payload)[j];
-      i++;
-    }
-  }
-
-  
-  dp->p = pbuf_alloc(PBUF_LINK, 0, PBUF_ROM);
-  dp->p->payload = data;
-  dp->p->len = p->tot_len;
-  dp->p->tot_len = p->tot_len;
-  dp->ipaddr = ipaddr;
-  dp->time = sys_now() + DELIF_OUTPUT_DELAY;
-  dp->next = NULL;
-  if(output_list == NULL) {
-    output_list = dp;
-  } else {
-    for(np = output_list; np->next != NULL; np = np->next);
-    np->next = dp;
-  }
-    
-
-  return ERR_OK;
-    
-
-}
-/*-----------------------------------------------------------------------------------*/
-static err_t
-delif_input(struct pbuf *p, struct netif *inp)
-{
-  struct delif_pbuf *dp, *np;
-
-  DEBUGF(DELIF_DEBUG, ("delif_input\n"));
-#ifdef DELIF_INPUT_DROPRATE
-  if(((double)rand()/(double)RAND_MAX) < DELIF_INPUT_DROPRATE) {
-    DEBUGF(DELIF_DEBUG, ("delif_input: Packet dropped\n"));
-    pbuf_free(p);
-    return ERR_OK;
-  }
-#endif /* DELIF_INPUT_DROPRATE */
-
-  
-  dp = malloc(sizeof(struct delif_pbuf));
-  dp->p = p;
-  dp->time = sys_now() + DELIF_INPUT_DELAY;
-  dp->next = NULL;
-  if(input_list == NULL) {
-    input_list = dp;
-  } else {
-    for(np = input_list; np->next != NULL; np = np->next);
-    np->next = dp;
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-delif_init(struct netif *netif)
-{
-  struct delif *del;
-  
-  del = malloc(sizeof(struct delif));
-  netif->state = del;
-  netif->name[0] = 'd';
-  netif->name[1] = 'e';
-  netif->output = delif_output;
-
-  del->netif = malloc(sizeof(struct netif));  
-#ifdef linux
-  /*  tapif_init(del->netif);*/
-  tunif_init(del->netif);
-#else /* linux */
-  tunif_init(del->netif);
-#endif /* linux */
-  del->input = netif->input;
-  del->netif->input = delif_input;
-  sys_timeout(DELIF_TIMEOUT, delif_input_timeout, netif);
-  sys_timeout(DELIF_TIMEOUT, delif_output_timeout, netif);
-}
-
-/*-----------------------------------------------------------------------------------*/
-static void 
-delif_thread(void *arg)
-{
-  struct netif *netif = arg;
-  struct delif *del;
-  sys_sem_t sem;
-  
-  del = netif->state;
-#ifdef linux
-  tapif_init(del->netif);
-#else /* linux */
-  tunif_init(del->netif);
-#endif /* linux */
-
-  sys_timeout(DELIF_TIMEOUT, delif_input_timeout, netif);
-  sys_timeout(DELIF_TIMEOUT, delif_output_timeout, netif);
-
-  sem = sys_sem_new(0);
-  sys_sem_wait(sem);
-
-}
-/*-----------------------------------------------------------------------------------*/
-void
-delif_init_thread(struct netif *netif)
-{
-  struct delif *del;
-
-  DEBUGF(DELIF_DEBUG, ("delif_init_thread\n"));
-  
-  del = malloc(sizeof(struct delif));
-  netif->state = del;
-  netif->name[0] = 'd';
-  netif->name[1] = 'e';
-  netif->output = delif_output;
-
-  del->netif = malloc(sizeof(struct netif));
-  del->netif->ip_addr = netif->ip_addr;
-  del->netif->gw = netif->gw;
-  del->netif->netmask = netif->netmask;
-  del->input = netif->input;
-  del->netif->input = delif_input;
-  sys_thread_new(delif_thread, netif);
-}
-
-/*-----------------------------------------------------------------------------------*/
-
-
-

src/arch/unix/netif/list.c

@@ -1,162 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-
-#include "lwip/list.h"
-
-#include <stdlib.h>
-
-struct list {
-  struct elem *first, *last;
-  int size, elems;
-};
-
-struct elem {
-  struct elem *next;
-  void *data;
-};
-
-/*-----------------------------------------------------------------------------------*/
-struct list *
-list_new(int size)
-{
-  struct list *list;
-  list = malloc(sizeof(struct list));
-  list->first = list->last = NULL;
-  list->size = size;
-  list->elems = 0;
-  return list;
-}
-/*-----------------------------------------------------------------------------------*/
-int
-list_push(struct list *list, void *data)
-{
-  struct elem *elem;
-  
-  if(list->elems < list->size) {
-    elem = malloc(sizeof(struct elem));
-    elem->data = data;
-    elem->next = NULL;
-    if(list->last != NULL) {
-      list->last->next = elem;
-    }
-    list->last = elem;
-    if(list->first == NULL) {
-      list->first = elem;
-    }
-    list->elems++;
-    return 1;
-  }
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-void *
-list_pop(struct list *list)
-{
-  struct elem *elem;
-  void *data;
-  
-  if(list->elems > 0) {    
-    elem = list->first;
-    if(elem == list->last) {
-      list->last = elem->next;
-    }
-    list->first = elem->next;
-    
-    list->elems--;
-
-    data = elem->data;
-    free(elem);
-
-    return data;
-  }
-  return NULL;
-}
-/*-----------------------------------------------------------------------------------*/
-void *
-list_first(struct list *list)
-{
-  return list->first;
-}
-/*-----------------------------------------------------------------------------------*/
-int
-list_elems(struct list *list)
-{
-  return list->elems;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-list_delete(struct list *list)
-{
-  while(list_pop(list) != NULL);
-  free(list);
-}
-/*-----------------------------------------------------------------------------------*/
-int
-list_remove(struct list *list, void *elem)
-{
-  struct elem *e, *p;
-  
-  p = NULL;
-  for(e = list->first; e != NULL; e = e->next) {
-    if(e->data == elem) {
-      if(p != NULL) {
-        p->next = e->next;
-      } else {
-        list->first = e->next;
-      }
-      if(list->last == e) {
-        list->last = p;
-        if(p != NULL) {
-          p->next = NULL;
-        }
-      }
-      free(e);
-      list->elems--;
-      return 1;
-    } 
-    p = e;    
-  }
-  return 0;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-list_map(struct list *list, void (* func)(void *arg))
-{
-  struct elem *e;
-
-  for(e = list->first; e != NULL; e = e->next) {
-    func(e->data);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-

src/arch/unix/netif/pcapif.c

@@ -1,214 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#ifndef linux  /* Apparently, this doesn't work under Linux. */
-
-#include "lwip/debug.h"
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <pcap.h>
-
-#include "netif/etharp.h"
-
-#include "lwip/stats.h"
-
-#include "lwip/def.h"
-#include "lwip/mem.h"
-#include "lwip/pbuf.h"
-#include "netif/unixif.h"
-#include "lwip/sys.h"
-
-#include "lwip/ip.h"
-
-#include "lwip/list.h"
-
-#include "netif/tcpdump.h"
-
-struct pcapif {
-  pcap_t *pd;
-  sys_sem_t sem;
-  u8_t pkt[2048];
-  u32_t len;
-  u32_t lasttime;
-  struct pbuf *p;
-  struct eth_addr *ethaddr;
-};
-
-static char errbuf[PCAP_ERRBUF_SIZE];
-
-/*-----------------------------------------------------------------------------------*/
-static err_t
-pcapif_output(struct netif *netif, struct pbuf *p,
-	      struct ip_addr *ipaddr)
-{
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-timeout(void *arg)
-{
-  struct netif *netif;
-  struct pcapif *pcapif;
-  struct pbuf *p, *q;
-  u8_t *bufptr;
-  struct eth_hdr *ethhdr;
-  
-  netif = (struct netif *)arg;
-  pcapif = netif->state;
-  ethhdr = (struct eth_hdr *)pcapif->pkt;
-
-  
-  if(htons(ethhdr->type) != ETHTYPE_IP ||
-     ip_lookup(pcapif->pkt + 14, netif)) {
-    
-    /* We allocate a pbuf chain of pbufs from the pool. */
-    p = pbuf_alloc(PBUF_LINK, pcapif->len, PBUF_POOL);
-    
-    if(p != NULL) {
-      /* We iterate over the pbuf chain until we have read the entire
-	 packet into the pbuf. */
-      bufptr = (u_char *)pcapif->pkt;
-      for(q = p; q != NULL; q = q->next) {
-	/* Read enough bytes to fill this pbuf in the chain. The
-	   avaliable data in the pbuf is given by the q->len
-	   variable. */
-	/* read data into(q->payload, q->len); */
-	bcopy(bufptr, q->payload, q->len);
-	bufptr += q->len;
-      }
-
-      ethhdr = p->payload;
-      switch(htons(ethhdr->type)) {
-      case ETHTYPE_IP:
-	arp_ip_input(netif, p);
-	pbuf_header(p, -14);
-	netif->input(p, netif);
-	break;
-      case ETHTYPE_ARP:
-	p = arp_arp_input(netif, pcapif->ethaddr, p);
-	if(p != NULL) {
-	  printf("ARP outout\n");
-	  pbuf_free(p);
-	}
-	break;
-      default:
-	pbuf_free(p);
-	break;
-      }
-    }
-  } else {
-    printf("ip_lookup dropped\n");
-  }
-
-  sys_sem_signal(pcapif->sem);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-callback(u_char *arg, const struct pcap_pkthdr *hdr, const u_char *pkt)
-{
-  struct netif *netif;
-  struct pcapif *pcapif;
-  u32_t time, lasttime;
-  
-  netif = (struct netif *)arg;
-  pcapif = netif->state;
-
-  pcapif->len = hdr->len;
-  
-  bcopy(pkt, pcapif->pkt, hdr->len);
-
-  time = hdr->ts.tv_sec * 1000 + hdr->ts.tv_usec / 1000;
-
-  lasttime = pcapif->lasttime;
-  pcapif->lasttime = time;
-  
-
-  if(lasttime == 0) {
-    sys_timeout(1000, timeout, netif);
-  } else {
-    sys_timeout(time - lasttime, timeout, netif);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-pcapif_thread(void *arg)
-{
-  struct netif *netif;
-  struct pcapif *pcapif;
-  netif = arg;
-  pcapif = netif->state;
-
-  while(1) {
-    pcap_loop(pcapif->pd, 1, callback, (u_char *)netif);
-    sys_sem_wait(pcapif->sem);
-    if(pcapif->p != NULL) {
-      netif->input(pcapif->p, netif);
-    }
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-pcapif_init(struct netif *netif)
-{
-  struct pcapif *p;
-    
-  p = malloc(sizeof(struct pcapif));
-  netif->state = p;
-  netif->name[0] = 'p';
-  netif->name[1] = 'c';
-  netif->output = pcapif_output;
-
-  p->pd = pcap_open_offline("pcapdump", errbuf);
-  if(p->pd == NULL) {
-    printf("pcapif_init: failed %s\n", errbuf);
-    return;
-  }
-
-  p->sem = sys_sem_new(0);
-  p->p = NULL;
-  p->lasttime = 0; 
-  
-  sys_thread_new(pcapif_thread, netif);
-}
-/*-----------------------------------------------------------------------------------*/
-#endif /* linux */

src/arch/unix/netif/sioslipif.c

@@ -1,189 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-#include "lwip/def.h"
-#include "netif/sioslipif.h"
-#include "lwip/pbuf.h"
-#include "lwip/sys.h"
-#include "lwip/stats.h"
-
-/* The maximum size that an incoming packet can have. */
-#define MAX_SIZE     1500
-
-#define SLIP_END     0300
-#define SLIP_ESC     0333
-#define SLIP_ESC_END 0334
-#define SLIP_ESC_ESC 0335
-
-/* Define those to whatever is needed to send and receive one byte of
-   data. */
-#define SIO_SEND(c) 
-#define SIO_RECV(c) 
-
-static const unsigned char slip_end = SLIP_END, 
-                           slip_esc = SLIP_ESC, 
-                           slip_esc_end = SLIP_ESC_END, 
-                           slip_esc_esc = SLIP_ESC_ESC;
-
-/*-----------------------------------------------------------------------------------*/
-static err_t
-sioslipif_output(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr)
-{
-  struct pbuf *q;
-  int i;
-  unsigned char *ptr;
-  u8_t c;
-  /* Send pbuf out on the serial I/O device. */
-  SIO_SEND(slip_end);
-  
-  for(q = p; q != NULL; q = q->next) {
-    ptr = q->payload;
-    for(i = 0; i < q->len; i++) {
-      c = *ptr++;
-      switch(c) {
-      case SLIP_END:
-        SIO_SEND(slip_esc);
-        SIO_SEND(slip_esc_end);
-        break;
-      case SLIP_ESC:
-        SIO_SEND(slip_esc);
-        SIO_SEND(slip_esc_esc);
-        break;
-      default:
-        SIO_SEND(c);
-        break;
-      }
-    }
-  }
-#ifdef LINK_STATS
-  stats.link.xmit++;
-#endif /* LINK_STATS */  
-  SIO_SEND(slip_end);
-
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static struct pbuf *
-sioslipif_input(void)
-{
-  u8_t c;
-  struct pbuf *p, *q;
-  int recved;
-  int i;
-  
-  q = p = NULL;
-  recved = i = 0;
-  c = 0;
-  
-  while(1) {
-    SIO_RECV(c);
-    switch(c) {
-    case SLIP_END:
-      if(p == NULL) {
-        return sioslipif_input();
-      }
-      if(recved > 0) {
-        /* Received whole packet. */
-        pbuf_realloc(q, recved);
-#ifdef LINK_STATS
-        stats.link.recv++;
-#endif /* LINK_STATS */         
-        return q;
-      }
-      break;
-    case SLIP_ESC:
-      SIO_RECV(c);
-      switch(c) {
-      case SLIP_ESC_END:
-        c = SLIP_END;
-        break;
-      case SLIP_ESC_ESC:
-        c = SLIP_ESC;
-        break;
-      }
-      /* FALLTHROUGH */
-    default:
-      if(p == NULL) {      
-        p = pbuf_alloc(PBUF_LINK, 128, PBUF_POOL);
-#ifdef LINK_STATS           
-        if(p == NULL) {
-          stats.link.drop++;
-        }
-#endif /* LINK_STATS */                  
-        if(q != NULL) {
-          pbuf_chain(q, p);
-        } else {
-          q = p;
-        }
-      }
-      if(p != NULL && recved < MAX_SIZE) {
-        ((u8_t *)p->payload)[i] = c;
-        recved++;
-        i++;
-        if(i >= p->len) {
-          i = 0;
-          p = NULL;
-        }
-      }
-      break;
-    }
-    
-  }
-  return NULL;
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-sioslipif_loop(void *arg)
-{
-  struct pbuf *p;
-  struct netif *netif;
-
-  netif = arg;
-  while(1) {
-    p = sioslipif_input();    
-    netif->input(p, netif);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sioslipif_init(struct netif *netif)
-{
-  netif->state = NULL;
-  netif->name[0] = 's';
-  netif->name[1] = 'l';
-  netif->output = sioslipif_output;
-
-  sys_thread_new((void *)sioslipif_loop, netif);
-  /* Do some magic to make it possible to receive data from the serial I/O device. */
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/unix/netif/tapif.c

@@ -1,355 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-
-#include "lwip/debug.h"
-
-#include "lwip/opt.h"
-#include "lwip/def.h"
-#include "lwip/ip.h"
-#include "lwip/mem.h"
-#include "lwip/pbuf.h"
-#include "lwip/sys.h"
-
-#include "netif/etharp.h"
-
-#ifdef linux
-#include <sys/ioctl.h>
-#include <linux/if.h>
-#include <linux/if_tun.h>
-#define DEVTAP "/dev/net/tun"
-#else  /* linux */
-#define DEVTAP "/dev/tap0"
-#endif /* linux */
-
-#define IFNAME0 't'
-#define IFNAME1 'p'
-
-static const struct eth_addr ethbroadcast = {{0xff,0xff,0xff,0xff,0xff,0xff}};
-
-struct tapif {
-  struct eth_addr *ethaddr;
-  /* Add whatever per-interface state that is needed here. */
-  int fd;
-};
-
-/* Forward declarations. */
-static void  tapif_input(struct netif *netif);
-static err_t tapif_output(struct netif *netif, struct pbuf *p,
-			       struct ip_addr *ipaddr);
-
-static void tapif_thread(void *data);
-
-/*-----------------------------------------------------------------------------------*/
-static void
-low_level_init(struct netif *netif)
-{
-  struct tapif *tapif;
-  char buf[100];
-
-  tapif = netif->state;
-  
-  /* Obtain MAC address from network interface. */
-
-  /* (We just fake an address...) */
-  tapif->ethaddr->addr[0] = 0x1;
-  tapif->ethaddr->addr[1] = 0x2;
-  tapif->ethaddr->addr[2] = 0x3;
-  tapif->ethaddr->addr[3] = 0x4;
-  tapif->ethaddr->addr[4] = 0x5;
-  tapif->ethaddr->addr[5] = 0x6;
-
-  /* Do whatever else is needed to initialize interface. */
-  
-  tapif->fd = open(DEVTAP, O_RDWR);
-  DEBUGF(TAPIF_DEBUG, ("tapif_init: fd %d\n", tapif->fd));
-  if(tapif->fd == -1) {
-    perror("tapif_init");
-    exit(1);
-  }
-
-#ifdef linux
-  {
-    struct ifreq ifr;
-    memset(&ifr, 0, sizeof(ifr));
-    ifr.ifr_flags = IFF_TAP|IFF_NO_PI;
-    if (ioctl(tapif->fd, TUNSETIFF, (void *) &ifr) < 0) {
-      perror(buf);
-      exit(1);
-    }
-  }
-#endif /* Linux */
-
-  snprintf(buf, sizeof(buf), "ifconfig tap0 inet %d.%d.%d.%d",
-           ip4_addr1(&(netif->gw)),
-           ip4_addr2(&(netif->gw)),
-           ip4_addr3(&(netif->gw)),
-           ip4_addr4(&(netif->gw)));
-  
-  DEBUGF(TAPIF_DEBUG, ("tapif_init: system(\"%s\");\n", buf));
-  system(buf);
-  sys_thread_new(tapif_thread, netif);
-
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_output():
- *
- * Should do the actual transmission of the packet. The packet is
- * contained in the pbuf that is passed to the function. This pbuf
- * might be chained.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-
-static err_t
-low_level_output(struct netif *netif, struct pbuf *p)
-{
-  struct pbuf *q;
-  char buf[1500];
-  char *bufptr;
-  struct tapif *tapif;
-
-  tapif = netif->state;
-  
-  /* initiate transfer(); */
-  
-  bufptr = &buf[0];
-  
-  for(q = p; q != NULL; q = q->next) {
-    /* Send the data from the pbuf to the interface, one pbuf at a
-       time. The size of the data in each pbuf is kept in the ->len
-       variable. */    
-    /* send data from(q->payload, q->len); */
-    bcopy(q->payload, bufptr, q->len);
-    bufptr += q->len;
-  }
-
-  /* signal that packet should be sent(); */
-  if(write(tapif->fd, buf, p->tot_len) == -1) {
-    perror("tapif: write");
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_input():
- *
- * Should allocate a pbuf and transfer the bytes of the incoming
- * packet from the interface into the pbuf.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static struct pbuf *
-low_level_input(struct tapif *tapif)
-{
-  struct pbuf *p, *q;
-  u16_t len;
-  char buf[1500];
-  char *bufptr;
-
-  /* Obtain the size of the packet and put it into the "len"
-     variable. */
-  len = read(tapif->fd, buf, sizeof(buf));
-
-  /*  if(((double)rand()/(double)RAND_MAX) < 0.1) {
-    printf("drop\n");
-    return NULL;
-    }*/
-
-  
-  /* We allocate a pbuf chain of pbufs from the pool. */
-  p = pbuf_alloc(PBUF_LINK, len, PBUF_POOL);
-  
-  if(p != NULL) {
-    /* We iterate over the pbuf chain until we have read the entire
-       packet into the pbuf. */
-    bufptr = &buf[0];
-    for(q = p; q != NULL; q = q->next) {
-      /* Read enough bytes to fill this pbuf in the chain. The
-         avaliable data in the pbuf is given by the q->len
-         variable. */
-      /* read data into(q->payload, q->len); */
-      bcopy(bufptr, q->payload, q->len);
-      bufptr += q->len;
-    }
-    /* acknowledge that packet has been read(); */
-  } else {
-    /* drop packet(); */
-  }
-
-  return p;  
-}
-/*-----------------------------------------------------------------------------------*/
-static void 
-tapif_thread(void *arg)
-{
-  struct netif *netif;
-  struct tapif *tapif;
-  fd_set fdset;
-  int ret;
-  
-  netif = arg;
-  tapif = netif->state;
-  
-  while(1) {
-    FD_ZERO(&fdset);
-    FD_SET(tapif->fd, &fdset);
-
-    /* Wait for a packet to arrive. */
-    ret = select(tapif->fd + 1, &fdset, NULL, NULL, NULL);
-
-    if(ret == 1) {
-      /* Handle incoming packet. */
-      tapif_input(netif);
-    } else if(ret == -1) {
-      perror("tapif_thread: select");
-    }
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tapif_output():
- *
- * This function is called by the TCP/IP stack when an IP packet
- * should be sent. It calls the function called low_level_output() to
- * do the actuall transmission of the packet.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static err_t
-tapif_output(struct netif *netif, struct pbuf *p,
-		  struct ip_addr *ipaddr)
-{
-  p = etharp_output(netif, ipaddr, p);
-  if(p != NULL) {
-    return low_level_output(netif, p);
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tapif_input():
- *
- * This function should be called when a packet is ready to be read
- * from the interface. It uses the function low_level_input() that
- * should handle the actual reception of bytes from the network
- * interface.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static void
-tapif_input(struct netif *netif)
-{
-  struct tapif *tapif;
-  struct eth_hdr *ethhdr;
-  struct pbuf *p, *q;
-
-
-  tapif = netif->state;
-  
-  p = low_level_input(tapif);
-
-  if(p == NULL) {
-    DEBUGF(TAPIF_DEBUG, ("tapif_input: low_level_input returned NULL\n"));
-    return;
-  }
-  ethhdr = p->payload;
-
-  q = NULL;
-  switch(htons(ethhdr->type)) {
-  case ETHTYPE_IP:
-    DEBUGF(TAPIF_DEBUG, ("tapif_input: IP packet\n"));
-    q = etharp_ip_input(netif, p);
-    pbuf_header(p, -14);
-    netif->input(p, netif);
-    break;
-  case ETHTYPE_ARP:
-    DEBUGF(TAPIF_DEBUG, ("tapif_input: ARP packet\n"));
-    q = etharp_arp_input(netif, tapif->ethaddr, p);
-    break;
-  default:
-    pbuf_free(p);
-    break;
-  }
-  if(q != NULL) {
-    low_level_output(netif, q);
-    pbuf_free(q);
-  }
-
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-arp_timer(void *arg)
-{
-  etharp_tmr();
-  sys_timeout(ARP_TMR_INTERVAL, (sys_timeout_handler)arp_timer, NULL);
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tapif_init():
- *
- * Should be called at the beginning of the program to set up the
- * network interface. It calls the function low_level_init() to do the
- * actual setup of the hardware.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-void
-tapif_init(struct netif *netif)
-{
-  struct tapif *tapif;
-    
-  tapif = mem_malloc(sizeof(struct tapif));
-  netif->state = tapif;
-  netif->name[0] = IFNAME0;
-  netif->name[1] = IFNAME1;
-  netif->output = tapif_output;
-  netif->linkoutput = low_level_output;
-  
-  tapif->ethaddr = (struct eth_addr *)&(netif->hwaddr[0]);
-  
-  low_level_init(netif);
-  etharp_init();
-  
-  sys_timeout(ARP_TMR_INTERVAL, (sys_timeout_handler)arp_timer, NULL);
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/unix/netif/tunif.c

@@ -1,298 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-
-
-#include "lwip/debug.h"
-
-#include "lwip/opt.h"
-#include "lwip/def.h"
-#include "lwip/ip.h"
-#include "lwip/mem.h"
-#include "lwip/netif.h"
-#include "lwip/pbuf.h"
-#include "lwip/sys.h"
-
-
-#define IFNAME0 't'
-#define IFNAME1 'n'
-
-struct tunif {
-  /* Add whatever per-interface state that is needed here. */
-  int fd;
-};
-
-/* Forward declarations. */
-static void  tunif_input(struct netif *netif);
-static err_t tunif_output(struct netif *netif, struct pbuf *p,
-			       struct ip_addr *ipaddr);
-
-static void tunif_thread(void *data);
-
-/*-----------------------------------------------------------------------------------*/
-static void
-low_level_init(struct netif *netif)
-{
-  struct tunif *tunif;
-  char buf[100];
-
-  tunif = netif->state;
-  
-  /* Obtain MAC address from network interface. */
-
-  /* Do whatever else is needed to initialize interface. */
-  
-  tunif->fd = open("/dev/tun0", O_RDWR);
-  DEBUGF(TUNIF_DEBUG, ("tunif_init: fd %d\n", tunif->fd));
-  if(tunif->fd == -1) {
-    perror("tunif_init");
-    exit(1);
-  }
-  snprintf(buf, sizeof(buf), "ifconfig tun0 inet %d.%d.%d.%d %d.%d.%d.%d",
-           ip4_addr1(&(netif->gw)),
-           ip4_addr2(&(netif->gw)),
-           ip4_addr3(&(netif->gw)),
-           ip4_addr4(&(netif->gw)),
-           ip4_addr1(&(netif->ip_addr)),
-           ip4_addr2(&(netif->ip_addr)),
-           ip4_addr3(&(netif->ip_addr)),
-           ip4_addr4(&(netif->ip_addr)));
-  
-  DEBUGF(TUNIF_DEBUG, ("tunif_init: system(\"%s\");\n", buf));
-  system(buf);
-  sys_thread_new(tunif_thread, netif);
-
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_output():
- *
- * Should do the actual transmission of the packet. The packet is
- * contained in the pbuf that is passed to the function. This pbuf
- * might be chained.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-
-static err_t
-low_level_output(struct tunif *tunif, struct pbuf *p)
-{
-  struct pbuf *q;
-  char buf[1500];
-  char *bufptr;
-  
-  /* initiate transfer(); */
-
-  if(((double)rand()/(double)RAND_MAX) < 0.4) {
-    printf("drop\n");
-    return ERR_OK;
-  }
-  
-  
-  bufptr = &buf[0];
-  
-  for(q = p; q != NULL; q = q->next) {
-    /* Send the data from the pbuf to the interface, one pbuf at a
-       time. The size of the data in each pbuf is kept in the ->len
-       variable. */    
-    /* send data from(q->payload, q->len); */
-    bcopy(q->payload, bufptr, q->len);
-    bufptr += q->len;
-  }
-
-  /* signal that packet should be sent(); */
-  if(write(tunif->fd, buf, p->tot_len) == -1) {
-    perror("tunif: write");
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * low_level_input():
- *
- * Should allocate a pbuf and transfer the bytes of the incoming
- * packet from the interface into the pbuf.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static struct pbuf *
-low_level_input(struct tunif *tunif)
-{
-  struct pbuf *p, *q;
-  u16_t len;
-  char buf[1500];
-  char *bufptr;
-
-  /* Obtain the size of the packet and put it into the "len"
-     variable. */
-  len = read(tunif->fd, buf, sizeof(buf));
-
-  /*  if(((double)rand()/(double)RAND_MAX) < 0.1) {
-    printf("drop\n");
-    return NULL;
-    }*/
-
-  
-  /* We allocate a pbuf chain of pbufs from the pool. */
-  p = pbuf_alloc(PBUF_LINK, len, PBUF_POOL);
-  
-  if(p != NULL) {
-    /* We iterate over the pbuf chain until we have read the entire
-       packet into the pbuf. */
-    bufptr = &buf[0];
-    for(q = p; q != NULL; q = q->next) {
-      /* Read enough bytes to fill this pbuf in the chain. The
-         avaliable data in the pbuf is given by the q->len
-         variable. */
-      /* read data into(q->payload, q->len); */
-      bcopy(bufptr, q->payload, q->len);
-      bufptr += q->len;
-    }
-    /* acknowledge that packet has been read(); */
-  } else {
-    /* drop packet(); */
-  }
-
-  return p;  
-}
-/*-----------------------------------------------------------------------------------*/
-static void 
-tunif_thread(void *arg)
-{
-  struct netif *netif;
-  struct tunif *tunif;
-  fd_set fdset;
-  int ret;
-  
-  netif = arg;
-  tunif = netif->state;
-  
-  while(1) {
-    FD_ZERO(&fdset);
-    FD_SET(tunif->fd, &fdset);
-
-    /* Wait for a packet to arrive. */
-    ret = select(tunif->fd + 1, &fdset, NULL, NULL, NULL);
-
-    if(ret == 1) {
-      /* Handle incoming packet. */
-      tunif_input(netif);
-    } else if(ret == -1) {
-      perror("tunif_thread: select");
-    }
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tunif_output():
- *
- * This function is called by the TCP/IP stack when an IP packet
- * should be sent. It calls the function called low_level_output() to
- * do the actuall transmission of the packet.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static err_t
-tunif_output(struct netif *netif, struct pbuf *p,
-		  struct ip_addr *ipaddr)
-{
-  struct tunif *tunif;
-
-  tunif = netif->state;
-
-  return low_level_output(tunif, p);
-
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tunif_input():
- *
- * This function should be called when a packet is ready to be read
- * from the interface. It uses the function low_level_input() that
- * should handle the actual reception of bytes from the network
- * interface.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-static void
-tunif_input(struct netif *netif)
-{
-  struct tunif *tunif;
-  struct pbuf *p;
-
-
-  tunif = netif->state;
-  
-  p = low_level_input(tunif);
-
-  if(p == NULL) {
-    DEBUGF(TUNIF_DEBUG, ("tunif_input: low_level_input returned NULL\n"));
-    return;
-  }
-
-  if(ip_lookup(p->payload, netif)) {
-    netif->input(p, netif);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-/*
- * tunif_init():
- *
- * Should be called at the beginning of the program to set up the
- * network interface. It calls the function low_level_init() to do the
- * actual setup of the hardware.
- *
- */
-/*-----------------------------------------------------------------------------------*/
-void
-tunif_init(struct netif *netif)
-{
-  struct tunif *tunif;
-    
-  tunif = mem_malloc(sizeof(struct tunif));
-  netif->state = tunif;
-  netif->name[0] = IFNAME0;
-  netif->name[1] = IFNAME1;
-  netif->output = tunif_output;
-  
-  
-  low_level_init(netif);
-}
-/*-----------------------------------------------------------------------------------*/

src/arch/unix/netif/unixif.c

@@ -1,480 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "lwip/debug.h"
-
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-
-#include "lwip/stats.h"
-
-#include "lwip/def.h"
-#include "lwip/mem.h"
-#include "lwip/pbuf.h"
-#include "netif/unixif.h"
-#include "lwip/sys.h"
-
-#include "lwip/list.h"
-
-#include "netif/tcpdump.h"
-
-#define UNIXIF_BPS 512000
-#define UNIXIF_QUEUELEN 6
-/*#define UNIXIF_DROP_FIRST      */
-
-struct unixif_buf {
-  struct pbuf *p;
-  unsigned short len, tot_len;
-  void *payload;  
-};
-
-struct unixif {
-  int fd;
-  sys_sem_t sem;
-  struct list *q;
-};
-
-
-/*-----------------------------------------------------------------------------------*/
-static int
-unix_socket_client(char *name)
-{
-  int fd, len;
-  struct sockaddr_un unix_addr;
-
-                                /* create a Unix domain stream socket */
-  if((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-    perror("unixif: unix_socket_client: socket");
-    return(-1);
-  }
-  
-                                /* fill socket address structure w/our address */
-  memset(&unix_addr, 0, sizeof(unix_addr));
-  unix_addr.sun_family = AF_UNIX;
-  sprintf(unix_addr.sun_path, "%s%05d", "/var/tmp/", getpid());
-#ifndef linux
-  len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
-    strlen(unix_addr.sun_path) + 1;
-  unix_addr.sun_len = len;
-#else
-  len = sizeof(unix_addr.sun_family) +
-    strlen(unix_addr.sun_path) + 1;
-#endif /* linux */
-  
-  unlink(unix_addr.sun_path);             /* in case it already exists */
-  if(bind(fd, (struct sockaddr *) &unix_addr,
-	   sizeof(struct sockaddr_un)) < 0) {
-    perror("unixif: unix_socket_client: socket");
-    return(-1);
-  }
-  if(chmod(unix_addr.sun_path, S_IRWXU | S_IRWXO) < 0) {
-    perror("unixif: unix_socket_client: socket");
-    return(-1);
-  }
-  
-                                /* fill socket address structure w/server's addr */
-  memset(&unix_addr, 0, sizeof(unix_addr));
-  unix_addr.sun_family = AF_UNIX;
-  strcpy(unix_addr.sun_path, name);
-#ifndef linux
-  len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
-    strlen(unix_addr.sun_path) + 1;  
-  unix_addr.sun_len = len;
-#else
-  len = sizeof(unix_addr.sun_family) + strlen(unix_addr.sun_path) + 1;    
-#endif /* linux */
-  if(connect(fd, (struct sockaddr *) &unix_addr,
-	     sizeof(struct sockaddr_un)) < 0) {
-    perror("unixif: unix_socket_client: socket");
-    return(-1);
-  }
-  return(fd);
-}
-
-/*-----------------------------------------------------------------------------------*/
-static int
-unix_socket_server(char *name)
-{
-  int fd, len;
-  struct sockaddr_un unix_addr;
-
-  /* create a Unix domain stream socket */
-  if((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) {
-    perror("unixif: unix_socket_server: socket");
-    return(-1);
-  }
-  
-  unlink(name);   /* in case it already exists */
-  
-  /* fill in socket address structure */
-  memset(&unix_addr, 0, sizeof(unix_addr));
-  unix_addr.sun_family = AF_UNIX;
-  strcpy(unix_addr.sun_path, name);
-#ifndef linux
-  len = sizeof(unix_addr.sun_len) + sizeof(unix_addr.sun_family) +
-    strlen(unix_addr.sun_path) + 1;
-  unix_addr.sun_len = len;
-#else
-  len = sizeof(unix_addr.sun_family) +
-    strlen(unix_addr.sun_path) + 1;
-#endif /* linux */
-  
-  /* bind the name to the descriptor */
-  if(bind(fd, (struct sockaddr *) &unix_addr,
-	   sizeof(struct sockaddr_un)) < 0) {
-    perror("unixif: unix_socket_server: bind");
-    return(-1);
-  }
-
-  if(chmod(unix_addr.sun_path, S_IRWXU | S_IRWXO) < 0) {
-    perror("unixif: unix_socket_server: chmod");
-    return(-1);
-  }
-
-
-  if(listen(fd, 5) < 0) {  /* tell kernel we're a server */
-    perror("unixif: unix_socket_server: listen");
-    return(-1);
-  }
-  
-  return(fd);
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-unixif_input_handler(void *data)
-{
-  struct netif *netif;
-  struct unixif *unixif;
-  char buf[4096], *bufptr;
-  int len, plen, rlen;
-  struct pbuf *p, *q;
-
-  netif = data;
-  unixif = netif->state;
-
-  len = read(unixif->fd, &plen, sizeof(int));
-  if(len == -1) {
-    perror("unixif_irq_handler: read");
-    abort();
-  }
-
-  DEBUGF(UNIXIF_DEBUG, ("unixif_irq_handler: len == %d plen == %d bytes\n", len, plen));  
-  if(len == sizeof(int)) {
-
-    if(plen < 20 || plen > 1500) {
-      DEBUGF(UNIXIF_DEBUG, ("plen %d!\n", plen));
-      return;
-    }
-
-    len = read(unixif->fd, buf, plen);
-    if(len == -1) {
-      perror("unixif_irq_handler: read");
-      abort();
-    }
-    DEBUGF(UNIXIF_DEBUG, ("unixif_irq_handler: read %d bytes\n", len));
-    p = pbuf_alloc(PBUF_LINK, len, PBUF_POOL);
-    
-    if(p != NULL) {
-      rlen = len;
-      bufptr = buf;
-      q = p;
-      while(rlen > 0) {
-        bcopy(bufptr, q->payload, rlen > q->len? q->len: rlen);
-        rlen -= q->len;
-        bufptr += q->len;
-        q = q->next;
-      }
-      pbuf_realloc(p, len);
-#ifdef LINK_STATS
-      stats.link.recv++;
-#endif /* LINK_STATS */
-      tcpdump(p);
-      netif->input(p, netif);
-    } else {
-      DEBUGF(UNIXIF_DEBUG, ("unixif_irq_handler: could not allocate pbuf\n"));
-    }
-      
-
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static void 
-unixif_thread(void *arg)
-{
-  struct netif *netif;
-  struct unixif *unixif;
-  
-  DEBUGF(UNIXIF_DEBUG, ("unixif_thread: started.\n"));
-
-  netif = arg;
-  unixif = netif->state;
-
-
-  while(1) {
-    sys_sem_wait(unixif->sem);
-    unixif_input_handler(netif);
-  }
-  
-}
-/*-----------------------------------------------------------------------------------*/
-static void 
-unixif_thread2(void *arg)
-{
-  struct netif *netif;
-  struct unixif *unixif;
-  fd_set fdset;
-  
-  DEBUGF(UNIXIF_DEBUG, ("unixif_thread2: started.\n"));
-
-  netif = arg;
-  unixif = netif->state;
-
-  while(1) {
-    FD_ZERO(&fdset);
-    FD_SET(unixif->fd, &fdset);
-  
-    if(select(unixif->fd + 1, &fdset, NULL, NULL, NULL) > 0) {
-      sys_sem_signal(unixif->sem);
-    }
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-static void unixif_output_timeout(void *arg);
-
-static err_t
-unixif_output(struct netif *netif, struct pbuf *p, struct ip_addr *ipaddr)
-{
-  struct unixif *unixif;
-  struct unixif_buf *buf;
-  unixif = netif->state;
-
-  buf = malloc(sizeof(struct unixif_buf));
-  buf->p = p;
-  buf->len = p->len;
-  buf->tot_len = p->tot_len;
-  buf->payload = p->payload;
-
-  if(list_elems(unixif->q) == 0) {
-    pbuf_ref(p);
-    list_push(unixif->q, buf);
-    sys_timeout((double)p->tot_len * 8000.0 / UNIXIF_BPS, unixif_output_timeout,
-		netif);
-
-    DEBUGF(UNIXIF_DEBUG, ("unixif_output: first on list\n"));
-    
-  } else {
-    pbuf_ref(p);
-    if(list_push(unixif->q, buf) == 0) {
-#ifdef UNIXIF_DROP_FIRST
-      struct unixif_buf *buf2;
-      
-      buf2 = list_pop(unixif->q);
-      pbuf_free(buf2->p);
-      free(buf2);
-      list_push(unixif->q, buf);
-#else
-      free(buf);
-      pbuf_free(p);
-      
-      DEBUGF(UNIXIF_DEBUG, ("unixif_output: drop\n"));
-      
-#endif /* UNIXIF_DROP_FIRST */
-#ifdef LINK_STATS
-      stats.link.drop++;
-#endif /* LINK_STATS */
-
-    } else {
-      DEBUGF(UNIXIF_DEBUG, ("unixif_output: on list\n"));
-    }
-
-  }
-  return ERR_OK;
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-unixif_output_timeout(void *arg)
-{  
-  struct pbuf *p, *q;  
-  int i, j, len;
-  unsigned short plen, ptot_len;
-  struct unixif_buf *buf;
-  void *payload;
-  struct netif *netif;
-  struct unixif *unixif;
-  char *data;
-
-  netif = arg;
-  unixif = netif->state;
-
-  DEBUGF(UNIXIF_DEBUG, ("unixif_output_timeout\n"));
-
-  /*  buf = unixif->q[0];
-  unixif->q[0] = unixif->q[1];
-  unixif->q[1] = NULL;*/
-  buf = list_pop(unixif->q);
-  
-  p = buf->p;
-
-  plen = p->len;
-  ptot_len = p->tot_len;
-  payload = p->payload;
-  
-  p->len = buf->len;
-  p->tot_len = buf->tot_len;
-  p->payload = buf->payload;
-  
-  
-  if(p->tot_len == 0) {
-
-    DEBUGF(UNIXIF_DEBUG, ("p->len!\n"));
-    abort();
-  }
-  data = malloc(p->tot_len);
-
-  i = 0;
-  for(q = p; q != NULL; q = q->next) {
-    for(j = 0; j < q->len; j++) {
-      data[i] = ((char *)q->payload)[j];
-      i++;
-    }
-  }
-
-  DEBUGF(UNIXIF_DEBUG, ("unixif_output: sending %d (%d) bytes\n",
-			p->len, p->tot_len));
-  
-  len = p->tot_len;
-  if(write(unixif->fd, &len, sizeof(int)) == -1) {
-    perror("unixif_output: write");
-    abort();
-  }
-    
-  if(write(unixif->fd, data, p->tot_len) == -1) {
-    perror("unixif_output: write");
-    abort();
-  }
-  tcpdump(p);
-#ifdef LINK_STATS
-  stats.link.xmit++;
-#endif /* LINK_STATS */
-
-  free(data);
-  free(buf);
-  p->len = plen;
-  p->tot_len = ptot_len;
-  p->payload = payload;
-
-  pbuf_free(p);
-    
-  /*  if(unixif->q[0] != NULL) {
-    sys_timeout(unixif->q[0]->tot_len * 8000 / UNIXIF_BPS,
-		unixif_output_timeout, netif);
-		}*/
-  if(list_elems(unixif->q) > 0) {
-    sys_timeout(((struct unixif_buf *)list_first(unixif->q))->tot_len *
-		8000.0 / UNIXIF_BPS,
-		unixif_output_timeout, netif);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-unixif_init_server(struct netif *netif)
-{
-  int fd, fd2;
-  struct sockaddr_un addr;
-  socklen_t len;
-  struct unixif *unixif;
-
-  fd = unix_socket_server("/tmp/unixif");
-
-  if(fd == -1) {
-    perror("unixif_server");
-    abort();
-  }
-  DEBUGF(UNIXIF_DEBUG, ("unixif_server: fd %d\n", fd));
-    
-  unixif = malloc(sizeof(struct unixif));
-  netif->state = unixif;
-  netif->name[0] = 'u';
-  netif->name[1] = 'n';
-  netif->output = unixif_output;
-  unixif->q = list_new(UNIXIF_QUEUELEN);
-
-  printf("Now run ./simnode.\n");
-  len = sizeof(addr);
-  fd2 = accept(fd, (struct sockaddr *)&addr, &len);
-  
-  if(fd2 == -1) {
-    perror("unixif_accept");
-    abort();
-  } 
-
-  DEBUGF(UNIXIF_DEBUG, ("unixif_accept: %d\n", fd2));
-
-  unixif->fd = fd2;
-  unixif->sem = sys_sem_new(0);
-  sys_thread_new(unixif_thread, netif);
-  sys_thread_new(unixif_thread2, netif);
-}
-/*-----------------------------------------------------------------------------------*/
-void
-unixif_init_client(struct netif *netif)
-{
-  struct unixif *unixif;
-  unixif = malloc(sizeof(struct unixif));
-  netif->state = unixif;
-  netif->name[0] = 'u';
-  netif->name[1] = 'n';
-  netif->output = unixif_output;
-  
-  unixif->fd = unix_socket_client("/tmp/unixif");
-  if(unixif->fd == -1) {
-    perror("unixif_init");
-    abort();
-  }
-  unixif->q = list_new(UNIXIF_QUEUELEN);
-  unixif->sem = sys_sem_new(0);
-  sys_thread_new(unixif_thread, netif);
-  sys_thread_new(unixif_thread2, netif);
-}
-/*-----------------------------------------------------------------------------------*/
-
-

src/arch/unix/perf.c

@@ -1,64 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-#include "arch/perf.h"
-
-#include <stdio.h>
-
-static FILE *f;
-
-void
-perf_print(unsigned long c1l, unsigned long c1h,
-	   unsigned long c2l, unsigned long c2h,
-	   char *key)
-{
-  unsigned long long start, end;
-
-  start = (unsigned long long)c2h << 32 | c2l;
-  end = (unsigned long long)c1h << 32 | c1l;
-  fprintf(f, "%s: %llu\n", key, start - end);
-  fflush(NULL);
-}
-
-void
-perf_print_times(struct tms *start, struct tms *end, char *key)
-{
-  fprintf(f, "%s: %lu\n", key, end->tms_stime - start->tms_stime);
-  fflush(NULL);  
-}
-
-void
-perf_init(char *fname)
-{
-  f = fopen(fname, "w");  
-}
-	

src/arch/unix/sys_arch.c

@@ -1,453 +0,0 @@
-/*
- * 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 <adam@sics.se>
- *
- */
-
-/*
- * Wed Apr 17 16:05:29 EDT 2002 (James Roth)
- *
- *  - Fixed an unlikely sys_thread_new() race condition.
- *
- *  - Made current_thread() work with threads which where
- *    not created with sys_thread_new().  This includes
- *    the main thread and threads made with pthread_create().
- *
- *  - Catch overflows where more than SYS_MBOX_SIZE messages
- *    are waiting to be read.  The sys_mbox_post() routine
- *    will block until there is more room instead of just
- *    leaking messages.
- */
-#include "lwip/debug.h"
-
-#include <errno.h>
-#include <string.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#include "lwip/sys.h"
-#include "lwip/opt.h"
-#include "lwip/stats.h"
-
-#define UMAX(a, b)      ((a) > (b) ? (a) : (b))
-
-static struct sys_thread *threads = NULL;
-static pthread_mutex_t threads_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-struct sys_mbox_msg {
-  struct sys_mbox_msg *next;
-  void *msg;
-};
-
-#define SYS_MBOX_SIZE 128
-
-struct sys_mbox {
-  int first, last;
-  void *msgs[SYS_MBOX_SIZE];
-  struct sys_sem *mail;
-  struct sys_sem *mutex;
-  int wait_send;
-};
-
-struct sys_sem {
-  unsigned int c;
-  pthread_cond_t cond;
-  pthread_mutex_t mutex;
-};
-
-struct sys_thread {
-  struct sys_thread *next;
-  struct sys_timeouts timeouts;
-  pthread_t pthread;
-};
-
-
-static struct timeval starttime;
-
-static struct sys_sem *sys_sem_new_(u8_t count);
-static void sys_sem_free_(struct sys_sem *sem);
-
-static u16_t cond_wait(pthread_cond_t * cond, pthread_mutex_t * mutex,
-		       u16_t timeout);
-
-/*-----------------------------------------------------------------------------------*/
-static struct sys_thread * 
-introduce_thread(pthread_t id)
-{
-  struct sys_thread *thread;
-  
-  thread = malloc(sizeof(struct sys_thread));
-    
-  if(thread) {
-    pthread_mutex_lock(&threads_mutex);
-    thread->next = threads;
-    thread->timeouts.next = NULL;
-    thread->pthread = id;
-    threads = thread;
-    pthread_mutex_unlock(&threads_mutex);
-  }
-    
-  return thread;
-}
-/*-----------------------------------------------------------------------------------*/
-static struct sys_thread *
-current_thread(void)
-{
-  struct sys_thread *st;
-  pthread_t pt;
-  pt = pthread_self();
-  pthread_mutex_lock(&threads_mutex);
-
-  for(st = threads; st != NULL; st = st->next) {    
-    if(pthread_equal(st->pthread, pt)) {
-      pthread_mutex_unlock(&threads_mutex);
-      
-      return st;
-    }
-  }
-
-  pthread_mutex_unlock(&threads_mutex);
-
-  st = introduce_thread(pt);
-
-  if(!st) {
-    printf("current_thread???\n");
-    abort();
-  }
-
-  return st;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_thread_new(void (*function)(void *arg), void *arg)
-{
-  int code;
-  pthread_t tmp;
-  struct sys_thread *st = NULL;
-  
-  code = pthread_create(&tmp,
-			NULL, 
-			(void *(*)(void *)) 
-			function, 
-			arg);
-  
-  if(0 == code) {
-    st = introduce_thread(tmp);
-  }
-  
-  if(NULL == st) {
-    DEBUGF(SYS_DEBUG, ("sys_thread_new: pthread_create %d, st = 0x%x",
-		       code, (int)st));
-    abort();
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_mbox *
-sys_mbox_new()
-{
-  struct sys_mbox *mbox;
-  
-  mbox = malloc(sizeof(struct sys_mbox));
-  mbox->first = mbox->last = 0;
-  mbox->mail = sys_sem_new_(0);
-  mbox->mutex = sys_sem_new_(1);
-  mbox->wait_send = 0;
-  
-#ifdef SYS_STATS
-  stats.sys.mbox.used++;
-  if(stats.sys.mbox.used > stats.sys.mbox.max) {
-    stats.sys.mbox.max = stats.sys.mbox.used;
-  }
-#endif /* SYS_STATS */
-  
-  return mbox;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_free(struct sys_mbox *mbox)
-{
-  if(mbox != SYS_MBOX_NULL) {
-#ifdef SYS_STATS
-    stats.sys.mbox.used--;
-#endif /* SYS_STATS */
-    sys_sem_wait(mbox->mutex);
-    
-    sys_sem_free_(mbox->mail);
-    sys_sem_free_(mbox->mutex);
-    mbox->mail = mbox->mutex = NULL;
-    /*  DEBUGF("sys_mbox_free: mbox 0x%lx\n", mbox); */
-    free(mbox);
-  }
-}
-
-/*-----------------------------------------------------------------------------------*/
-void
-sys_mbox_post(struct sys_mbox *mbox, void *msg)
-{
-  u8_t first;
-  
-  sys_sem_wait(mbox->mutex);
-  
-  DEBUGF(SYS_DEBUG, ("sys_mbox_post: mbox %p msg %p\n", mbox, msg));
-  
-  while((mbox->last + 1) >= (mbox->first + SYS_MBOX_SIZE)) {
-    mbox->wait_send++;
-    sys_sem_signal(mbox->mutex);
-    sys_arch_sem_wait(mbox->mail, 0);
-    sys_arch_sem_wait(mbox->mutex, 0);
-    mbox->wait_send--;
-  }
-  
-  mbox->msgs[mbox->last % SYS_MBOX_SIZE] = msg;
-  
-  if(mbox->last == mbox->first) {
-    first = 1;
-  } else {
-    first = 0;
-  }
-  
-  mbox->last++;
-  
-  if(first) {
-    sys_sem_signal(mbox->mail);
-  }
-
-  sys_sem_signal(mbox->mutex);
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t
-sys_arch_mbox_fetch(struct sys_mbox *mbox, void **msg, u16_t timeout)
-{
-  u16_t time = 1;
-  
-  /* The mutex lock is quick so we don't bother with the timeout
-     stuff here. */
-  sys_arch_sem_wait(mbox->mutex, 0);
-
-  while(mbox->first == mbox->last) {
-    sys_sem_signal(mbox->mutex);
-    
-    /* We block while waiting for a mail to arrive in the mailbox. We
-       must be prepared to timeout. */
-    if(timeout != 0) {
-      time = sys_arch_sem_wait(mbox->mail, timeout);
-      
-      /* If time == 0, the sem_wait timed out, and we return 0. */
-      if(time == 0) {
-	return 0;
-      }
-    } else {
-      sys_arch_sem_wait(mbox->mail, 0);
-    }
-    
-    sys_arch_sem_wait(mbox->mutex, 0);
-  }
-
-  DEBUGF(SYS_DEBUG, ("sys_mbox_fetch: mbox %p msg %p\n", mbox, *msg));
-
-  if(msg != NULL) {
-    *msg = mbox->msgs[mbox->first % SYS_MBOX_SIZE];
-  }
-
-  mbox->first++;
-  
-  if(mbox->wait_send) {
-    sys_sem_signal(mbox->mail);
-  }
-
-  sys_sem_signal(mbox->mutex);
-
-  return time;
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_sem *
-sys_sem_new(u8_t count)
-{
-#ifdef SYS_STATS
-  stats.sys.sem.used++;
-  if(stats.sys.sem.used > stats.sys.sem.max) {
-    stats.sys.sem.max = stats.sys.sem.used;
-  }
-#endif /* SYS_STATS */
-  return sys_sem_new_(count);
-}
-
-/*-----------------------------------------------------------------------------------*/
-static struct sys_sem *
-sys_sem_new_(u8_t count)
-{
-  struct sys_sem *sem;
-  
-  sem = malloc(sizeof(struct sys_sem));
-  sem->c = count;
-  
-  pthread_cond_init(&(sem->cond), NULL);
-  pthread_mutex_init(&(sem->mutex), NULL);
-  
-  return sem;
-}
-
-/*-----------------------------------------------------------------------------------*/
-static u16_t
-cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex, u16_t timeout)
-{
-  int tdiff;
-  unsigned long sec, usec;
-  struct timeval rtime1, rtime2;
-  struct timespec ts;
-  struct timezone tz;
-  int retval;
-  
-  if(timeout > 0) {
-    /* Get a timestamp and add the timeout value. */
-    gettimeofday(&rtime1, &tz);
-    sec = rtime1.tv_sec;
-    usec = rtime1.tv_usec;
-    usec += timeout % 1000 * 1000;
-    sec += (int)(timeout / 1000) + (int)(usec / 1000000);
-    usec = usec % 1000000;
-    ts.tv_nsec = usec * 1000;
-    ts.tv_sec = sec;
-    
-    retval = pthread_cond_timedwait(cond, mutex, &ts);
-    
-    if(retval == ETIMEDOUT) {
-      return 0;
-    } else {
-      /* Calculate for how long we waited for the cond. */
-      gettimeofday(&rtime2, &tz);
-      tdiff = (rtime2.tv_sec - rtime1.tv_sec) * 1000 +
-	(rtime2.tv_usec - rtime1.tv_usec) / 1000;
-      
-      if(tdiff <= 0) {
-	return 1;
-      }
-      
-      return tdiff;
-    }
-  } else {
-    pthread_cond_wait(cond, mutex);
-    return 0;
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-u16_t
-sys_arch_sem_wait(struct sys_sem *sem, u16_t timeout)
-{
-  u16_t time = 1;
-  
-  pthread_mutex_lock(&(sem->mutex));
-  while(sem->c <= 0) {
-    if(timeout > 0) {
-      time = cond_wait(&(sem->cond), &(sem->mutex), timeout);
-      
-      if(time == 0) {
-	pthread_mutex_unlock(&(sem->mutex));
-	return 0;
-      }
-      /*      pthread_mutex_unlock(&(sem->mutex));
-	      return time; */
-    } else {
-      cond_wait(&(sem->cond), &(sem->mutex), 0);
-    }
-  }
-  sem->c--;
-  pthread_mutex_unlock(&(sem->mutex));
-  return time;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_signal(struct sys_sem *sem)
-{
-  pthread_mutex_lock(&(sem->mutex));
-  sem->c++;
-
-  if(sem->c > 1) {
-    sem->c = 1;
-  }
-
-  pthread_cond_broadcast(&(sem->cond));
-  pthread_mutex_unlock(&(sem->mutex));
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_sem_free(struct sys_sem *sem)
-{
-  if(sem != SYS_SEM_NULL) {
-#ifdef SYS_STATS
-    stats.sys.sem.used--;
-#endif /* SYS_STATS */
-    sys_sem_free_(sem);
-  }
-}
-
-/*-----------------------------------------------------------------------------------*/
-static void
-sys_sem_free_(struct sys_sem *sem)
-{
-  pthread_cond_destroy(&(sem->cond));
-  pthread_mutex_destroy(&(sem->mutex));
-  free(sem);
-}
-/*-----------------------------------------------------------------------------------*/
-unsigned long
-sys_unix_now()
-{
-  struct timeval tv;
-  struct timezone tz;
-  long sec, usec;
-  unsigned long msec;
-  gettimeofday(&tv, &tz);
-  
-  sec = tv.tv_sec - starttime.tv_sec;
-  usec = tv.tv_usec - starttime.tv_usec;
-  msec = sec * 1000 + usec / 1000;
-    
-  return msec;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-sys_init()
-{
-  struct timezone tz;
-  gettimeofday(&starttime, &tz);
-}
-/*-----------------------------------------------------------------------------------*/
-struct sys_timeouts *
-sys_arch_timeouts(void)
-{
-  struct sys_thread *thread;
-
-  thread = current_thread();
-  return &thread->timeouts;
-}
-/*-----------------------------------------------------------------------------------*/

src/core/inet.c

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * Copyright (c) 2001-2004 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,
@@ -11,35 +11,35 @@
  *    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. 
+ *    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 
+ * 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 <adam@sics.se>
  *
  */
 
-/*-----------------------------------------------------------------------------------*/
+
 /* inet.c
  *
  * Functions common to all TCP/IP modules, such as the Internet checksum and the
  * byte order functions.
  *
  */
-/*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+
+#include "lwip/opt.h"
 
 #include "lwip/arch.h"
 
@@ -47,39 +47,44 @@
 #include "lwip/inet.h"
 
 
-/*-----------------------------------------------------------------------------------*/
+
 static u16_t
 lwip_chksum(void *dataptr, int len)
 {
   u32_t acc;
-    
+
+  LWIP_DEBUGF(INET_DEBUG, ("lwip_chksum(%p, %d)\n", (void *)dataptr, len));
   for(acc = 0; len > 1; len -= 2) {
-    acc += *((u16_t *)dataptr)++;
+      /*    acc = acc + *((u16_t *)dataptr)++;*/
+    acc += *(u16_t *)dataptr;
+    dataptr = (void *)((u16_t *)dataptr + 1);
   }
 
   /* add up any odd byte */
-  if(len == 1) {
+  if (len == 1) {
     acc += htons((u16_t)((*(u8_t *)dataptr) & 0xff) << 8);
-    DEBUGF(INET_DEBUG, ("inet: chksum: odd byte %d\n", *(u8_t *)dataptr));
+    LWIP_DEBUGF(INET_DEBUG, ("inet: chksum: odd byte %d\n", (unsigned int)(*(u8_t *)dataptr)));
+  } else {
+    LWIP_DEBUGF(INET_DEBUG, ("inet: chksum: no odd byte\n"));
   }
   acc = (acc >> 16) + (acc & 0xffffUL);
 
-  if(acc & 0xffff0000 != 0) {
+  if ((acc & 0xffff0000) != 0) {
     acc = (acc >> 16) + (acc & 0xffffUL);
   }
 
   return (u16_t)acc;
 }
-/*-----------------------------------------------------------------------------------*/
+
 /* inet_chksum_pseudo:
  *
  * Calculates the pseudo Internet checksum used by TCP and UDP for a pbuf chain.
  */
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum_pseudo(struct pbuf *p,
-		   struct ip_addr *src, struct ip_addr *dest,
-		   u8_t proto, u16_t proto_len)
+       struct ip_addr *src, struct ip_addr *dest,
+       u8_t proto, u16_t proto_len)
 {
   u32_t acc;
   struct pbuf *q;
@@ -87,18 +92,23 @@ inet_chksum_pseudo(struct pbuf *p,
 
   acc = 0;
   swapped = 0;
-  for(q = p; q != NULL; q = q->next) {    
+  /* iterate through all pbuf in chain */
+  for(q = p; q != NULL; q = q->next) {
+    LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): checksumming pbuf %p (has next %p) \n",
+      (void *)q, (void *)q->next));
     acc += lwip_chksum(q->payload, q->len);
-    while(acc >> 16) {
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%lx \n", acc));*/
+    while (acc >> 16) {
       acc = (acc & 0xffffUL) + (acc >> 16);
     }
-    if(q->len % 2 != 0) {
+    if (q->len % 2 != 0) {
       swapped = 1 - swapped;
       acc = ((acc & 0xff) << 8) | ((acc & 0xff00UL) >> 8);
     }
+    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%lx \n", acc));*/
   }
 
-  if(swapped) {
+  if (swapped) {
     acc = ((acc & 0xff) << 8) | ((acc & 0xff00UL) >> 8);
   }
   acc += (src->addr & 0xffffUL);
@@ -106,57 +116,250 @@ inet_chksum_pseudo(struct pbuf *p,
   acc += (dest->addr & 0xffffUL);
   acc += ((dest->addr >> 16) & 0xffffUL);
   acc += (u32_t)htons((u16_t)proto);
-  acc += (u32_t)htons(proto_len);  
-  
-  while(acc >> 16) {
+  acc += (u32_t)htons(proto_len);
+
+  while (acc >> 16) {
     acc = (acc & 0xffffUL) + (acc >> 16);
-  }    
+  }
+  LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): pbuf chain lwip_chksum()=%lx\n", acc));
   return ~(acc & 0xffffUL);
 }
-/*-----------------------------------------------------------------------------------*/
+
 /* inet_chksum:
  *
  * Calculates the Internet checksum over a portion of memory. Used primarely for IP
  * and ICMP.
  */
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum(void *dataptr, u16_t len)
 {
   u32_t acc;
 
   acc = lwip_chksum(dataptr, len);
-  while(acc >> 16) {
+  while (acc >> 16) {
     acc = (acc & 0xffff) + (acc >> 16);
-  }    
+  }
   return ~(acc & 0xffff);
 }
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum_pbuf(struct pbuf *p)
 {
   u32_t acc;
   struct pbuf *q;
   u8_t swapped;
-  
+
   acc = 0;
   swapped = 0;
   for(q = p; q != NULL; q = q->next) {
     acc += lwip_chksum(q->payload, q->len);
-    while(acc >> 16) {
-      acc = (acc & 0xffff) + (acc >> 16);
-    }    
-    if(q->len % 2 != 0) {
+    while (acc >> 16) {
+      acc = (acc & 0xffffUL) + (acc >> 16);
+    }
+    if (q->len % 2 != 0) {
       swapped = 1 - swapped;
-      acc = (acc & 0xff << 8) | (acc & 0xff00 >> 8);
+      acc = (acc & 0x00ffUL << 8) | (acc & 0xff00UL >> 8);
     }
   }
- 
-  if(swapped) {
-    acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
+
+  if (swapped) {
+    acc = ((acc & 0x00ffUL) << 8) | ((acc & 0xff00UL) >> 8);
   }
-  return ~(acc & 0xffff);
+  return ~(acc & 0xffffUL);
+}
+
+/* Here for now until needed in other places in lwIP */
+#ifndef isascii
+#define in_range(c, lo, up)  ((u8_t)c >= lo && (u8_t)c <= up)
+#define isascii(c)           in_range(c, 0x20, 0x7f)
+#define isdigit(c)           in_range(c, '0', '9')
+#define isxdigit(c)          (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F'))
+#define islower(c)           in_range(c, 'a', 'z')
+#define isspace(c)           (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
+#endif		
+		
+
+ /*
+  * Ascii internet address interpretation routine.
+  * The value returned is in network order.
+  */
+
+ /*  */
+ /* inet_addr */
+ u32_t inet_addr(const char *cp)
+ {
+     struct in_addr val;
+
+     if (inet_aton(cp, &val)) {
+         return (val.s_addr);
+     }
+     return (INADDR_NONE);
+ }
+
+ /*
+  * Check whether "cp" is a valid ascii representation
+  * of an Internet address and convert to a binary address.
+  * Returns 1 if the address is valid, 0 if not.
+  * This replaces inet_addr, the return value from which
+  * cannot distinguish between failure and a local broadcast address.
+  */
+ /*  */
+ /* inet_aton */
+ int inet_aton(const char *cp, struct in_addr *addr)
+ {
+     u32_t val;
+     int base, n;
+     char c;
+     u32_t parts[4];
+     u32_t* pp = parts;
+
+     c = *cp;
+     for (;;) {
+         /*
+          * Collect number up to ``.''.
+          * Values are specified as for C:
+          * 0x=hex, 0=octal, isdigit=decimal.
+          */
+         if (!isdigit(c))
+             return (0);
+         val = 0; base = 10;
+         if (c == '0') {
+             c = *++cp;
+             if (c == 'x' || c == 'X')
+                 base = 16, c = *++cp;
+             else
+                 base = 8;
+         }
+         for (;;) {
+             if (isascii(c) && isdigit(c)) {
+                 val = (val * base) + (c - '0');
+                 c = *++cp;
+             } else if (base == 16 && isascii(c) && isxdigit(c)) {
+                 val = (val << 4) |
+                     (c + 10 - (islower(c) ? 'a' : 'A'));
+                 c = *++cp;
+             } else
+             break;
+         }
+         if (c == '.') {
+             /*
+              * Internet format:
+              *  a.b.c.d
+              *  a.b.c   (with c treated as 16 bits)
+              *  a.b (with b treated as 24 bits)
+              */
+             if (pp >= parts + 3)
+                 return (0);
+             *pp++ = val;
+             c = *++cp;
+         } else
+             break;
+     }
+     /*
+      * Check for trailing characters.
+      */
+     if (c != '\0' && (!isascii(c) || !isspace(c)))
+         return (0);
+     /*
+      * Concoct the address according to
+      * the number of parts specified.
+      */
+     n = pp - parts + 1;
+     switch (n) {
+
+     case 0:
+         return (0);     /* initial nondigit */
+
+     case 1:             /* a -- 32 bits */
+         break;
+
+     case 2:             /* a.b -- 8.24 bits */
+         if (val > 0xffffff)
+             return (0);
+         val |= parts[0] << 24;
+         break;
+
+     case 3:             /* a.b.c -- 8.8.16 bits */
+         if (val > 0xffff)
+             return (0);
+         val |= (parts[0] << 24) | (parts[1] << 16);
+         break;
+
+     case 4:             /* a.b.c.d -- 8.8.8.8 bits */
+         if (val > 0xff)
+             return (0);
+         val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
+         break;
+     }
+     if (addr)
+         addr->s_addr = htonl(val);
+     return (1);
+ }
+
+/* Convert numeric IP address into decimal dotted ASCII representation.
+ * returns ptr to static buffer; not reentrant!
+ */
+char *inet_ntoa(struct in_addr addr)
+{
+  static u8_t str[16];
+  u32_t s_addr = addr.s_addr;
+  u8_t inv[3];
+  u8_t *rp;
+  u8_t *ap;
+  u8_t rem;
+  u8_t n;
+  u8_t i;
+
+  rp = str;
+  ap = (char *)&s_addr;
+  for(n = 0; n < 4; n++) {
+    i = 0;
+    do {
+      rem = *ap % (u8_t)10;
+      *ap /= (u8_t)10;
+      inv[i++] = '0' + rem;
+    } while(*ap);
+    while(i--)
+      *rp++ = inv[i];
+    *rp++ = '.';
+    ap++;
+  }
+  *--rp = 0;
+  return str;
 }
 
 
-/*-----------------------------------------------------------------------------------*/
+#ifndef BYTE_ORDER
+#error BYTE_ORDER is not defined
+#endif
+#if BYTE_ORDER == LITTLE_ENDIAN
+
+u16_t
+htons(u16_t n)
+{
+  return ((n & 0xff) << 8) | ((n & 0xff00) >> 8);
+}
+
+u16_t
+ntohs(u16_t n)
+{
+  return htons(n);
+}
+
+u32_t
+htonl(u32_t n)
+{
+  return ((n & 0xff) << 24) |
+    ((n & 0xff00) << 8) |
+    ((n & 0xff0000) >> 8) |
+    ((n & 0xff000000) >> 24);
+}
+
+u32_t
+ntohl(u32_t n)
+{
+  return htonl(n);
+}
+
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */

src/core/inet6.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -30,22 +30,22 @@
  *
  */
 
-/*-----------------------------------------------------------------------------------*/
+
 /* inet6.c
  *
  * Functions common to all TCP/IP modules, such as the Internet checksum and the
  * byte order functions.
  *
  */
-/*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/inet.h"
 
 
-/*-----------------------------------------------------------------------------------*/
+
 /* chksum:
  *
  * Sums up all 16 bit words in a memory portion. Also includes any odd byte.
@@ -54,7 +54,7 @@
  * For now, this is not optimized. Must be optimized for the particular processor
  * arcitecture on which it is to run. Preferebly coded in assembler.
  */
-/*-----------------------------------------------------------------------------------*/
+
 static u32_t
 chksum(void *dataptr, u16_t len)
 {
@@ -67,23 +67,23 @@ chksum(void *dataptr, u16_t len)
   }
 
   /* add up any odd byte */
-  if(len == 1) {
+  if (len == 1) {
     acc += htons((u16_t)(*(u8_t *)dataptr) << 8);
   }
 
   return acc;
 
 }
-/*-----------------------------------------------------------------------------------*/
+
 /* inet_chksum_pseudo:
  *
  * Calculates the pseudo Internet checksum used by TCP and UDP for a pbuf chain.
  */
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum_pseudo(struct pbuf *p,
-		   struct ip_addr *src, struct ip_addr *dest,
-		   u8_t proto, u32_t proto_len)
+       struct ip_addr *src, struct ip_addr *dest,
+       u8_t proto, u32_t proto_len)
 {
   u32_t acc;
   struct pbuf *q;
@@ -93,23 +93,23 @@ inet_chksum_pseudo(struct pbuf *p,
   swapped = 0;
   for(q = p; q != NULL; q = q->next) {    
     acc += chksum(q->payload, q->len);
-    while(acc >> 16) {
+    while (acc >> 16) {
       acc = (acc & 0xffff) + (acc >> 16);
     }
-    if(q->len % 2 != 0) {
+    if (q->len % 2 != 0) {
       swapped = 1 - swapped;
       acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
     }
   }
 
-  if(swapped) {
+  if (swapped) {
     acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
   }
   
   for(i = 0; i < 8; i++) {
     acc += ((u16_t *)src->addr)[i] & 0xffff;
     acc += ((u16_t *)dest->addr)[i] & 0xffff;
-    while(acc >> 16) {
+    while (acc >> 16) {
       acc = (acc & 0xffff) + (acc >> 16);
     }
   }
@@ -117,18 +117,18 @@ inet_chksum_pseudo(struct pbuf *p,
   acc += ((u16_t *)&proto_len)[0] & 0xffff;
   acc += ((u16_t *)&proto_len)[1] & 0xffff;
 
-  while(acc >> 16) {
+  while (acc >> 16) {
     acc = (acc & 0xffff) + (acc >> 16);
   }
   return ~(acc & 0xffff);
 }
-/*-----------------------------------------------------------------------------------*/
+
 /* inet_chksum:
  *
  * Calculates the Internet checksum over a portion of memory. Used primarely for IP
  * and ICMP.
  */
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum(void *dataptr, u16_t len)
 {
@@ -139,7 +139,7 @@ inet_chksum(void *dataptr, u16_t len)
   sum += (sum >> 16);
   return ~(sum & 0xffff);
 }
-/*-----------------------------------------------------------------------------------*/
+
 u16_t
 inet_chksum_pbuf(struct pbuf *p)
 {
@@ -151,18 +151,18 @@ inet_chksum_pbuf(struct pbuf *p)
   swapped = 0;
   for(q = p; q != NULL; q = q->next) {
     acc += chksum(q->payload, q->len);
-    while(acc >> 16) {
+    while (acc >> 16) {
       acc = (acc & 0xffff) + (acc >> 16);
     }    
-    if(q->len % 2 != 0) {
+    if (q->len % 2 != 0) {
       swapped = 1 - swapped;
       acc = (acc & 0xff << 8) | (acc & 0xff00 >> 8);
     }
   }
  
-  if(swapped) {
+  if (swapped) {
     acc = ((acc & 0xff) << 8) | ((acc & 0xff00) >> 8);
   }
   return ~(acc & 0xffff);
 }
-/*-----------------------------------------------------------------------------------*/
+

src/core/ipv4/icmp.c

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * Copyright (c) 2001-2004 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,
@@ -11,21 +11,21 @@
  *    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. 
+ *    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 
+ * 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 <adam@sics.se>
  *
  */
@@ -33,7 +33,7 @@
 /* Some ICMP messages should be passed to the transport protocols. This
    is not implemented. */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/icmp.h"
 #include "lwip/inet.h"
@@ -42,56 +42,58 @@
 
 #include "lwip/stats.h"
 
-/*-----------------------------------------------------------------------------------*/
+#include "lwip/snmp.h"
+
 void
 icmp_input(struct pbuf *p, struct netif *inp)
 {
   unsigned char type;
+  unsigned char code;
   struct icmp_echo_hdr *iecho;
   struct ip_hdr *iphdr;
   struct ip_addr tmpaddr;
   u16_t hlen;
-  
-#ifdef ICMP_STATS
-  ++stats.icmp.recv;
-#endif /* ICMP_STATS */
 
-  
+  ICMP_STATS_INC(icmp.recv);
+  snmp_inc_icmpinmsgs();
+
+
   iphdr = p->payload;
-  hlen = IPH_HL(iphdr) * 4/sizeof(u8_t);
-  pbuf_header(p, -hlen);
+  hlen = IPH_HL(iphdr) * 4;
+  if (pbuf_header(p, -((s16_t)hlen)) || (p->tot_len < sizeof(u16_t)*2)) {
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: short ICMP (%u bytes) received\n", p->tot_len));
+    pbuf_free(p);
+    ICMP_STATS_INC(icmp.lenerr);
+    snmp_inc_icmpinerrors();
+    return;
+  }
 
   type = *((u8_t *)p->payload);
-
-  switch(type) {
+  code = *(((u8_t *)p->payload)+1);
+  switch (type) {
   case ICMP_ECHO:
-    if(ip_addr_isbroadcast(&iphdr->dest, &inp->netmask) ||
-       ip_addr_ismulticast(&iphdr->dest)) {
-      DEBUGF(ICMP_DEBUG, ("Smurf.\n"));
-#ifdef ICMP_STATS
-      ++stats.icmp.err;
-#endif /* ICMP_STATS */
+    /* broadcast or multicast destination address? */
+    if (ip_addr_isbroadcast(&iphdr->dest, inp) || ip_addr_ismulticast(&iphdr->dest)) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("Smurf.\n"));
+      ICMP_STATS_INC(icmp.err);
       pbuf_free(p);
       return;
     }
-    DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
-    DEBUGF(DEMO_DEBUG, ("Pong!\n"));
-    if(p->tot_len < sizeof(struct icmp_echo_hdr)) {
-      DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
+    if (p->tot_len < sizeof(struct icmp_echo_hdr)) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
       pbuf_free(p);
-#ifdef ICMP_STATS
-      ++stats.icmp.lenerr;
-#endif /* ICMP_STATS */
+      ICMP_STATS_INC(icmp.lenerr);
+      snmp_inc_icmpinerrors();
 
-      return;      
+      return;
     }
-    iecho = p->payload;    
-    if(inet_chksum_pbuf(p) != 0) {
-      DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo\n"));
+    iecho = p->payload;
+    if (inet_chksum_pbuf(p) != 0) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo\n"));
       pbuf_free(p);
-#ifdef ICMP_STATS
-      ++stats.icmp.chkerr;
-#endif /* ICMP_STATS */
+      ICMP_STATS_INC(icmp.chkerr);
+      snmp_inc_icmpinerrors();
       return;
     }
     tmpaddr.addr = iphdr->src.addr;
@@ -99,59 +101,61 @@ icmp_input(struct pbuf *p, struct netif *inp)
     iphdr->dest.addr = tmpaddr.addr;
     ICMPH_TYPE_SET(iecho, ICMP_ER);
     /* adjust the checksum */
-    if(iecho->chksum >= htons(0xffff - (ICMP_ECHO << 8))) {
+    if (iecho->chksum >= htons(0xffff - (ICMP_ECHO << 8))) {
       iecho->chksum += htons(ICMP_ECHO << 8) + 1;
     } else {
       iecho->chksum += htons(ICMP_ECHO << 8);
     }
-#ifdef ICMP_STATS
-    ++stats.icmp.xmit;
-#endif /* ICMP_STATS */
+    ICMP_STATS_INC(icmp.xmit);
+    /* increase number of messages attempted to send */
+    snmp_inc_icmpoutmsgs();
+    /* increase number of echo replies attempted to send */
+    snmp_inc_icmpoutechoreps();
 
     pbuf_header(p, hlen);
     ip_output_if(p, &(iphdr->src), IP_HDRINCL,
-		 IPH_TTL(iphdr), IP_PROTO_ICMP, inp);
-    break; 
+		 IPH_TTL(iphdr), 0, IP_PROTO_ICMP, inp);
+    break;
   default:
-    DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type not supported.\n"));
-#ifdef ICMP_STATS
-    ++stats.icmp.proterr;
-    ++stats.icmp.drop;
-#endif /* ICMP_STATS */
+  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %d code %d not supported.\n", (int)type, (int)code));
+    ICMP_STATS_INC(icmp.proterr);
+    ICMP_STATS_INC(icmp.drop);
   }
   pbuf_free(p);
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t)
 {
   struct pbuf *q;
   struct ip_hdr *iphdr;
   struct icmp_dur_hdr *idur;
-  
-  q = pbuf_alloc(PBUF_TRANSPORT, 8 + IP_HLEN + 8, PBUF_RAM);
+
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
   /* ICMP header + IP header + 8 bytes of data */
 
   iphdr = p->payload;
-  
+
   idur = q->payload;
   ICMPH_TYPE_SET(idur, ICMP_DUR);
   ICMPH_CODE_SET(idur, t);
 
-  bcopy(p->payload, (char *)q->payload + 8, IP_HLEN + 8);
-  
+  memcpy((char *)q->payload + 8, p->payload, IP_HLEN + 8);
+
   /* calculate checksum */
   idur->chksum = 0;
   idur->chksum = inet_chksum(idur, q->len);
-#ifdef ICMP_STATS
-  ++stats.icmp.xmit;
-#endif /* ICMP_STATS */
+  ICMP_STATS_INC(icmp.xmit);
+  /* increase number of messages attempted to send */
+  snmp_inc_icmpoutmsgs();
+  /* increase number of destination unreachable messages attempted to send */
+  snmp_inc_icmpoutdestunreachs();
 
   ip_output(q, NULL, &(iphdr->src),
-	    ICMP_TTL, IP_PROTO_ICMP);
+	    ICMP_TTL, 0, IP_PROTO_ICMP);
   pbuf_free(q);
 }
-/*-----------------------------------------------------------------------------------*/
+
 #if IP_FORWARD
 void
 icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
@@ -160,36 +164,36 @@ icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
   struct ip_hdr *iphdr;
   struct icmp_te_hdr *tehdr;
 
-  q = pbuf_alloc(PBUF_TRANSPORT, 8 + IP_HLEN + 8, PBUF_RAM);
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
 
   iphdr = p->payload;
-#if ICMP_DEBUG
-  DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded from "));
-  ip_addr_debug_print(&(iphdr->src));
-  DEBUGF(ICMP_DEBUG, (" to "));
-  ip_addr_debug_print(&(iphdr->dest));
-  DEBUGF(ICMP_DEBUG, ("\n"));
-#endif /* ICMP_DEBNUG */
+  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded from "));
+  ip_addr_debug_print(ICMP_DEBUG, &(iphdr->src));
+  LWIP_DEBUGF(ICMP_DEBUG, (" to "));
+  ip_addr_debug_print(ICMP_DEBUG, &(iphdr->dest));
+  LWIP_DEBUGF(ICMP_DEBUG, ("\n"));
 
   tehdr = q->payload;
   ICMPH_TYPE_SET(tehdr, ICMP_TE);
   ICMPH_CODE_SET(tehdr, t);
 
   /* copy fields from original packet */
-  bcopy((char *)p->payload, (char *)q->payload + 8, IP_HLEN + 8);
-  
+  memcpy((char *)q->payload + 8, (char *)p->payload, IP_HLEN + 8);
+
   /* calculate checksum */
   tehdr->chksum = 0;
   tehdr->chksum = inet_chksum(tehdr, q->len);
-#ifdef ICMP_STATS
-  ++stats.icmp.xmit;
-#endif /* ICMP_STATS */
+  ICMP_STATS_INC(icmp.xmit);
+  /* increase number of messages attempted to send */
+  snmp_inc_icmpoutmsgs();
+  /* increase number of destination unreachable messages attempted to send */
+  snmp_inc_icmpouttimeexcds();
   ip_output(q, NULL, &(iphdr->src),
-	    ICMP_TTL, IP_PROTO_ICMP);
+	    ICMP_TTL, 0, IP_PROTO_ICMP);
   pbuf_free(q);
 }
 
-#endif /* IP_FORWARDING > 0 */
+#endif /* IP_FORWARD */
 
 
 

src/core/ipv4/ip.c

@@ -1,8 +1,15 @@
-/*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
- * All rights reserved. 
+/* @file
+ *
+ * This is the IP layer implementation for incoming and outgoing IP traffic.
  * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * @see ip_frag.c
+ *
+ */
+/*
+ * Copyright (c) 2001-2004 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,
@@ -11,42 +18,35 @@
  *    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. 
+ *    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 
+ * 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 <adam@sics.se>
  *
  */
 
-
-/*-----------------------------------------------------------------------------------*/
-/* ip.c
- *
- * This is the code for the IP layer.
- *
- */   
-/*-----------------------------------------------------------------------------------*/
-
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/mem.h"
 #include "lwip/ip.h"
+#include "lwip/ip_frag.h"
 #include "lwip/inet.h"
 #include "lwip/netif.h"
 #include "lwip/icmp.h"
+#include "lwip/raw.h"
 #include "lwip/udp.h"
 #include "lwip/tcp.h"
 
@@ -54,321 +54,108 @@
 
 #include "arch/perf.h"
 
+#include "lwip/snmp.h"
 #if LWIP_DHCP
-#include "lwip/dhcp.h"
+#  include "lwip/dhcp.h"
 #endif /* LWIP_DHCP */
 
-/*-----------------------------------------------------------------------------------*/
-/* ip_init:
- *
+
+/**
  * Initializes the IP layer.
  */
-/*-----------------------------------------------------------------------------------*/
+
 void
 ip_init(void)
 {
+  /* no initializations as of yet */
 }
-/*-----------------------------------------------------------------------------------*/
-/* ip_lookup:
- *
- * An experimental feature that will be changed in future versions. Do
- * not depend on it yet...
- */
-/*-----------------------------------------------------------------------------------*/
-#ifdef LWIP_DEBUG
-u8_t
-ip_lookup(void *header, struct netif *inp)
-{
-  struct ip_hdr *iphdr;
 
-  iphdr = header;
-
-  /* Refuse anything that isn't IPv4. */
-  if(IPH_V(iphdr) != 4) {
-    return 0;
-  }
-
-  /* Immediately accept/decline packets that are fragments or has
-     options. */
-#if IP_REASSEMBLY == 0
-  /*  if((IPH_OFFSET(iphdr) & htons(IP_OFFMASK | IP_MF)) != 0) {
-    return 0;
-    }*/
-#endif /* IP_REASSEMBLY == 0 */
-
-#if IP_OPTIONS == 0
-  if(IPH_HL(iphdr) != 5) {
-    return 0;
-  }
-#endif /* IP_OPTIONS == 0 */
-  
-  switch(IPH_PROTO(iphdr)) {
-#if LWIP_UDP > 0
-  case IP_PROTO_UDP:
-    return udp_lookup(iphdr, inp);
-    break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP > 0    
-  case IP_PROTO_TCP:
-    return 1;
-#endif /* LWIP_TCP */
-  case IP_PROTO_ICMP:
-    return 1;
-    break;
-  default:
-    return 0;
-  }
-}
-#endif /* LWIP_DEBUG */
-/*-----------------------------------------------------------------------------------*/
-/* ip_route:
- *
+/**
  * Finds the appropriate network interface for a given IP address. It
  * searches the list of network interfaces linearly. A match is found
  * if the masked IP address of the network interface equals the masked
  * IP address given to the function.
  */
-/*-----------------------------------------------------------------------------------*/
+
 struct netif *
 ip_route(struct ip_addr *dest)
 {
   struct netif *netif;
-  
+
+  /* iterate through netifs */
   for(netif = netif_list; netif != NULL; netif = netif->next) {
-    if(ip_addr_maskcmp(dest, &(netif->ip_addr), &(netif->netmask))) {
+    /* network mask matches? */
+    if (ip_addr_maskcmp(dest, &(netif->ip_addr), &(netif->netmask))) {
+      /* return netif on which to forward IP packet */
       return netif;
     }
   }
-
+  /* no matching netif found, use default netif */
   return netif_default;
 }
 #if IP_FORWARD
-/*-----------------------------------------------------------------------------------*/
-/* ip_forward:
- *
+
+/**
  * Forwards an IP packet. It finds an appropriate route for the
  * packet, decrements the TTL value of the packet, adjusts the
  * checksum and outputs the packet on the appropriate interface.
  */
-/*-----------------------------------------------------------------------------------*/
+
 static void
 ip_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp)
 {
-  static struct netif *netif;
-  
+  struct netif *netif;
+
   PERF_START;
-  
-  if((netif = ip_route((struct ip_addr *)&(iphdr->dest))) == NULL) {
-
-    DEBUGF(IP_DEBUG, ("ip_forward: no forwarding route for 0x%lx found\n",
-		      iphdr->dest.addr));
-
+  /* Find network interface where to forward this IP packet to. */
+  netif = ip_route((struct ip_addr *)&(iphdr->dest));
+  if (netif == NULL) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_forward: no forwarding route for 0x%lx found\n",
+                      iphdr->dest.addr));
+    snmp_inc_ipnoroutes();
+    return;
+  }
+  /* Do not forward packets onto the same network interface on which
+   * they arrived. */
+  if (netif == inp) {
+    LWIP_DEBUGF(IP_DEBUG, ("ip_forward: not bouncing packets back on incoming interface.\n"));
+    snmp_inc_ipnoroutes();
     return;
   }
 
-  /* Don't forward packets onto the same network interface on which
-     they arrived. */
-  if(netif == inp) {
-    DEBUGF(IP_DEBUG, ("ip_forward: not forward packets back on incoming interface.\n"));
-
-    return;
-  }
-  
-  /* Decrement TTL and send ICMP if ttl == 0. */
+  /* decrement TTL */
   IPH_TTL_SET(iphdr, IPH_TTL(iphdr) - 1);
-  if(IPH_TTL(iphdr) == 0) {
+  /* send ICMP if TTL == 0 */
+  if (IPH_TTL(iphdr) == 0) {
     /* Don't send ICMP messages in response to ICMP messages */
-    if(IPH_PROTO(iphdr) != IP_PROTO_ICMP) {
+    if (IPH_PROTO(iphdr) != IP_PROTO_ICMP) {
       icmp_time_exceeded(p, ICMP_TE_TTL);
+      snmp_inc_icmpouttimeexcds();
     }
-    return;       
+    return;
   }
-  
-  /* Incremental update of the IP checksum. */
-  if(IPH_CHKSUM(iphdr) >= htons(0xffff - 0x100)) {
+
+  /* Incrementally update the IP checksum. */
+  if (IPH_CHKSUM(iphdr) >= htons(0xffff - 0x100)) {
     IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + htons(0x100) + 1);
   } else {
     IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + htons(0x100));
   }
 
-  DEBUGF(IP_DEBUG, ("ip_forward: forwarding packet to 0x%lx\n",
-		    iphdr->dest.addr));
+  LWIP_DEBUGF(IP_DEBUG, ("ip_forward: forwarding packet to 0x%lx\n",
+                    iphdr->dest.addr));
 
-#ifdef IP_STATS
-  ++stats.ip.fw;
-  ++stats.ip.xmit;
-#endif /* IP_STATS */
+  IP_STATS_INC(ip.fw);
+  IP_STATS_INC(ip.xmit);
+    snmp_inc_ipforwdatagrams();
 
   PERF_STOP("ip_forward");
-  
+  /* transmit pbuf on chosen interface */
   netif->output(netif, p, (struct ip_addr *)&(iphdr->dest));
 }
 #endif /* IP_FORWARD */
-/*-----------------------------------------------------------------------------------*/
-/* ip_reass:
- *
- * Tries to reassemble a fragmented IP packet.
- */
-/*-----------------------------------------------------------------------------------*/
-#define IP_REASSEMBLY 1
-#define IP_REASS_BUFSIZE 5760
-#define IP_REASS_MAXAGE 10
 
-#if IP_REASSEMBLY
-static u8_t ip_reassbuf[IP_HLEN + IP_REASS_BUFSIZE];
-static u8_t ip_reassbitmap[IP_REASS_BUFSIZE / (8 * 8)];
-static const u8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
-				    0x0f, 0x07, 0x03, 0x01};
-static u16_t ip_reasslen;
-static u8_t ip_reassflags;
-#define IP_REASS_FLAG_LASTFRAG 0x01
-static u8_t ip_reasstmr;
-
-static struct pbuf *
-ip_reass(struct pbuf *p)
-{
-  struct pbuf *q;
-  struct ip_hdr *fraghdr, *iphdr;
-  u16_t offset, len;
-  u16_t i;
-  
-  iphdr = (struct ip_hdr *)ip_reassbuf;
-  fraghdr = (struct ip_hdr *)p->payload;
-
-  /* If ip_reasstmr is zero, no packet is present in the buffer, so we
-     write the IP header of the fragment into the reassembly
-     buffer. The timer is updated with the maximum age. */
-  if(ip_reasstmr == 0) {
-    DEBUGF(IP_REASS_DEBUG, ("ip_reass: new packet\n"));
-    bcopy(fraghdr, iphdr, IP_HLEN);
-    ip_reasstmr = IP_REASS_MAXAGE;
-    ip_reassflags = 0;
-    /* Clear the bitmap. */
-    bzero(ip_reassbitmap, sizeof(ip_reassbitmap));
-  }
-
-  /* Check if the incoming fragment matches the one currently present
-     in the reasembly buffer. If so, we proceed with copying the
-     fragment into the buffer. */
-  if(ip_addr_cmp(&iphdr->src, &fraghdr->src) &&
-     ip_addr_cmp(&iphdr->dest, &fraghdr->dest) &&
-     IPH_ID(iphdr) == IPH_ID(fraghdr)) {
-    DEBUGF(IP_REASS_DEBUG, ("ip_reass: matching old packet\n"));
-    /* Find out the offset in the reassembly buffer where we should
-       copy the fragment. */
-    len = ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
-    offset = (ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
-
-    /* If the offset or the offset + fragment length overflows the
-       reassembly buffer, we discard the entire packet. */
-    if(offset > IP_REASS_BUFSIZE ||
-       offset + len > IP_REASS_BUFSIZE) {
-      DEBUGF(IP_REASS_DEBUG, ("ip_reass: fragment outside of buffer (%d:%d/%d).\n",
-			      offset, offset + len, IP_REASS_BUFSIZE));
-      ip_reasstmr = 0;
-      goto nullreturn;
-    }
-
-    /* Copy the fragment into the reassembly buffer, at the right
-       offset. */
-    DEBUGF(IP_REASS_DEBUG, ("ip_reass: copying with offset %d into %d:%d\n",
-			    offset, IP_HLEN + offset, IP_HLEN + offset + len));
-    bcopy((u8_t *)fraghdr + IPH_HL(fraghdr) * 4,
-	  &ip_reassbuf[IP_HLEN + offset], len);
-
-    /* Update the bitmap. */
-    if(offset / (8 * 8) == (offset + len) / (8 * 8)) {
-      DEBUGF(IP_REASS_DEBUG, ("ip_reass: updating single byte in bitmap.\n"));
-      /* If the two endpoints are in the same byte, we only update
-	 that byte. */
-      ip_reassbitmap[offset / (8 * 8)] |=
-	bitmap_bits[(offset / 8 ) & 7] &
-	~bitmap_bits[((offset + len) / 8 ) & 7];
-    } else {
-      /* If the two endpoints are in different bytes, we update the
-	 bytes in the endpoints and fill the stuff inbetween with
-	 0xff. */
-      ip_reassbitmap[offset / (8 * 8)] |= bitmap_bits[(offset / 8 ) & 7];
-      DEBUGF(IP_REASS_DEBUG, ("ip_reass: updating many bytes in bitmap (%d:%d).\n",
-			      1 + offset / (8 * 8), (offset + len) / (8 * 8)));
-      for(i = 1 + offset / (8 * 8); i < (offset + len) / (8 * 8); ++i) {
-	ip_reassbitmap[i] = 0xff;
-      }      
-      ip_reassbitmap[(offset + len) / (8 * 8)] |= ~bitmap_bits[((offset + len) / 8 ) & 7];
-    }
-    
-    /* If this fragment has the More Fragments flag set to zero, we
-       know that this is the last fragment, so we can calculate the
-       size of the entire packet. We also set the
-       IP_REASS_FLAG_LASTFRAG flag to indicate that we have received
-       the final fragment. */
-
-    if((ntohs(IPH_OFFSET(fraghdr)) & IP_MF) == 0) {
-      ip_reassflags |= IP_REASS_FLAG_LASTFRAG;
-      ip_reasslen = offset + len;
-      DEBUGF(IP_REASS_DEBUG, ("ip_reass: last fragment seen, total len %d\n", ip_reasslen));
-    }
-    
-    /* Finally, we check if we have a full packet in the buffer. We do
-       this by checking if we have the last fragment and if all bits
-       in the bitmap are set. */
-    if(ip_reassflags & IP_REASS_FLAG_LASTFRAG) {
-      /* Check all bytes up to and including all but the last byte in
-	 the bitmap. */
-      for(i = 0; i < ip_reasslen / (8 * 8) - 1; ++i) {
-	if(ip_reassbitmap[i] != 0xff) {
-	  DEBUGF(IP_REASS_DEBUG, ("ip_reass: last fragment seen, bitmap %d/%d failed (%x)\n", i, ip_reasslen / (8 * 8) - 1, ip_reassbitmap[i]));
-	  goto nullreturn;
-	}
-      }
-      /* Check the last byte in the bitmap. It should contain just the
-	 right amount of bits. */
-      if(ip_reassbitmap[ip_reasslen / (8 * 8)] !=
-	 (u8_t)~bitmap_bits[ip_reasslen / 8 & 7]) {
-	DEBUGF(IP_REASS_DEBUG, ("ip_reass: last fragment seen, bitmap %d didn't contain %x (%x)\n",
-				ip_reasslen / (8 * 8), ~bitmap_bits[ip_reasslen / 8 & 7],
-				ip_reassbitmap[ip_reasslen / (8 * 8)]));
-	goto nullreturn;
-      }
-
-      /* Pretend to be a "normal" (i.e., not fragmented) IP packet
-	 from now on. */
-      IPH_OFFSET_SET(iphdr, 0);
-      IPH_CHKSUM_SET(iphdr, 0);
-      IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
-      
-      /* If we have come this far, we have a full packet in the
-	 buffer, so we allocate a pbuf and copy the packet into it. We
-	 also reset the timer. */
-      ip_reasstmr = 0;
-      pbuf_free(p);
-      p = pbuf_alloc(PBUF_LINK, ip_reasslen, PBUF_POOL);
-      if(p != NULL) {
-	i = 0;
-	for(q = p; q != NULL; q = q->next) {
-	  /* Copy enough bytes to fill this pbuf in the chain. The
-	     avaliable data in the pbuf is given by the q->len
-	     variable. */
-	  DEBUGF(IP_REASS_DEBUG, ("ip_reass: bcopy from %p (%d) to %p, %d bytes\n",
-				  &ip_reassbuf[i], i, q->payload, q->len > ip_reasslen - i? ip_reasslen - i: q->len));
-	  bcopy(&ip_reassbuf[i], q->payload,
-		q->len > ip_reasslen - i? ip_reasslen - i: q->len);
-	  i += q->len;
-	}
-      }
-      DEBUGF(IP_REASS_DEBUG, ("ip_reass: p %p\n", p));
-      return p;
-    }
-  }
-
- nullreturn:
-  pbuf_free(p);
-  return NULL;
-}
-#endif /* IP_REASSEMBLY */
-/*-----------------------------------------------------------------------------------*/
-/* ip_input:
- *
+/**
  * This function is called by the network interface device driver when
  * an IP packet is received. The function does the basic checks of the
  * IP header such as packet size being at least larger than the header
@@ -377,278 +164,297 @@ ip_reass(struct pbuf *p)
  *
  * Finally, the packet is sent to the upper layer protocol input function.
  */
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 ip_input(struct pbuf *p, struct netif *inp) {
   static struct ip_hdr *iphdr;
   static struct netif *netif;
-  static u8_t hl;
+  static u16_t iphdrlen;
 
-  
-  
-#ifdef IP_STATS
-  ++stats.ip.recv;
-#endif /* IP_STATS */
+  IP_STATS_INC(ip.recv);
+  snmp_inc_ipinreceives();
 
   /* identify the IP header */
   iphdr = p->payload;
-  if(IPH_V(iphdr) != 4) {
-    DEBUGF(IP_DEBUG, ("IP packet dropped due to bad version number %d\n", IPH_V(iphdr)));
-#if IP_DEBUG
+  if (IPH_V(iphdr) != 4) {
+    LWIP_DEBUGF(IP_DEBUG | 1, ("IP packet dropped due to bad version number %u\n", IPH_V(iphdr)));
     ip_debug_print(p);
-#endif /* IP_DEBUG */
     pbuf_free(p);
-#ifdef IP_STATS
-    ++stats.ip.err;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
+    IP_STATS_INC(ip.err);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipunknownprotos();
     return ERR_OK;
   }
-  
-  hl = IPH_HL(iphdr);
-  
-  if(hl * 4 > p->len) {
-    DEBUGF(IP_DEBUG, ("IP packet dropped due to too short packet %d\n", p->len));
+  /* obtain IP header length in number of 32-bit words */
+  iphdrlen = IPH_HL(iphdr);
+  /* calculate IP header length in bytes */
+  iphdrlen *= 4;
 
+  /* header length exceeds first pbuf length? */
+  if (iphdrlen > p->len) {
+    LWIP_DEBUGF(IP_DEBUG | 2, ("IP header (len %u) does not fit in first pbuf (len %u), IP packet droppped.\n",
+      iphdrlen, p->len));
+    /* free (drop) packet pbufs */
     pbuf_free(p);
-#ifdef IP_STATS
-    ++stats.ip.lenerr;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
+    IP_STATS_INC(ip.lenerr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipindiscards();
     return ERR_OK;
   }
 
   /* verify checksum */
-  if(inet_chksum(iphdr, hl * 4) != 0) {
+#if CHECKSUM_CHECK_IP
+  if (inet_chksum(iphdr, iphdrlen) != 0) {
 
-    DEBUGF(IP_DEBUG, ("IP packet dropped due to failing checksum 0x%x\n", inet_chksum(iphdr, hl * 4)));
-#if IP_DEBUG
+    LWIP_DEBUGF(IP_DEBUG | 2, ("Checksum (0x%x) failed, IP packet dropped.\n", inet_chksum(iphdr, iphdrlen)));
     ip_debug_print(p);
-#endif /* IP_DEBUG */
     pbuf_free(p);
-#ifdef IP_STATS
-    ++stats.ip.chkerr;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
+    IP_STATS_INC(ip.chkerr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipindiscards();
     return ERR_OK;
   }
-  
+#endif
+
   /* Trim pbuf. This should have been done at the netif layer,
-     but we'll do it anyway just to be sure that its done. */
+   * but we'll do it anyway just to be sure that its done. */
   pbuf_realloc(p, ntohs(IPH_LEN(iphdr)));
 
   /* is this packet for us? */
   for(netif = netif_list; netif != NULL; netif = netif->next) {
 
-    DEBUGF(IP_DEBUG, ("ip_input: iphdr->dest 0x%lx netif->ip_addr 0x%lx (0x%lx, 0x%lx, 0x%lx)\n",
-		      iphdr->dest.addr, netif->ip_addr.addr,
-		      iphdr->dest.addr & netif->netmask.addr,
-		      netif->ip_addr.addr & netif->netmask.addr,
-		      iphdr->dest.addr & ~(netif->netmask.addr)));
+    LWIP_DEBUGF(IP_DEBUG, ("ip_input: iphdr->dest 0x%lx netif->ip_addr 0x%lx (0x%lx, 0x%lx, 0x%lx)\n",
+                      iphdr->dest.addr, netif->ip_addr.addr,
+                      iphdr->dest.addr & netif->netmask.addr,
+                      netif->ip_addr.addr & netif->netmask.addr,
+                      iphdr->dest.addr & ~(netif->netmask.addr)));
 
-    if(ip_addr_isany(&(netif->ip_addr)) ||
-       ip_addr_cmp(&(iphdr->dest), &(netif->ip_addr)) ||
-       (ip_addr_isbroadcast(&(iphdr->dest), &(netif->netmask)) &&
-	ip_addr_maskcmp(&(iphdr->dest), &(netif->ip_addr), &(netif->netmask))) ||
-       ip_addr_cmp(&(iphdr->dest), IP_ADDR_BROADCAST)) {
-      break;
+    /* interface configured? */
+    if (!ip_addr_isany(&(netif->ip_addr)))
+    {
+      /* unicast to this interface address? */
+      if (ip_addr_cmp(&(iphdr->dest), &(netif->ip_addr)) ||
+        /* or broadcast matching this interface network address? */
+        (ip_addr_isbroadcast(&(iphdr->dest), netif) &&
+         ip_addr_maskcmp(&(iphdr->dest), &(netif->ip_addr), &(netif->netmask))) ||
+         /* or restricted broadcast? */
+         ip_addr_cmp(&(iphdr->dest), IP_ADDR_BROADCAST)) {
+         LWIP_DEBUGF(IP_DEBUG, ("ip_input: packet accepted on interface %c%c\n",
+                       netif->name[0], netif->name[1]));
+         /* break out of for loop */
+         break;
+      }
     }
   }
-
 #if LWIP_DHCP
-  /* If a DHCP packet has arrived on the interface, we pass it up the
-     stack regardless of destination IP address. The reason is that
-     DHCP replies are sent to the IP adress that will be given to this
-     node (as recommended by RFC 1542 section 3.1.1, referred by RFC
-     2131). */
-  if(IPH_PROTO(iphdr) == IP_PROTO_UDP &&
-     ((struct udp_hdr *)((u8_t *)iphdr + IPH_HL(iphdr) * 4/sizeof(u8_t)))->src ==
-     DHCP_SERVER_PORT) {
-    netif = inp;
-  }  
+  /* Pass DHCP messages regardless of destination address. DHCP traffic is addressed
+   * using link layer addressing (such as Ethernet MAC) so we must not filter on IP.
+   * According to RFC 1542 section 3.1.1, referred by RFC 2131). */
+  if (netif == NULL) {
+    /* remote port is DHCP server? */
+    if (IPH_PROTO(iphdr) == IP_PROTO_UDP) {
+      LWIP_DEBUGF(IP_DEBUG | DBG_TRACE | 1, ("ip_input: UDP packet to DHCP client port %u\n",
+        ntohs(((struct udp_hdr *)((u8_t *)iphdr + iphdrlen))->dest)));
+      if (ntohs(((struct udp_hdr *)((u8_t *)iphdr + iphdrlen))->dest) == DHCP_CLIENT_PORT) {
+        LWIP_DEBUGF(IP_DEBUG | DBG_TRACE | 1, ("ip_input: DHCP packet accepted.\n"));
+        netif = inp;
+      }
+    }
+  }
 #endif /* LWIP_DHCP */
-	  
-  if(netif == NULL) {
+        /* packet not for us? */
+  if (netif == NULL) {
     /* packet not for us, route or discard */
-    DEBUGF(IP_DEBUG, ("ip_input: packet not for us.\n"));
+    LWIP_DEBUGF(IP_DEBUG | DBG_TRACE | 1, ("ip_input: packet not for us.\n"));
 #if IP_FORWARD
-    if(!ip_addr_isbroadcast(&(iphdr->dest), &(inp->netmask))) {
+    /* non-broadcast packet? */
+    if (!ip_addr_isbroadcast(&(iphdr->dest), inp)) {
+      /* try to forward IP packet on (other) interfaces */
       ip_forward(p, iphdr, inp);
     }
+    else
 #endif /* IP_FORWARD */
+    {
+      snmp_inc_ipindiscards();
+    }
     pbuf_free(p);
     return ERR_OK;
   }
-
-#if IP_REASSEMBLY
-  if((IPH_OFFSET(iphdr) & htons(IP_OFFMASK | IP_MF)) != 0) {
+  /* packet consists of multiple fragments? */
+  if ((IPH_OFFSET(iphdr) & htons(IP_OFFMASK | IP_MF)) != 0) {
+#if IP_REASSEMBLY /* packet fragment reassembly code present? */
+    LWIP_DEBUGF(IP_DEBUG, ("IP packet is a fragment (id=0x%04x tot_len=%u len=%u MF=%u offset=%u), calling ip_reass()\n",
+      ntohs(IPH_ID(iphdr)), p->tot_len, ntohs(IPH_LEN(iphdr)), !!(IPH_OFFSET(iphdr) & htons(IP_MF)), (ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK)*8));
+    /* reassemble the packet*/
     p = ip_reass(p);
-    if(p == NULL) {
+    /* packet not fully reassembled yet? */
+    if (p == NULL) {
       return ERR_OK;
     }
     iphdr = p->payload;
-  }
-#else /* IP_REASSEMBLY */
-  if((IPH_OFFSET(iphdr) & htons(IP_OFFMASK | IP_MF)) != 0) {
+#else /* IP_REASSEMBLY == 0, no packet fragment reassembly code present */
     pbuf_free(p);
-    DEBUGF(IP_DEBUG, ("IP packet dropped since it was fragmented (0x%x).\n",
-		      ntohs(IPH_OFFSET(iphdr))));
-#ifdef IP_STATS
-    ++stats.ip.opterr;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
+    LWIP_DEBUGF(IP_DEBUG | 2, ("IP packet dropped since it was fragmented (0x%x) (while IP_REASSEMBLY == 0).\n",
+                  ntohs(IPH_OFFSET(iphdr))));
+    IP_STATS_INC(ip.opterr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipunknownprotos();
+    return ERR_OK;
+#endif /* IP_REASSEMBLY */
+  }
+
+#if IP_OPTIONS == 0 /* no support for IP options in the IP header? */
+  if (iphdrlen > IP_HLEN) {
+    LWIP_DEBUGF(IP_DEBUG | 2, ("IP packet dropped since there were IP options (while IP_OPTIONS == 0).\n"));
+    pbuf_free(p);
+    IP_STATS_INC(ip.opterr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipunknownprotos();
     return ERR_OK;
   }
-#endif /* IP_REASSEMBLY */
-  
-#if IP_OPTIONS == 0
-  if(hl * 4 > IP_HLEN) {
-    DEBUGF(IP_DEBUG, ("IP packet dropped since there were IP options.\n"));
-
-    pbuf_free(p);    
-#ifdef IP_STATS
-    ++stats.ip.opterr;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
-    return ERR_OK;
-  }  
 #endif /* IP_OPTIONS == 0 */
 
-
   /* send to upper layers */
-#if IP_DEBUG
-  DEBUGF(IP_DEBUG, ("ip_input: \n"));
+  LWIP_DEBUGF(IP_DEBUG, ("ip_input: \n"));
   ip_debug_print(p);
-  DEBUGF(IP_DEBUG, ("ip_input: p->len %d p->tot_len %d\n", p->len, p->tot_len));
-#endif /* IP_DEBUG */   
+  LWIP_DEBUGF(IP_DEBUG, ("ip_input: p->len %d p->tot_len %d\n", p->len, p->tot_len));
 
-  switch(IPH_PROTO(iphdr)) {
-#if LWIP_UDP > 0    
+#if LWIP_RAW
+  /* raw input did not eat the packet? */
+  if (raw_input(p, inp) == 0) {
+#endif /* LWIP_RAW */
+
+  switch (IPH_PROTO(iphdr)) {
+#if LWIP_UDP
   case IP_PROTO_UDP:
+  case IP_PROTO_UDPLITE:
+    snmp_inc_ipindelivers();
     udp_input(p, inp);
     break;
 #endif /* LWIP_UDP */
-#if LWIP_TCP > 0    
+#if LWIP_TCP
   case IP_PROTO_TCP:
+    snmp_inc_ipindelivers();
     tcp_input(p, inp);
     break;
 #endif /* LWIP_TCP */
   case IP_PROTO_ICMP:
+    snmp_inc_ipindelivers();
     icmp_input(p, inp);
     break;
   default:
     /* send ICMP destination protocol unreachable unless is was a broadcast */
-    if(!ip_addr_isbroadcast(&(iphdr->dest), &(inp->netmask)) &&
-       !ip_addr_ismulticast(&(iphdr->dest))) {
+    if (!ip_addr_isbroadcast(&(iphdr->dest), inp) &&
+        !ip_addr_ismulticast(&(iphdr->dest))) {
       p->payload = iphdr;
       icmp_dest_unreach(p, ICMP_DUR_PROTO);
     }
     pbuf_free(p);
 
-    DEBUGF(IP_DEBUG, ("Unsupported transportation protocol %d\n", IPH_PROTO(iphdr)));
-
-#ifdef IP_STATS
-    ++stats.ip.proterr;
-    ++stats.ip.drop;
-#endif /* IP_STATS */
+    LWIP_DEBUGF(IP_DEBUG | 2, ("Unsupported transport protocol %d\n", IPH_PROTO(iphdr)));
 
+    IP_STATS_INC(ip.proterr);
+    IP_STATS_INC(ip.drop);
+    snmp_inc_ipunknownprotos();
   }
+#if LWIP_RAW
+  } /* LWIP_RAW */
+#endif
   return ERR_OK;
 }
 
-/*-----------------------------------------------------------------------------------*/
-/* ip_output_if:
- *
+/**
  * Sends an IP packet on a network interface. This function constructs
  * the IP header and calculates the IP header checksum. If the source
  * IP address is NULL, the IP address of the outgoing network
  * interface is filled in as source address.
  */
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
-	     u8_t ttl,
-	     u8_t proto, struct netif *netif)
+             u8_t ttl, u8_t tos,
+             u8_t proto, struct netif *netif)
 {
   static struct ip_hdr *iphdr;
   static u16_t ip_id = 0;
 
-  
-  
-  if(dest != IP_HDRINCL) {
-    if(pbuf_header(p, IP_HLEN)) {
-      DEBUGF(IP_DEBUG, ("ip_output: not enough room for IP header in pbuf\n"));
-      
-#ifdef IP_STATS
-      ++stats.ip.err;
-#endif /* IP_STATS */
+  snmp_inc_ipoutrequests();
+
+  if (dest != IP_HDRINCL) {
+    if (pbuf_header(p, IP_HLEN)) {
+      LWIP_DEBUGF(IP_DEBUG | 2, ("ip_output: not enough room for IP header in pbuf\n"));
+
+      IP_STATS_INC(ip.err);
+      snmp_inc_ipoutdiscards();
       return ERR_BUF;
     }
-    
+
     iphdr = p->payload;
-    
+
     IPH_TTL_SET(iphdr, ttl);
     IPH_PROTO_SET(iphdr, proto);
-    
+
     ip_addr_set(&(iphdr->dest), dest);
 
-    IPH_VHLTOS_SET(iphdr, 4, IP_HLEN / 4, 0);
+    IPH_VHLTOS_SET(iphdr, 4, IP_HLEN / 4, tos);
     IPH_LEN_SET(iphdr, htons(p->tot_len));
     IPH_OFFSET_SET(iphdr, htons(IP_DF));
     IPH_ID_SET(iphdr, htons(ip_id));
     ++ip_id;
 
-    if(ip_addr_isany(src)) {
+    if (ip_addr_isany(src)) {
       ip_addr_set(&(iphdr->src), &(netif->ip_addr));
     } else {
       ip_addr_set(&(iphdr->src), src);
     }
 
     IPH_CHKSUM_SET(iphdr, 0);
+#if CHECKSUM_GEN_IP
     IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+#endif
   } else {
     iphdr = p->payload;
     dest = &(iphdr->dest);
   }
 
-#ifdef IP_STATS
-  stats.ip.xmit++;
-#endif /* IP_STATS */
-  DEBUGF(IP_DEBUG, ("ip_output_if: %c%c ", netif->name[0], netif->name[1]));
-#if IP_DEBUG
+#if IP_FRAG
+  /* don't fragment if interface has mtu set to 0 [loopif] */
+  if (netif->mtu && (p->tot_len > netif->mtu))
+    return ip_frag(p,netif,dest);
+#endif
+
+  IP_STATS_INC(ip.xmit);
+
+  LWIP_DEBUGF(IP_DEBUG, ("ip_output_if: %c%c%u\n", netif->name[0], netif->name[1], netif->num));
   ip_debug_print(p);
-#endif /* IP_DEBUG */
 
+  LWIP_DEBUGF(IP_DEBUG, ("netif->output()"));
 
-  return netif->output(netif, p, dest);  
+  return netif->output(netif, p, dest);
 }
-/*-----------------------------------------------------------------------------------*/
-/* ip_output:
- *
+
+/**
  * Simple interface to ip_output_if. It finds the outgoing network
  * interface and calls upon ip_output_if to do the actual work.
  */
-/*-----------------------------------------------------------------------------------*/
+
 err_t
 ip_output(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
-	  u8_t ttl, u8_t proto)
+          u8_t ttl, u8_t tos, u8_t proto)
 {
-  static struct netif *netif;
+  struct netif *netif;
 
-  
-  if((netif = ip_route(dest)) == NULL) {
-    DEBUGF(IP_DEBUG, ("ip_output: No route to 0x%lx\n", dest->addr));
+  if ((netif = ip_route(dest)) == NULL) {
+    LWIP_DEBUGF(IP_DEBUG | 2, ("ip_output: No route to 0x%lx\n", dest->addr));
 
-#ifdef IP_STATS
-    ++stats.ip.rterr;
-#endif /* IP_STATS */
-    pbuf_free(p);
+    IP_STATS_INC(ip.rterr);
+    snmp_inc_ipoutdiscards();
     return ERR_RTE;
   }
 
-  return ip_output_if(p, src, dest, ttl, proto, netif);
+  return ip_output_if(p, src, dest, ttl, tos, proto, netif);
 }
-/*-----------------------------------------------------------------------------------*/
+
 #if IP_DEBUG
 void
 ip_debug_print(struct pbuf *p)
@@ -656,43 +462,43 @@ ip_debug_print(struct pbuf *p)
   struct ip_hdr *iphdr = p->payload;
   u8_t *payload;
 
-  payload = (u8_t *)iphdr + IP_HLEN/sizeof(u8_t);
-  
-  DEBUGF(IP_DEBUG, ("IP header:\n"));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  DEBUGF(IP_DEBUG, ("|%2d |%2d |   %2d  |      %4d     | (v, hl, tos, len)\n",
-		    IPH_V(iphdr),
-		    IPH_HL(iphdr),
-		    IPH_TOS(iphdr),
-		    ntohs(IPH_LEN(iphdr))));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  DEBUGF(IP_DEBUG, ("|    %5d      |%d%d%d|    %4d   | (id, flags, offset)\n",
-		    ntohs(IPH_ID(iphdr)),
-		    ntohs(IPH_OFFSET(iphdr)) >> 15 & 1,
-		    ntohs(IPH_OFFSET(iphdr)) >> 14 & 1,
-		    ntohs(IPH_OFFSET(iphdr)) >> 13 & 1,
-		    ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  DEBUGF(IP_DEBUG, ("|   %2d  |   %2d  |    0x%04x     | (ttl, proto, chksum)\n",
-		    IPH_TTL(iphdr),
-		    IPH_PROTO(iphdr),
-		    ntohs(IPH_CHKSUM(iphdr))));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  DEBUGF(IP_DEBUG, ("|  %3ld  |  %3ld  |  %3ld  |  %3ld  | (src)\n",
-		    ntohl(iphdr->src.addr) >> 24 & 0xff,
-		    ntohl(iphdr->src.addr) >> 16 & 0xff,
-		    ntohl(iphdr->src.addr) >> 8 & 0xff,
-		    ntohl(iphdr->src.addr) & 0xff));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  DEBUGF(IP_DEBUG, ("|  %3ld  |  %3ld  |  %3ld  |  %3ld  | (dest)\n",
-		    ntohl(iphdr->dest.addr) >> 24 & 0xff,
-		    ntohl(iphdr->dest.addr) >> 16 & 0xff,
-		    ntohl(iphdr->dest.addr) >> 8 & 0xff,
-		    ntohl(iphdr->dest.addr) & 0xff));
-  DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  payload = (u8_t *)iphdr + IP_HLEN;
+
+  LWIP_DEBUGF(IP_DEBUG, ("IP header:\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|%2d |%2d |  0x%02x |     %5u     | (v, hl, tos, len)\n",
+                    IPH_V(iphdr),
+                    IPH_HL(iphdr),
+                    IPH_TOS(iphdr),
+                    ntohs(IPH_LEN(iphdr))));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|    %5u      |%u%u%u|    %4u   | (id, flags, offset)\n",
+                    ntohs(IPH_ID(iphdr)),
+                    ntohs(IPH_OFFSET(iphdr)) >> 15 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) >> 14 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) >> 13 & 1,
+                    ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3u  |  %3u  |    0x%04x     | (ttl, proto, chksum)\n",
+                    IPH_TTL(iphdr),
+                    IPH_PROTO(iphdr),
+                    ntohs(IPH_CHKSUM(iphdr))));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3ld  |  %3ld  |  %3ld  |  %3ld  | (src)\n",
+                    ntohl(iphdr->src.addr) >> 24 & 0xff,
+                    ntohl(iphdr->src.addr) >> 16 & 0xff,
+                    ntohl(iphdr->src.addr) >> 8 & 0xff,
+                    ntohl(iphdr->src.addr) & 0xff));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
+  LWIP_DEBUGF(IP_DEBUG, ("|  %3ld  |  %3ld  |  %3ld  |  %3ld  | (dest)\n",
+                    ntohl(iphdr->dest.addr) >> 24 & 0xff,
+                    ntohl(iphdr->dest.addr) >> 16 & 0xff,
+                    ntohl(iphdr->dest.addr) >> 8 & 0xff,
+                    ntohl(iphdr->dest.addr) & 0xff));
+  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
 }
 #endif /* IP_DEBUG */
-/*-----------------------------------------------------------------------------------*/
+
 
 
 

src/core/ipv4/ip_addr.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
  * All rights reserved. 
  * 
  * Redistribution and use in source and binary forms, with or without modification, 
@@ -30,12 +30,40 @@
  *
  */
 
-#include "lwip/debug.h"
 #include "lwip/ip_addr.h"
 #include "lwip/inet.h"
+#include "lwip/netif.h"
 
-struct ip_addr ip_addr_broadcast = {0xffffffff};
+/* used by IP_ADDR_ANY and IP_ADDR_BROADCAST in ip_addr.h */
+const struct ip_addr ip_addr_any = { 0x00000000UL };
+const struct ip_addr ip_addr_broadcast = { 0xffffffffUL };
 
-/*-----------------------------------------------------------------------------------*/
+/* Determine if an address is a broadcast address on a network interface 
+ * 
+ * @param addr address to be checked
+ * @param netif the network interface against which the address is checked
+ * @return returns non-zero if the address is a broadcast address
+ *
+ */
 
-/*-----------------------------------------------------------------------------------*/
+u8_t ip_addr_isbroadcast(struct ip_addr *addr, struct netif *netif)
+{
+  /* all ones (broadcast) or all zeroes (old skool broadcast) */
+  if ((addr->addr == ip_addr_broadcast.addr) ||
+      (addr->addr == ip_addr_any.addr))
+    return 1;
+  /* no broadcast support on this network interface? */
+  else if ((netif->flags & NETIF_FLAG_BROADCAST) == 0)
+    /* the given address cannot be a broadcast address
+     * nor can we check against any broadcast addresses */
+    return 0;
+  /* address matches network interface address exactly? => no broadcast */
+  else if (addr->addr == netif->ip_addr.addr)
+    return 0;
+  /* host identifier bits are all ones? => network broadcast address */
+  else if ((addr->addr & ~netif->netmask.addr) ==
+           (ip_addr_broadcast.addr & ~netif->netmask.addr))
+    return 1;
+  else
+    return 0;
+}

src/core/ipv4/ip_frag.c

@@ -0,0 +1,344 @@
+/* @file
+ * 
+ * This is the IP packet segmentation and reassembly implementation.
+ *
+ */
+
+/*
+ * Copyright (c) 2001-2004 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: Jani Monoses <jani@iv.ro> 
+ * original reassembly code by Adam Dunkels <adam@sics.se>
+ * 
+ */
+
+#include "lwip/opt.h"
+#include "lwip/sys.h"
+#include "lwip/ip.h"
+#include "lwip/ip_frag.h"
+#include "lwip/netif.h"
+
+#include "lwip/stats.h"
+
+
+/*
+ * Copy len bytes from offset in pbuf to buffer 
+ *
+ * helper used by both ip_reass and ip_frag
+ */
+static struct pbuf *
+copy_from_pbuf(struct pbuf *p, u16_t * offset,
+           u8_t * buffer, u16_t len)
+{
+  u16_t l;
+
+  p->payload = (u8_t *)p->payload + *offset;
+  p->len -= *offset;
+  while (len) {
+    l = len < p->len ? len : p->len;
+    memcpy(buffer, p->payload, l);
+    buffer += l;
+    len -= l;
+    if (len)
+      p = p->next;
+    else
+      *offset = l;
+  }
+  return p;
+}
+
+#define IP_REASS_BUFSIZE 5760
+#define IP_REASS_MAXAGE 30
+#define IP_REASS_TMO 1000
+
+static u8_t ip_reassbuf[IP_HLEN + IP_REASS_BUFSIZE];
+static u8_t ip_reassbitmap[IP_REASS_BUFSIZE / (8 * 8)];
+static const u8_t bitmap_bits[8] = { 0xff, 0x7f, 0x3f, 0x1f,
+  0x0f, 0x07, 0x03, 0x01
+};
+static u16_t ip_reasslen;
+static u8_t ip_reassflags;
+#define IP_REASS_FLAG_LASTFRAG 0x01
+
+static u8_t ip_reasstmr;
+
+/* Reassembly timer */ 
+static void 
+ip_reass_timer(void *arg)
+{
+  (void)arg;
+  if (ip_reasstmr > 1) {
+    ip_reasstmr--;
+    sys_timeout(IP_REASS_TMO, ip_reass_timer, NULL);
+  } else if (ip_reasstmr == 1)
+  ip_reasstmr = 0;
+}
+
+struct pbuf *
+ip_reass(struct pbuf *p)
+{
+  struct pbuf *q;
+  struct ip_hdr *fraghdr, *iphdr;
+  u16_t offset, len;
+  u16_t i;
+
+  IPFRAG_STATS_INC(ip_frag.recv);
+
+  iphdr = (struct ip_hdr *) ip_reassbuf;
+  fraghdr = (struct ip_hdr *) p->payload;
+  /* If ip_reasstmr is zero, no packet is present in the buffer, so we
+     write the IP header of the fragment into the reassembly
+     buffer. The timer is updated with the maximum age. */
+  if (ip_reasstmr == 0) {
+    LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass: new packet\n"));
+    memcpy(iphdr, fraghdr, IP_HLEN);
+    ip_reasstmr = IP_REASS_MAXAGE;
+    sys_timeout(IP_REASS_TMO, ip_reass_timer, NULL);
+    ip_reassflags = 0;
+    /* Clear the bitmap. */
+    memset(ip_reassbitmap, 0, sizeof(ip_reassbitmap));
+  }
+
+  /* Check if the incoming fragment matches the one currently present
+     in the reasembly buffer. If so, we proceed with copying the
+     fragment into the buffer. */
+  if (ip_addr_cmp(&iphdr->src, &fraghdr->src) &&
+      ip_addr_cmp(&iphdr->dest, &fraghdr->dest) &&
+      IPH_ID(iphdr) == IPH_ID(fraghdr)) {
+    LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass: matching old packet\n"));
+    IPFRAG_STATS_INC(ip_frag.cachehit);
+    /* Find out the offset in the reassembly buffer where we should
+       copy the fragment. */
+    len = ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
+    offset = (ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
+
+    /* If the offset or the offset + fragment length overflows the
+       reassembly buffer, we discard the entire packet. */
+    if (offset > IP_REASS_BUFSIZE || offset + len > IP_REASS_BUFSIZE) {
+      LWIP_DEBUGF(IP_REASS_DEBUG,
+       ("ip_reass: fragment outside of buffer (%d:%d/%d).\n", offset,
+        offset + len, IP_REASS_BUFSIZE));
+      sys_untimeout(ip_reass_timer, NULL);
+      ip_reasstmr = 0;
+      goto nullreturn;
+    }
+
+    /* Copy the fragment into the reassembly buffer, at the right
+       offset. */
+    LWIP_DEBUGF(IP_REASS_DEBUG,
+     ("ip_reass: copying with offset %d into %d:%d\n", offset,
+      IP_HLEN + offset, IP_HLEN + offset + len));
+    i = IPH_HL(fraghdr) * 4;
+    copy_from_pbuf(p, &i, &ip_reassbuf[IP_HLEN + offset], len);
+
+    /* Update the bitmap. */
+    if (offset / (8 * 8) == (offset + len) / (8 * 8)) {
+      LWIP_DEBUGF(IP_REASS_DEBUG,
+       ("ip_reass: updating single byte in bitmap.\n"));
+      /* If the two endpoints are in the same byte, we only update
+         that byte. */
+      ip_reassbitmap[offset / (8 * 8)] |=
+    bitmap_bits[(offset / 8) & 7] &
+    ~bitmap_bits[((offset + len) / 8) & 7];
+    } else {
+      /* If the two endpoints are in different bytes, we update the
+         bytes in the endpoints and fill the stuff inbetween with
+         0xff. */
+      ip_reassbitmap[offset / (8 * 8)] |= bitmap_bits[(offset / 8) & 7];
+      LWIP_DEBUGF(IP_REASS_DEBUG,
+       ("ip_reass: updating many bytes in bitmap (%d:%d).\n",
+        1 + offset / (8 * 8), (offset + len) / (8 * 8)));
+      for (i = 1 + offset / (8 * 8); i < (offset + len) / (8 * 8); ++i) {
+  ip_reassbitmap[i] = 0xff;
+      }
+      ip_reassbitmap[(offset + len) / (8 * 8)] |=
+    ~bitmap_bits[((offset + len) / 8) & 7];
+    }
+
+    /* If this fragment has the More Fragments flag set to zero, we
+       know that this is the last fragment, so we can calculate the
+       size of the entire packet. We also set the
+       IP_REASS_FLAG_LASTFRAG flag to indicate that we have received
+       the final fragment. */
+
+    if ((ntohs(IPH_OFFSET(fraghdr)) & IP_MF) == 0) {
+      ip_reassflags |= IP_REASS_FLAG_LASTFRAG;
+      ip_reasslen = offset + len;
+      LWIP_DEBUGF(IP_REASS_DEBUG,
+       ("ip_reass: last fragment seen, total len %d\n",
+        ip_reasslen));
+    }
+
+    /* Finally, we check if we have a full packet in the buffer. We do
+       this by checking if we have the last fragment and if all bits
+       in the bitmap are set. */
+    if (ip_reassflags & IP_REASS_FLAG_LASTFRAG) {
+      /* Check all bytes up to and including all but the last byte in
+         the bitmap. */
+      for (i = 0; i < ip_reasslen / (8 * 8) - 1; ++i) {
+  if (ip_reassbitmap[i] != 0xff) {
+    LWIP_DEBUGF(IP_REASS_DEBUG,
+     ("ip_reass: last fragment seen, bitmap %d/%d failed (%x)\n",
+      i, ip_reasslen / (8 * 8) - 1, ip_reassbitmap[i]));
+    goto nullreturn;
+  }
+      }
+      /* Check the last byte in the bitmap. It should contain just the
+         right amount of bits. */
+      if (ip_reassbitmap[ip_reasslen / (8 * 8)] !=
+    (u8_t) ~ bitmap_bits[ip_reasslen / 8 & 7]) {
+  LWIP_DEBUGF(IP_REASS_DEBUG,
+         ("ip_reass: last fragment seen, bitmap %d didn't contain %x (%x)\n",
+    ip_reasslen / (8 * 8), ~bitmap_bits[ip_reasslen / 8 & 7],
+    ip_reassbitmap[ip_reasslen / (8 * 8)]));
+  goto nullreturn;
+      }
+
+      /* Pretend to be a "normal" (i.e., not fragmented) IP packet
+         from now on. */
+      ip_reasslen += IP_HLEN;
+
+      IPH_LEN_SET(iphdr, htons(ip_reasslen));
+      IPH_OFFSET_SET(iphdr, 0);
+      IPH_CHKSUM_SET(iphdr, 0);
+      IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+
+      /* If we have come this far, we have a full packet in the
+         buffer, so we allocate a pbuf and copy the packet into it. We
+         also reset the timer. */
+      sys_untimeout(ip_reass_timer, NULL);
+      ip_reasstmr = 0;
+      pbuf_free(p);
+      p = pbuf_alloc(PBUF_LINK, ip_reasslen, PBUF_POOL);
+      if (p != NULL) {
+  i = 0;
+  for (q = p; q != NULL; q = q->next) {
+    /* Copy enough bytes to fill this pbuf in the chain. The
+       available data in the pbuf is given by the q->len
+       variable. */
+    LWIP_DEBUGF(IP_REASS_DEBUG,
+     ("ip_reass: memcpy from %p (%d) to %p, %d bytes\n",
+      &ip_reassbuf[i], i, q->payload,
+      q->len > ip_reasslen - i ? ip_reasslen - i : q->len));
+    memcpy(q->payload, &ip_reassbuf[i],
+    q->len > ip_reasslen - i ? ip_reasslen - i : q->len);
+    i += q->len;
+  }
+  IPFRAG_STATS_INC(ip_frag.fw);
+      } else {
+  IPFRAG_STATS_INC(ip_frag.memerr);
+      }
+      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass: p %p\n", (void*)p));
+      return p;
+    }
+  }
+
+nullreturn:
+  IPFRAG_STATS_INC(ip_frag.drop);
+  pbuf_free(p);
+  return NULL;
+}
+
+#define MAX_MTU 1500
+static u8_t buf[MEM_ALIGN_SIZE(MAX_MTU)];
+
+/**
+ * Fragment an IP packet if too large
+ *
+ * Chop the packet in mtu sized chunks and send them in order
+ * by using a fixed size static memory buffer (PBUF_ROM)
+ */
+err_t 
+ip_frag(struct pbuf *p, struct netif *netif, struct ip_addr *dest)
+{
+  struct pbuf *rambuf;
+  struct pbuf *header;
+  struct ip_hdr *iphdr;
+  u16_t nfb = 0;
+  u16_t left, cop;
+  u16_t mtu = netif->mtu;
+  u16_t ofo, omf;
+  u16_t last;
+  u16_t poff = IP_HLEN;
+  u16_t tmp;
+
+  /* Get a RAM based MTU sized pbuf */
+  rambuf = pbuf_alloc(PBUF_LINK, 0, PBUF_REF);
+  rambuf->tot_len = rambuf->len = mtu;
+  rambuf->payload = MEM_ALIGN((void *)buf);
+
+  /* Copy the IP header in it */
+  iphdr = rambuf->payload;
+  memcpy(iphdr, p->payload, IP_HLEN);
+
+  /* Save original offset */
+  tmp = ntohs(IPH_OFFSET(iphdr));
+  ofo = tmp & IP_OFFMASK;
+  omf = tmp & IP_MF;
+
+  left = p->tot_len - IP_HLEN;
+
+  while (left) {
+    last = (left <= mtu - IP_HLEN);
+
+    /* Set new offset and MF flag */
+    ofo += nfb;
+    tmp = omf | (IP_OFFMASK & (ofo));
+    if (!last)
+      tmp = tmp | IP_MF;
+    IPH_OFFSET_SET(iphdr, htons(tmp));
+
+    /* Fill this fragment */
+    nfb = (mtu - IP_HLEN) / 8;
+    cop = last ? left : nfb * 8;
+
+    p = copy_from_pbuf(p, &poff, (u8_t *) iphdr + IP_HLEN, cop);
+
+    /* Correct header */
+    IPH_LEN_SET(iphdr, htons(cop + IP_HLEN));
+    IPH_CHKSUM_SET(iphdr, 0);
+    IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
+
+    if (last)
+      pbuf_realloc(rambuf, left + IP_HLEN);
+    /* This part is ugly: we alloc a RAM based pbuf for 
+     * the link level header for each chunk and then 
+     * free it.A PBUF_ROM style pbuf for which pbuf_header
+     * worked would make things simpler.
+     */
+    header = pbuf_alloc(PBUF_LINK, 0, PBUF_RAM);
+    pbuf_chain(header, rambuf);
+    netif->output(netif, header, dest);
+    IPFRAG_STATS_INC(ip_frag.xmit);
+    pbuf_free(header);
+
+    left -= cop;
+  }
+  pbuf_free(rambuf);
+  return ERR_OK;
+}

src/core/ipv6/icmp6.c

@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2001, 2002 Swedish Institute of Computer Science.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
+ * Copyright (c) 2001-2004 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,
@@ -11,21 +11,21 @@
  *    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. 
+ *    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 
+ * 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 <adam@sics.se>
  *
  */
@@ -33,7 +33,7 @@
 /* Some ICMP messages should be passed to the transport protocols. This
    is not implemented. */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/icmp.h"
 #include "lwip/inet.h"
@@ -42,7 +42,7 @@
 
 #include "lwip/stats.h"
 
-/*-----------------------------------------------------------------------------------*/
+
 void
 icmp_input(struct pbuf *p, struct netif *inp)
 {
@@ -50,100 +50,100 @@ icmp_input(struct pbuf *p, struct netif *inp)
   struct icmp_echo_hdr *iecho;
   struct ip_hdr *iphdr;
   struct ip_addr tmpaddr;
-  
- 
+
 #ifdef ICMP_STATS
-  ++stats.icmp.recv;
+  ++lwip_stats.icmp.recv;
 #endif /* ICMP_STATS */
 
+  /* TODO: check length before accessing payload! */
+
   type = ((char *)p->payload)[0];
 
-  switch(type) {
+  switch (type) {
   case ICMP6_ECHO:
-    DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
 
-    if(p->tot_len < sizeof(struct icmp_echo_hdr)) {
-      DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
+    if (p->tot_len < sizeof(struct icmp_echo_hdr)) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
 
       pbuf_free(p);
 #ifdef ICMP_STATS
-      ++stats.icmp.lenerr;
+      ++lwip_stats.icmp.lenerr;
 #endif /* ICMP_STATS */
 
-      return;      
+      return;
     }
     iecho = p->payload;
     iphdr = (struct ip_hdr *)((char *)p->payload - IP_HLEN);
-    if(inet_chksum_pbuf(p) != 0) {
-      DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%x)\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
+    if (inet_chksum_pbuf(p) != 0) {
+      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%x)\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
 
 #ifdef ICMP_STATS
-      ++stats.icmp.chkerr;
+      ++lwip_stats.icmp.chkerr;
 #endif /* ICMP_STATS */
     /*      return;*/
     }
-    DEBUGF(ICMP_DEBUG, ("icmp: p->len %d p->tot_len %d\n", p->len, p->tot_len));
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp: p->len %d p->tot_len %d\n", p->len, p->tot_len));
     ip_addr_set(&tmpaddr, &(iphdr->src));
     ip_addr_set(&(iphdr->src), &(iphdr->dest));
     ip_addr_set(&(iphdr->dest), &tmpaddr);
     iecho->type = ICMP6_ER;
     /* adjust the checksum */
-    if(iecho->chksum >= htons(0xffff - (ICMP6_ECHO << 8))) {
+    if (iecho->chksum >= htons(0xffff - (ICMP6_ECHO << 8))) {
       iecho->chksum += htons(ICMP6_ECHO << 8) + 1;
     } else {
       iecho->chksum += htons(ICMP6_ECHO << 8);
     }
-    DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%x)\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo (%x)\n", inet_chksum_pseudo(p, &(iphdr->src), &(iphdr->dest), IP_PROTO_ICMP, p->tot_len)));
 #ifdef ICMP_STATS
-    ++stats.icmp.xmit;
+    ++lwip_stats.icmp.xmit;
 #endif /* ICMP_STATS */
 
-    /*    DEBUGF("icmp: p->len %d p->tot_len %d\n", p->len, p->tot_len);*/
-    ip_output_if(p, &(iphdr->src), IP_HDRINCL,
-		 iphdr->hoplim, IP_PROTO_ICMP, inp);
-    break; 
+    /*    LWIP_DEBUGF("icmp: p->len %u p->tot_len %u\n", p->len, p->tot_len);*/
+    ip_output_if (p, &(iphdr->src), IP_HDRINCL,
+     iphdr->hoplim, IP_PROTO_ICMP, inp);
+    break;
   default:
-    DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type not supported.\n"));
-
+    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %d not supported.\n", (int)type));
 #ifdef ICMP_STATS
-    ++stats.icmp.proterr;
-    ++stats.icmp.drop;
+    ++lwip_stats.icmp.proterr;
+    ++lwip_stats.icmp.drop;
 #endif /* ICMP_STATS */
   }
 
   pbuf_free(p);
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t)
 {
   struct pbuf *q;
   struct ip_hdr *iphdr;
   struct icmp_dur_hdr *idur;
-  
-  q = pbuf_alloc(PBUF_TRANSPORT, 8 + IP_HLEN + 8, PBUF_RAM);
+
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
   /* ICMP header + IP header + 8 bytes of data */
 
   iphdr = p->payload;
-  
+
   idur = q->payload;
   idur->type = (char)ICMP6_DUR;
   idur->icode = (char)t;
 
-  bcopy(p->payload, (char *)q->payload + 8, IP_HLEN + 8);
-  
+  memcpy((char *)q->payload + 8, p->payload, IP_HLEN + 8);
+
   /* calculate checksum */
   idur->chksum = 0;
   idur->chksum = inet_chksum(idur, q->len);
 #ifdef ICMP_STATS
-  ++stats.icmp.xmit;
+  ++lwip_stats.icmp.xmit;
 #endif /* ICMP_STATS */
 
   ip_output(q, NULL,
-	    (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
+      (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
   pbuf_free(q);
 }
-/*-----------------------------------------------------------------------------------*/
+
 void
 icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
 {
@@ -151,27 +151,27 @@ icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
   struct ip_hdr *iphdr;
   struct icmp_te_hdr *tehdr;
 
-  DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded\n"));
-  
-  q = pbuf_alloc(PBUF_TRANSPORT, 8 + IP_HLEN + 8, PBUF_RAM);
+  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded\n"));
+
+  q = pbuf_alloc(PBUF_IP, 8 + IP_HLEN + 8, PBUF_RAM);
 
   iphdr = p->payload;
-  
+
   tehdr = q->payload;
   tehdr->type = (char)ICMP6_TE;
   tehdr->icode = (char)t;
 
   /* copy fields from original packet */
-  bcopy((char *)p->payload, (char *)q->payload + 8, IP_HLEN + 8);
-  
+  memcpy((char *)q->payload + 8, (char *)p->payload, IP_HLEN + 8);
+
   /* calculate checksum */
   tehdr->chksum = 0;
   tehdr->chksum = inet_chksum(tehdr, q->len);
 #ifdef ICMP_STATS
-  ++stats.icmp.xmit;
+  ++lwip_stats.icmp.xmit;
 #endif /* ICMP_STATS */
-  ip_output(q, NULL, 
-	    (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
+  ip_output(q, NULL,
+      (struct ip_addr *)&(iphdr->src), ICMP_TTL, IP_PROTO_ICMP);
   pbuf_free(q);
 }