diff --git a/module_xtcp/src/xtcp_uip/uip.c b/module_xtcp/src/xtcp_uip/uip.c
index 1572977..f8c1d23 100644
--- a/module_xtcp/src/xtcp_uip/uip.c
+++ b/module_xtcp/src/xtcp_uip/uip.c
@@ -1,2019 +1,2035 @@
-// Copyright (c) 2011, XMOS Ltd, All rights reserved
-// This software is freely distributable under a derivative of the
-// University of Illinois/NCSA Open Source License posted in
-// LICENSE.txt and at <http://github.xcore.com/>
-
-
-#define DEBUG_PRINTF(...) /*printf(__VA_ARGS__)*/
-
-/**
- * \defgroup uip The uIP TCP/IP stack
- * @{
- *
- * uIP is an implementation of the TCP/IP protocol stack intended for
- * small 8-bit and 16-bit microcontrollers.
- *
- * uIP provides the necessary protocols for Internet communication,
- * with a very small code footprint and RAM requirements - the uIP
- * code size is on the order of a few kilobytes and RAM usage is on
- * the order of a few hundred bytes.
- */
-
-/**
- * The uIP TCP/IP stack code.
- * \author Adam Dunkels <adam@dunkels.com>
- */
-
-/*
- * Copyright (c) 2001-2003, Adam Dunkels.
- * 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 uIP TCP/IP stack.
- *
- * $Id: uip.c,v 1.65 2006/06/11 21:46:39 adam Exp $
- *
- */
-
-/*
- * uIP is a small implementation of the IP, UDP and TCP protocols (as
- * well as some basic ICMP stuff). The implementation couples the IP,
- * UDP, TCP and the application layers very tightly. To keep the size
- * of the compiled code down, this code frequently uses the goto
- * statement. While it would be possible to break the uip_process()
- * function into many smaller functions, this would increase the code
- * size because of the overhead of parameter passing and the fact that
- * the optimier would not be as efficient.
- *
- * The principle is that we have a small buffer, called the uip_buf,
- * in which the device driver puts an incoming packet. The TCP/IP
- * stack parses the headers in the packet, and calls the
- * application. If the remote host has sent data to the application,
- * this data is present in the uip_buf and the application read the
- * data from there. It is up to the application to put this data into
- * a byte stream if needed. The application will not be fed with data
- * that is out of sequence.
- *
- * If the application whishes to send data to the peer, it should put
- * its data into the uip_buf. The uip_appdata pointer points to the
- * first available byte. The TCP/IP stack will calculate the
- * checksums, and fill in the necessary header fields and finally send
- * the packet back to the peer.
- */
-
-#include "uip.h"
-#include "uipopt.h"
-#include "uip_arch.h"
-#include <print.h>
-
-#include <xclib.h>
-
-
-#if UIP_CONF_IPV6
-#include "uip-neighbor.h"
-#endif /* UIP_CONF_IPV6 */
-
-#if UIP_IGMP
-#include "igmp.h"
-#endif
-#include <string.h>
-#define ACTUAL_UIP_PACKET_SPLIT_THRESHOLD (UIP_PACKET_SPLIT_THRESHOLD > 4 ? UIP_PACKET_SPLIT_THRESHOLD : 4)
-/*---------------------------------------------------------------------------*/
-/* Variable definitions. */
-
-/* The IP address of this host. If it is defined to be fixed (by
- setting UIP_FIXEDADDR to 1 in uipopt.h), the address is set
- here. Otherwise, the address */
-#if UIP_FIXEDADDR > 0
-const uip_ipaddr_t uip_hostaddr =
-{	HTONS((UIP_IPADDR0 << 8) | UIP_IPADDR1),
-	HTONS((UIP_IPADDR2 << 8) | UIP_IPADDR3)};
-const uip_ipaddr_t uip_draddr =
-{	HTONS((UIP_DRIPADDR0 << 8) | UIP_DRIPADDR1),
-	HTONS((UIP_DRIPADDR2 << 8) | UIP_DRIPADDR3)};
-const uip_ipaddr_t uip_netmask =
-{	HTONS((UIP_NETMASK0 << 8) | UIP_NETMASK1),
-	HTONS((UIP_NETMASK2 << 8) | UIP_NETMASK3)};
-#else
-uip_ipaddr_t uip_hostaddr, uip_draddr, uip_netmask;
-#endif /* UIP_FIXEDADDR */
-
-static const uip_ipaddr_t all_ones_addr =
-#if UIP_CONF_IPV6
-		{	0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff};
-#else /* UIP_CONF_IPV6 */
-		{ 0xffff, 0xffff };
-#endif /* UIP_CONF_IPV6 */
-static const uip_ipaddr_t all_zeroes_addr =
-#if UIP_CONF_IPV6
-		{	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000};
-#else /* UIP_CONF_IPV6 */
-		{ 0x0000, 0x0000 };
-#endif /* UIP_CONF_IPV6 */
-
-#if UIP_FIXEDETHADDR
-const struct uip_eth_addr uip_ethaddr = { {UIP_ETHADDR0,
-		UIP_ETHADDR1,
-		UIP_ETHADDR2,
-		UIP_ETHADDR3,
-		UIP_ETHADDR4,
-		UIP_ETHADDR5}};
-#else
-struct uip_eth_addr uip_ethaddr = { { 0, 0, 0, 0, 0, 0 } };
-#endif
-
-#ifndef UIP_CONF_EXTERNAL_BUFFER
-u8_t uip_buf[UIP_BUFSIZE + 2]; /* The packet buffer that contains
- incoming packets. */
-#endif /* UIP_CONF_EXTERNAL_BUFFER */
-
-void *uip_appdata; /* The uip_appdata pointer points to
- application data. */
-void *uip_sappdata; /* The uip_appdata pointer points to
- the application data which is to
- be sent. */
-#if UIP_URGDATA > 0
-void *uip_urgdata; /* The uip_urgdata pointer points to
- urgent data (out-of-band data), if
- present. */
-u16_t uip_urglen, uip_surglen;
-#endif /* UIP_URGDATA > 0 */
-
-u16_t uip_len, uip_slen;
-/* The uip_len is either 8 or 16 bits,
- depending on the maximum packet
- size. */
-
-#if UIP_SLIDING_WINDOW
-int uip_do_split;
-#endif
-
-u32_t uip_flags; /* The uip_flags variable is used for
- communication between the TCP/IP stack
- and the application program. */
-struct uip_conn *uip_conn; /* uip_conn always points to the current
- connection. */
-
-struct uip_conn uip_conns[UIP_CONNS];
-/* The uip_conns array holds all TCP
- connections. */
-u16_t uip_listenports[UIP_LISTENPORTS];
-/* The uip_listenports list all currently
- listning ports. */
-
-u16_t uip_udp_listenports[UIP_LISTENPORTS];
-/* The uip_listenports list all currently
- listning ports. */
-#if UIP_UDP
-struct uip_udp_conn *uip_udp_conn;
-struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
-#endif /* UIP_UDP */
-
-static u16_t ipid; /* Ths ipid variable is an increasing
- number that is used for the IP ID
- field. */
-
-void uip_setipid(u16_t id) {
-	ipid = id;
-}
-
-static u8_t iss[4]; /* The iss variable is used for the TCP
- initial sequence number. */
-
-#if UIP_ACTIVE_OPEN
-static u16_t lastport; /* Keeps track of the last port used for
- a new connection. */
-#endif /* UIP_ACTIVE_OPEN */
-
-/* Temporary variables. */
-u8_t uip_acc32[4];
-static u8_t c, opt;
-static u16_t tmp16;
-
-/* Structures and definitions. */
-#define TCP_FIN 0x01
-#define TCP_SYN 0x02
-#define TCP_RST 0x04
-#define TCP_PSH 0x08
-#define TCP_ACK 0x10
-#define TCP_URG 0x20
-#define TCP_CTL 0x3f
-
-#define TCP_OPT_END     0   /* End of TCP options list */
-#define TCP_OPT_NOOP    1   /* "No-operation" TCP option */
-#define TCP_OPT_MSS     2   /* Maximum segment size TCP option */
-
-#define TCP_OPT_MSS_LEN 4   /* Length of TCP MSS option. */
-
-#define ICMP_ECHO_REPLY 0
-#define ICMP_ECHO       8
-
-#define ICMP6_ECHO_REPLY             129
-#define ICMP6_ECHO                   128
-#define ICMP6_NEIGHBOR_SOLICITATION  135
-#define ICMP6_NEIGHBOR_ADVERTISEMENT 136
-
-#define ICMP6_FLAG_S (1 << 6)
-
-#define ICMP6_OPTION_SOURCE_LINK_ADDRESS 1
-#define ICMP6_OPTION_TARGET_LINK_ADDRESS 2
-
-/* Macros. */
-#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define FBUF ((struct uip_tcpip_hdr *)&uip_reassbuf[0])
-#define ICMPBUF ((struct uip_icmpip_hdr *)&uip_buf[UIP_LLH_LEN])
-#define UDPBUF ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])
-
-#if UIP_STATISTICS == 1
-struct uip_stats uip_stat;
-#define UIP_STAT(s) s
-#else
-#define UIP_STAT(s)
-#endif /* UIP_STATISTICS == 1 */
-
-#if UIP_LOGGING == 1
-#include <stdio.h>
-void uip_log(char *msg);
-#define UIP_LOG(m) uip_log(m)
-#else
-#define UIP_LOG(m)
-#endif /* UIP_LOGGING == 1 */
-
-
-
-
-/* Useful operations on 4-byte words misaligned by 2 */
-
-static void xtcp_swap_words(u8_t* a, u8_t* b)
-{
-	short c;
-
-	c = *(short*)(&a[0]);
-	*(short*)(&a[0]) = *(short*)(&b[0]);
-	*(short*)(&b[0]) = (short)c;
-
-	c = *(short*)(&a[2]);
-	*(short*)(&a[2]) = *(short*)(&b[2]);
-	*(short*)(&b[2]) = (short)c;
-}
-
-static void xtcp_increment_word(u8_t* a)
-{
-	unsigned s = ((*(short*)(&a[2])) << 16) + *(short*)(&a[0]);
-	s = byterev(byterev(s)+1);
-	*(short*)(&a[0]) = (short)s;
-	*(short*)(&BUF->ackno[2]) = (short)(s >> 16);
-}
-
-__attribute__ ((noinline))
-void xtcp_copy_word(u8_t*d, u8_t* s)
-{
-	*(short*)(&d[0]) = *(short*)(&s[0]);
-	*(short*)(&d[2]) = *(short*)(&s[2]);
-}
-
-__attribute__ ((noinline))
-static int xtcp_compare_words(const u8_t* a, const u8_t* b)
-{
-	return (*(short*)(&a[0]) == *(short*)(&b[0])) &&
-		   (*(short*)(&a[2]) == *(short*)(&b[2]));
-}
-
-
-
-#if UIP_SLIDING_WINDOW
-static int xtcp_get_word(const u8_t *a) {
-  unsigned int aw = ((*(unsigned short*)(&a[2])) << 16) + *(unsigned short*)(&a[0]);
-  return byterev(aw);
-}
-
-/*static void xtcp_put_word(const u8_t *a, unsigned int s) {
-  *(short*)(&a[0]) = (short)s;
-  *(short*)(&a[2]) = (short)(s >> 16);
-  }*/
-
-#endif
-
-__attribute__ ((noinline))
-void uip_add32(u8_t *op32, u16_t op16) {
-	  unsigned int *res = (unsigned int *)uip_acc32;
-	  unsigned int x = ((*(unsigned short*)(&op32[2])) << 16) + *(unsigned short*)(&op32[0]);
-	  x = byterev(x);
-	  *res = byterev(x + op16);
-}
-
-
-
-void uip_ipaddr_copy(void *dest, const void *src)
-{
-	xtcp_copy_word((u8_t*)dest, (u8_t*)src);
-}
-
-int uip_ipaddr_cmp(const void *addr1, const void *addr2)
-{
-    return xtcp_compare_words(addr1, addr2);
-}
-
-
-/* Alternative faster checksum computation */
-
-static int onesReduce(unsigned int sum, int carry) {
-    sum = (sum & 0xffff) + (sum >> 16) + carry;
-    return (sum & 0xffff) + (sum >> 16);
-}
-
-static u16_t chksum(u16_t sum, const u8_t *byte_data, u16_t lengthInBytes) {
-    int i;
-    short* data = (short*)byte_data;
-    unsigned s = sum;
-    for(i = 0; i < (lengthInBytes>>1); i++) {
-        s += byterev(data[i]) >> 16;
-    }
-    if (lengthInBytes & 1) {
-        s += byte_data[2*i] << 8;
-    }
-    sum = onesReduce(s, 0);
-    return sum;
-}
-
-
-/*---------------------------------------------------------------------------*/
-u16_t uip_chksum(u16_t *data, u16_t len) {
-	return htons(chksum(0, (u8_t *) data, len));
-}
-/*---------------------------------------------------------------------------*/
-#ifndef UIP_ARCH_IPCHKSUM
-u16_t uip_ipchksum(void) {
-	u16_t sum;
-
-	sum = chksum(0, &uip_buf[UIP_LLH_LEN], UIP_IPH_LEN);
-	DEBUG_PRINTF("uip_ipchksum: sum 0x%04x\n", sum);
-	return (sum == 0) ? 0xffff : htons(sum);
-}
-#endif
-/*---------------------------------------------------------------------------*/
-static u16_t upper_layer_chksum(u8_t proto) {
-	u16_t upper_layer_len;
-	u16_t sum;
-
-#if UIP_CONF_IPV6
-	upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
-#else /* UIP_CONF_IPV6 */
-	upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
-#endif /* UIP_CONF_IPV6 */
-
-	/* First sum pseudoheader. */
-
-	/* IP protocol and length fields. This addition cannot carry. */
-	sum = upper_layer_len + proto;
-	/* Sum IP source and destination addresses. */
-	sum = chksum(sum, (u8_t *) &BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
-
-	/* Sum TCP header and data. */
-	sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN], upper_layer_len);
-
-	return (sum == 0) ? 0xffff : htons(sum);
-}
-/*---------------------------------------------------------------------------*/
-#if UIP_CONF_IPV6
-u16_t
-uip_icmp6chksum(void)
-{
-	return upper_layer_chksum(UIP_PROTO_ICMP6);
-
-}
-#endif /* UIP_CONF_IPV6 */
-/*---------------------------------------------------------------------------*/
-u16_t uip_tcpchksum(void) {
-	return upper_layer_chksum(UIP_PROTO_TCP);
-}
-/*---------------------------------------------------------------------------*/
-#if UIP_UDP_CHECKSUMS
-u16_t
-uip_udpchksum(void)
-{
-	return upper_layer_chksum(UIP_PROTO_UDP);
-}
-#endif /* UIP_UDP_CHECKSUMS */
-
-/*---------------------------------------------------------------------------*/
-void uip_init(void) {
-	memset(uip_listenports, 0, sizeof(uip_listenports));
-	memset(uip_udp_listenports, 0, sizeof(uip_listenports));
-	memset(uip_conns, 0, sizeof(uip_conns));
-#if UIP_ACTIVE_OPEN
-	lastport = 1024;
-#endif /* UIP_ACTIVE_OPEN */
-
-#if UIP_UDP
-	memset(uip_udp_conns, 0, sizeof(uip_udp_conns));
-#endif /* UIP_UDP */
-}
-
-/*---------------------------------------------------------------------------*/
-#if UIP_ACTIVE_OPEN
-struct uip_conn *
-uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
-{
-	register struct uip_conn *conn, *cconn;
-
-	/* Find an unused local port. */
-	again:
-	++lastport;
-
-	if(lastport >= 32000) {
-		lastport = 4096;
-	}
-
-	/* Check if this port is already in use, and if so try to find another one. */
-	for(c = 0; c < UIP_CONNS; ++c) {
-		conn = &uip_conns[c];
-		if(conn->tcpstateflags != UIP_CLOSED &&
-				conn->lport == htons(lastport)) {
-			goto again;
-		}
-	}
-
-	conn = 0;
-	for(c = 0; c < UIP_CONNS; ++c) {
-		cconn = &uip_conns[c];
-		if(cconn->tcpstateflags == UIP_CLOSED) {
-			conn = cconn;
-			break;
-		}
-		if(cconn->tcpstateflags == UIP_TIME_WAIT) {
-			if(conn == 0 ||
-					cconn->timer > conn->timer) {
-				conn = cconn;
-			}
-		}
-	}
-
-	if(conn == 0) {
-		// max tcp connections reached
-		return 0;
-	}
-
-	conn->tcpstateflags = UIP_SYN_SENT;
-
-	conn->snd_nxt[0] = iss[0];
-	conn->snd_nxt[1] = iss[1];
-	conn->snd_nxt[2] = iss[2];
-	conn->snd_nxt[3] = iss[3];
-
-	conn->initialmss = conn->mss = UIP_TCP_MSS;
-
-	conn->len = 1; /* TCP length of the SYN is one. */
-	conn->nrtx = 0;
-	conn->timer = 1; /* Send the SYN next time around. */
-	conn->rto = UIP_RTO;
-	conn->sa = 0;
-	conn->sv = 16; /* Initial value of the RTT variance. */
-	conn->lport = htons(lastport);
-	conn->rport = rport;
-	uip_ipaddr_copy(&conn->ripaddr, ripaddr);
-#if UIP_SLIDING_WINDOW
-        conn->midpoint = 0;
-#endif
-	return conn;
-}
-#endif /* UIP_ACTIVE_OPEN */
-/*---------------------------------------------------------------------------*/
-#if UIP_UDP
-struct uip_udp_conn *
-uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport)
-{
-	register struct uip_udp_conn *conn;
-
-	/* Find an unused local port. */
-	again:
-	++lastport;
-
-	if(lastport >= 32000) {
-		lastport = 4096;
-	}
-
-	for(c = 0; c < UIP_UDP_CONNS; ++c) {
-		if(uip_udp_conns[c].lport == htons(lastport)) {
-			goto again;
-		}
-	}
-
-	conn = 0;
-	for(c = 0; c < UIP_UDP_CONNS; ++c) {
-		if(uip_udp_conns[c].lport == 0) {
-			conn = &uip_udp_conns[c];
-			break;
-		}
-	}
-
-	if(conn == 0) {
-		return 0;
-	}
-
-	conn->lport = HTONS(lastport);
-	conn->rport = rport;
-
-	if(ripaddr == NULL) {
-		memset(conn->ripaddr, 0, sizeof(uip_ipaddr_t));
-	} else {
-		uip_ipaddr_copy(&conn->ripaddr, ripaddr);
-	}
-	conn->ttl = UIP_TTL;
-	conn->udpflags = 0;
-	return conn;
-}
-#endif /* UIP_UDP */
-/*---------------------------------------------------------------------------*/
-void uip_unlisten(u16_t port) {
-	for (c = 0; c < UIP_LISTENPORTS; ++c) {
-		if (uip_listenports[c] == port) {
-			uip_listenports[c] = 0;
-			return;
-		}
-	}
-}
-
-void uip_udp_unlisten(u16_t port) {
-	for (c = 0; c < UIP_LISTENPORTS; ++c) {
-		if (uip_udp_listenports[c] == port) {
-			uip_udp_listenports[c] = 0;
-			return;
-		}
-	}
-}
-/*---------------------------------------------------------------------------*/
-void uip_listen(u16_t port) {
-	for (c = 0; c < UIP_LISTENPORTS; ++c) {
-		if (uip_listenports[c] == 0) {
-			uip_listenports[c] = port;
-			return;
-		}
-	}
-}
-
-void uip_udp_listen(u16_t port) {
-	for (c = 0; c < UIP_LISTENPORTS; ++c) {
-		if (uip_udp_listenports[c] == 0) {
-			uip_udp_listenports[c] = port;
-			return;
-		}
-	}
-}
-
-/*---------------------------------------------------------------------------*/
-/* XXX: IP fragment reassembly: not well-tested. */
-
-#if UIP_REASSEMBLY && !UIP_CONF_IPV6
-#define UIP_REASS_BUFSIZE (UIP_BUFSIZE - UIP_LLH_LEN)
-static u8_t uip_reassbuf[UIP_REASS_BUFSIZE];
-static u8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
-static const u8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
-	0x0f, 0x07, 0x03, 0x01};
-static u16_t uip_reasslen;
-static u8_t uip_reassflags;
-#define UIP_REASS_FLAG_LASTFRAG 0x01
-static u8_t uip_reasstmr;
-
-#define IP_MF   0x20
-
-static u8_t
-uip_reass(void)
-{
-	u16_t offset, len;
-	u16_t i;
-
-	/* 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(uip_reasstmr == 0) {
-		memcpy(uip_reassbuf, &BUF->vhl, UIP_IPH_LEN);
-		uip_reasstmr = UIP_REASS_MAXAGE;
-		uip_reassflags = 0;
-		/* Clear the bitmap. */
-		memset(uip_reassbitmap, 0, sizeof(uip_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(BUF->srcipaddr[0] == FBUF->srcipaddr[0] &&
-			BUF->srcipaddr[1] == FBUF->srcipaddr[1] &&
-			BUF->destipaddr[0] == FBUF->destipaddr[0] &&
-			BUF->destipaddr[1] == FBUF->destipaddr[1] &&
-			BUF->ipid[0] == FBUF->ipid[0] &&
-			BUF->ipid[1] == FBUF->ipid[1]) {
-
-		len = (BUF->len[0] << 8) + BUF->len[1] - (BUF->vhl & 0x0f) * 4;
-		offset = (((BUF->ipoffset[0] & 0x3f) << 8) + BUF->ipoffset[1]) * 8;
-
-		/* If the offset or the offset + fragment length overflows the
-		 reassembly buffer, we discard the entire packet. */
-		if(offset > UIP_REASS_BUFSIZE ||
-				offset + len > UIP_REASS_BUFSIZE) {
-			uip_reasstmr = 0;
-			goto nullreturn;
-		}
-
-		/* Copy the fragment into the reassembly buffer, at the right
-		 offset. */
-		memcpy(&uip_reassbuf[UIP_IPH_LEN + offset],
-				(char *)BUF + (int)((BUF->vhl & 0x0f) * 4),
-				len);
-
-		/* Update the bitmap. */
-		if(offset / (8 * 8) == (offset + len) / (8 * 8)) {
-			/* If the two endpoints are in the same byte, we only update
-			 that byte. */
-
-			uip_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. */
-			uip_reassbitmap[offset / (8 * 8)] |=
-			bitmap_bits[(offset / 8 ) & 7];
-			for(i = 1 + offset / (8 * 8); i < (offset + len) / (8 * 8); ++i) {
-				uip_reassbitmap[i] = 0xff;
-			}
-			uip_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((BUF->ipoffset[0] & IP_MF) == 0) {
-			uip_reassflags |= UIP_REASS_FLAG_LASTFRAG;
-			uip_reasslen = offset + len;
-		}
-
-		/* 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(uip_reassflags & UIP_REASS_FLAG_LASTFRAG) {
-			/* Check all bytes up to and including all but the last byte in
-			 the bitmap. */
-			for(i = 0; i < uip_reasslen / (8 * 8) - 1; ++i) {
-				if(uip_reassbitmap[i] != 0xff) {
-					goto nullreturn;
-				}
-			}
-			/* Check the last byte in the bitmap. It should contain just the
-			 right amount of bits. */
-			if(uip_reassbitmap[uip_reasslen / (8 * 8)] !=
-					(u8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
-				goto nullreturn;
-			}
-
-			/* 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. */
-			uip_reasstmr = 0;
-			memcpy(BUF, FBUF, uip_reasslen);
-
-			/* Pretend to be a "normal" (i.e., not fragmented) IP packet
-			 from now on. */
-			BUF->ipoffset[0] = BUF->ipoffset[1] = 0;
-			BUF->len[0] = uip_reasslen >> 8;
-			BUF->len[1] = uip_reasslen & 0xff;
-			BUF->ipchksum = 0;
-			BUF->ipchksum = ~(uip_ipchksum());
-
-			return uip_reasslen;
-		}
-	}
-
-	nullreturn:
-	return 0;
-}
-#endif /* UIP_REASSEMBLY */
-/*---------------------------------------------------------------------------*/
-static void uip_add_rcv_nxt(u16_t n) {
-	uip_add32(uip_conn->rcv_nxt, n);
-	xtcp_copy_word(uip_conn->rcv_nxt, uip_acc32);
-}
-/*---------------------------------------------------------------------------*/
-
-void xtcpd_init_send_from_uip(struct uip_conn *conn);
-
-void uip_process(u8_t flag) {
-	register struct uip_conn *uip_connr = uip_conn;
-
-
-        #if UIP_SLIDING_WINDOW
-        uip_do_split = 0;
-        uip_slen = 0;
-        #endif
-
-
-#if UIP_UDP
-	if(flag == UIP_UDP_SEND_CONN) {
-		goto udp_send;
-	}
-#endif /* UIP_UDP */
-
-	uip_sappdata = uip_appdata = &uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN];
-
-	/* Check if we were invoked because of a poll request for a
-	 particular connection. */
-	if (flag == UIP_POLL_REQUEST) {
-		if ((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED
-                    #if UIP_SLIDING_WINDOW
-                    && ((!uip_outstanding(uip_connr)) || uip_connr->midpoint)
-                    #else
-                    && !uip_outstanding(uip_connr)
-                    #endif
-                    ) {
-			uip_flags = UIP_POLL;
-                        uip_len = 0;
-                        uip_slen = 0;
-			UIP_APPCALL();
-			goto appsend;
-		}
-		goto drop;
-
-		/* Check if we were invoked because of the perodic timer fireing. */
-	} else if (flag == UIP_TIMER) {
-#if UIP_REASSEMBLY
-		if(uip_reasstmr != 0) {
-			--uip_reasstmr;
-		}
-#endif /* UIP_REASSEMBLY */
-		/* Increase the initial sequence number. */
-		xtcp_increment_word(iss);
-
-		/* Reset the length variables. */
-		uip_len = 0;
-		uip_slen = 0;
-
-		/* Check if the connection is in a state in which we simply wait
-		 for the connection to time out. If so, we increase the
-		 connection's timer and remove the connection if it times
-		 out. */
-		if (uip_connr->tcpstateflags == UIP_TIME_WAIT
-				|| uip_connr->tcpstateflags == UIP_FIN_WAIT_2) {
-			++(uip_connr->timer);
-			if (uip_connr->timer == UIP_TIME_WAIT_TIMEOUT) {
-				uip_connr->tcpstateflags = UIP_CLOSED;
-			}
-		} else if (uip_connr->tcpstateflags != UIP_CLOSED) {
-			/* If the connection has outstanding data, we increase the
-			 connection's timer and see if it has reached the RTO value
-			 in which case we retransmit. */
-			if (uip_outstanding(uip_connr)) {
-				if (uip_connr->timer-- == 0) {
-					if (uip_connr->nrtx == UIP_MAXRTX
-							|| ((uip_connr->tcpstateflags == UIP_SYN_SENT
-									|| uip_connr->tcpstateflags == UIP_SYN_RCVD)
-									&& uip_connr->nrtx == UIP_MAXSYNRTX)) {
-						uip_connr->tcpstateflags = UIP_CLOSED;
-
-						/* We call UIP_APPCALL() with uip_flags set to
-						 UIP_TIMEDOUT to inform the application that the
-						 connection has timed out. */
-						uip_flags = UIP_TIMEDOUT;
-						UIP_APPCALL();
-
-						/* We also send a reset packet to the remote host. */
-						BUF->flags = TCP_RST | TCP_ACK;
-						goto tcp_send_nodata;
-					}
-
-					/* Exponential backoff. */
-					uip_connr->timer = UIP_RTO << (uip_connr->nrtx > 4 ? 4
-							: uip_connr->nrtx);
-					++(uip_connr->nrtx);
-
-					/* Ok, so we need to retransmit. We do this differently
-					 depending on which state we are in. In ESTABLISHED, we
-					 call upon the application so that it may prepare the
-					 data for the retransmit. In SYN_RCVD, we resend the
-					 SYNACK that we sent earlier and in LAST_ACK we have to
-					 retransmit our FINACK. */
-					UIP_STAT(++uip_stat.tcp.rexmit);
-					switch (uip_connr->tcpstateflags & UIP_TS_MASK) {
-					case UIP_SYN_RCVD:
-						/* In the SYN_RCVD state, we should retransmit our
-						 SYNACK. */
-						goto tcp_send_synack;
-
-#if UIP_ACTIVE_OPEN
-					case UIP_SYN_SENT:
-						/* In the SYN_SENT state, we retransmit out SYN. */
-						BUF->flags = 0;
-						goto tcp_send_syn;
-#endif /* UIP_ACTIVE_OPEN */
-
-					case UIP_ESTABLISHED:
-						/* In the ESTABLISHED state, we call upon the application
-						 to do the actual retransmit after which we jump into
-						 the code for sending out the packet (the apprexmit
-						 label). */
-						uip_flags = UIP_REXMIT;
-						UIP_APPCALL();
-						goto apprexmit;
-
-					case UIP_FIN_WAIT_1:
-					case UIP_CLOSING:
-					case UIP_LAST_ACK:
-						/* In all these states we should retransmit a FINACK. */
-						goto tcp_send_finack;
-
-					}
-				}
-			} else if ((uip_connr->tcpstateflags & UIP_TS_MASK)
-					== UIP_ESTABLISHED) {
-				/* If there was no need for a retransmission, we poll the
-				 application for new data. */
-				uip_flags = UIP_POLL;
-				UIP_APPCALL();
-				goto appsend;
-			}
-		}
-		goto drop;
-	}
-#if UIP_UDP
-	if(flag == UIP_UDP_TIMER || flag == UIP_UDP_ACKDATA) {
-		if(uip_udp_conn->lport != 0) {
-			uip_conn = NULL;
-			uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
-			uip_len = uip_slen = 0;
-			if (flag == UIP_UDP_ACKDATA) {
-				uip_flags = UIP_ACKDATA;
-				uip_udp_conn->udpflags ^= UDP_SENT;
-			}
-			else
-			uip_flags = UIP_POLL;
-			UIP_UDP_APPCALL();
-			goto udp_send;
-		} else {
-			goto drop;
-		}
-	}
-	else if(flag == UIP_UDP_ARP_EVENT) {
-		if(uip_udp_conn->lport != 0 &&
-				(uip_udp_conn->udpflags & UDP_PENDING_ARP)) {
-			uip_conn = NULL;
-			uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
-			uip_len = uip_slen = 0;
-			uip_flags = UIP_REXMIT;
-			uip_udp_conn->udpflags ^= UDP_PENDING_ARP;
-			UIP_UDP_APPCALL();
-			goto udp_send;
-		} else {
-			goto drop;
-		}
-	}
-
-#endif
-
-	/* This is where the input processing starts. */
-	UIP_STAT(++uip_stat.ip.recv);
-
-	/* Start of IP input header processing code. */
-
-#if UIP_CONF_IPV6
-	/* Check validity of the IP header. */
-	if((BUF->vtc & 0xf0) != 0x60) { /* IP version and header length. */
-		UIP_STAT(++uip_stat.ip.drop);
-		UIP_STAT(++uip_stat.ip.vhlerr);
-		UIP_LOG("ipv6: invalid version.");
-		goto drop;
-	}
-#else /* UIP_CONF_IPV6 */
-	/* Check validity of the IP header. */
-	if (BUF->vhl != 0x45) { /* IP version and header length. */
-		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.vhlerr); UIP_LOG("ip: invalid version or header length: ");
-#if UIP_CONF_LOGGING
-		printhexln(BUF->vhl);
-#endif
-		goto drop;
-	}
-#endif /* UIP_CONF_IPV6 */
-
-	/* Check the size of the packet. If the size reported to us in
-	 uip_len is smaller the size reported in the IP header, we assume
-	 that the packet has been corrupted in transit. If the size of
-	 uip_len is larger than the size reported in the IP packet header,
-	 the packet has been padded and we set uip_len to the correct
-	 value.. */
-
-	if ((BUF->len[0] << 8) + BUF->len[1] <= uip_len) {
-		uip_len = (BUF->len[0] << 8) + BUF->len[1];
-
-#if UIP_CONF_IPV6
-		uip_len += 40; /* The length reported in the IPv6 header is the
-		 length of the payload that follows the
-		 header. However, uIP uses the uip_len variable
-		 for holding the size of the entire packet,
-		 including the IP header. For IPv4 this is not a
-		 problem as the length field in the IPv4 header
-		 contains the length of the entire packet. But
-		 for IPv6 we need to add the size of the IPv6
-		 header (40 bytes). */
-#endif /* UIP_CONF_IPV6 */
-	} else {
-		UIP_LOG("ip: packet shorter than reported in IP header.");
-		goto drop;
-	}
-
-#if !UIP_CONF_IPV6
-	/* Check the fragment flag. */
-	if ((BUF->ipoffset[0] & 0x3f) != 0 || BUF->ipoffset[1] != 0) {
-#if UIP_REASSEMBLY
-		uip_len = uip_reass();
-		if(uip_len == 0) {
-			goto drop;
-		}
-#else /* UIP_REASSEMBLY */
-		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.fragerr); UIP_LOG("ip: fragment dropped.");
-		goto drop;
-#endif /* UIP_REASSEMBLY */
-	}
-#endif /* UIP_CONF_IPV6 */
-
-	if (uip_ipaddr_cmp(uip_hostaddr, all_zeroes_addr)) {
-		/* If we are configured to use ping IP address configuration and
-		 hasn't been assigned an IP address yet, we accept all ICMP
-		 packets. */
-#if UIP_PINGADDRCONF && !UIP_CONF_IPV6
-		if(BUF->proto == UIP_PROTO_ICMP) {
-			UIP_LOG("ip: possible ping config packet received.");
-			goto icmp_input;
-		} else {
-			UIP_LOG("ip: packet dropped since no address assigned.");
-			goto drop;
-		}
-#endif /* UIP_PINGADDRCONF */
-
-	} else {
-		/* If IP broadcast support is configured, we check for a broadcast
-		 UDP packet, which may be destined to us. */
-#if UIP_BROADCAST
-		DEBUG_PRINTF("UDP IP checksum 0x%04x\n", uip_ipchksum());
-		if(BUF->proto == UIP_PROTO_UDP &&
-				(uip_ipaddr_cmp(BUF->destipaddr, all_ones_addr) ||
-                uip_ipaddr_is_multicast(BUF->destipaddr)) // Fix for UDP multicast traffic
-				/*&&
-				 uip_ipchksum() == 0xffff*/) {
-			goto udp_input;
-		}
-#endif /* UIP_BROADCAST */
-
-		/* Check if the packet is destined for our IP address */
-#if !UIP_CONF_IPV6
-		if (!uip_ipaddr_cmp(BUF->destipaddr, uip_hostaddr)
-#if UIP_IGMP
-				&& !igmp_check_addr(BUF->destipaddr)
-#endif
-				) {
-			UIP_STAT(++uip_stat.ip.drop);
-			goto drop;
-		}
-#else /* UIP_CONF_IPV6 */
-		/* For IPv6, packet reception is a little trickier as we need to
-		 make sure that we listen to certain multicast addresses (all
-		 hosts multicast address, and the solicited-node multicast
-		 address) as well. However, we will cheat here and accept all
-		 multicast packets that are sent to the ff02::/16 addresses. */
-		if(!uip_ipaddr_cmp(BUF->destipaddr, uip_hostaddr) &&
-				BUF->destipaddr[0] != HTONS(0xff02)) {
-			UIP_STAT(++uip_stat.ip.drop);
-			goto drop;
-		}
-#endif /* UIP_CONF_IPV6 */
-	}
-
-#if !UIP_CONF_IPV6
-	if (uip_ipchksum() != 0xffff) { /* Compute and check the IP header
-	 checksum. */
-		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.chkerr); UIP_LOG("ip: bad checksum.");
-		goto drop;
-	}
-#endif /* UIP_CONF_IPV6 */
-
-	if (BUF->proto == UIP_PROTO_TCP) { /* Check for TCP packet. If so,
-	 proceed with TCP input
-	 processing. */
-		goto tcp_input;
-	}
-
-#if UIP_UDP
-	if(BUF->proto == UIP_PROTO_UDP) {
-		goto udp_input;
-	}
-#endif /* UIP_UDP */
-
-#if !UIP_CONF_IPV6
-
-#if UIP_IGMP
-	if (BUF->proto == UIP_PROTO_IGMP) {
-		igmp_in();
-		return;
-	}
-#endif
-
-	/* ICMPv4 processing code follows. */
-	if (BUF->proto != UIP_PROTO_ICMP) { /* We only allow ICMP packets from
-	 here. */
-		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.protoerr); UIP_LOG("ip: neither tcp nor icmp.");
-		goto drop;
-	}
-
-#if UIP_PINGADDRCONF
-	icmp_input:
-#endif /* UIP_PINGADDRCONF */
-	UIP_STAT(++uip_stat.icmp.recv);
-
-	/* ICMP echo (i.e., ping) processing. This is simple, we only change
-	 the ICMP type from ECHO to ECHO_REPLY and adjust the ICMP
-	 checksum before we return the packet. */
-	if (ICMPBUF->type != ICMP_ECHO) {
-		UIP_STAT(++uip_stat.icmp.drop); UIP_STAT(++uip_stat.icmp.typeerr); UIP_LOG("icmp: not icmp echo.");
-		goto drop;
-	}
-
-	/* If we are configured to use ping IP address assignment, we use
-	 the destination IP address of this ping packet and assign it to
-	 ourself. */
-#if UIP_PINGADDRCONF
-	if((uip_hostaddr[0] | uip_hostaddr[1]) == 0) {
-		uip_hostaddr[0] = BUF->destipaddr[0];
-		uip_hostaddr[1] = BUF->destipaddr[1];
-	}
-#endif /* UIP_PINGADDRCONF */
-
-	ICMPBUF->type = ICMP_ECHO_REPLY;
-
-	if (ICMPBUF->icmpchksum >= HTONS(0xffff - (ICMP_ECHO << 8))) {
-		ICMPBUF->icmpchksum += HTONS(ICMP_ECHO << 8) + 1;
-	} else {
-		ICMPBUF->icmpchksum += HTONS(ICMP_ECHO << 8);
-	}
-
-	/* Swap IP addresses. */
-	uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
-	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
-
-	UIP_STAT(++uip_stat.icmp.sent);
-	goto send;
-
-	/* End of IPv4 input header processing code. */
-#else /* !UIP_CONF_IPV6 */
-
-	/* This is IPv6 ICMPv6 processing code. */
-	DEBUG_PRINTF("icmp6_input: length %d\n", uip_len);
-
-	if(BUF->proto != UIP_PROTO_ICMP6) { /* We only allow ICMPv6 packets from
-	 here. */
-		UIP_STAT(++uip_stat.ip.drop);
-		UIP_STAT(++uip_stat.ip.protoerr);
-		UIP_LOG("ip: neither tcp nor icmp6.");
-		goto drop;
-	}
-
-	UIP_STAT(++uip_stat.icmp.recv);
-
-	/* If we get a neighbor solicitation for our address we should send
-	 a neighbor advertisement message back. */
-	if(ICMPBUF->type == ICMP6_NEIGHBOR_SOLICITATION) {
-		if(uip_ipaddr_cmp(ICMPBUF->icmp6data, uip_hostaddr)) {
-
-			if(ICMPBUF->options[0] == ICMP6_OPTION_SOURCE_LINK_ADDRESS) {
-				/* Save the sender's address in our neighbor list. */
-				uip_neighbor_add(ICMPBUF->srcipaddr, &(ICMPBUF->options[2]));
-			}
-
-			/* We should now send a neighbor advertisement back to where the
-			 neighbor solicication came from. */
-			ICMPBUF->type = ICMP6_NEIGHBOR_ADVERTISEMENT;
-			ICMPBUF->flags = ICMP6_FLAG_S; /* Solicited flag. */
-
-			ICMPBUF->reserved1 = ICMPBUF->reserved2 = ICMPBUF->reserved3 = 0;
-
-			uip_ipaddr_copy(ICMPBUF->destipaddr, ICMPBUF->srcipaddr);
-			uip_ipaddr_copy(ICMPBUF->srcipaddr, uip_hostaddr);
-			ICMPBUF->options[0] = ICMP6_OPTION_TARGET_LINK_ADDRESS;
-			ICMPBUF->options[1] = 1; /* Options length, 1 = 8 bytes. */
-			memcpy(&(ICMPBUF->options[2]), &uip_ethaddr, sizeof(uip_ethaddr));
-			ICMPBUF->icmpchksum = 0;
-			ICMPBUF->icmpchksum = ~uip_icmp6chksum();
-			goto send;
-
-		}
-		goto drop;
-	} else if(ICMPBUF->type == ICMP6_ECHO) {
-		/* ICMP echo (i.e., ping) processing. This is simple, we only
-		 change the ICMP type from ECHO to ECHO_REPLY and update the
-		 ICMP checksum before we return the packet. */
-
-		ICMPBUF->type = ICMP6_ECHO_REPLY;
-
-		uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
-		uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
-		ICMPBUF->icmpchksum = 0;
-		ICMPBUF->icmpchksum = ~uip_icmp6chksum();
-
-		UIP_STAT(++uip_stat.icmp.sent);
-		goto send;
-	} else {
-		DEBUG_PRINTF("Unknown icmp6 message type %d\n", ICMPBUF->type);
-		UIP_STAT(++uip_stat.icmp.drop);
-		UIP_STAT(++uip_stat.icmp.typeerr);
-		UIP_LOG("icmp: unknown ICMP message.");
-		goto drop;
-	}
-
-	/* End of IPv6 ICMP processing. */
-
-#endif /* !UIP_CONF_IPV6 */
-
-#if UIP_UDP
-	/* UDP input processing. */
-	udp_input:
-	/* UDP processing is really just a hack. We don't do anything to the
-	 UDP/IP headers, but let the UDP application do all the hard
-	 work. If the application sets uip_slen, it has a packet to
-	 send. */
-     
-#if UIP_UDP_CHECKSUMS
-	uip_len = uip_len - UIP_IPUDPH_LEN;
-	uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
-	if(UDPBUF->udpchksum != 0 && uip_udpchksum() != 0xffff) {
-		UIP_STAT(++uip_stat.udp.drop);
-		UIP_STAT(++uip_stat.udp.chkerr);
-		UIP_LOG("udp: bad checksum.");
-		goto drop;
-	}
-#else /* UIP_UDP_CHECKSUMS */
-	uip_len = uip_len - UIP_IPUDPH_LEN;
-#endif /* UIP_UDP_CHECKSUMS */
-
-	/* Demultiplex this UDP packet between the UDP "connections". */
-	for(uip_udp_conn = &uip_udp_conns[0];
-			uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS];
-			++uip_udp_conn) {
-		/* If the local UDP port is non-zero, the connection is considered
-		 to be used. If so, the local port number is checked against the
-		 destination port number in the received packet. If the two port
-		 numbers match, the remote port number is checked if the
-		 connection is bound to a remote port. Finally, if the
-		 connection is bound to a remote IP address, the source IP
-		 address of the packet is checked. */
-
-#if 0	  	  
-		if(uip_udp_conn->lport != 0 &&
-				UDPBUF->destport == uip_udp_conn->lport &&
-				(uip_udp_conn->rport == 0 ||
-						(uip_udp_conn->udpflags & UDP_IS_SERVER_CONN) ||
-						UDPBUF->srcport == uip_udp_conn->rport) &&
-				((uip_udp_conn->udpflags & UDP_IS_SERVER_CONN) ||
-						uip_ipaddr_cmp(uip_udp_conn->ripaddr, all_zeroes_addr) ||
-						uip_ipaddr_cmp(uip_udp_conn->ripaddr, all_ones_addr) ||
-						uip_ipaddr_cmp(BUF->srcipaddr, uip_udp_conn->ripaddr) ||
-						uip_ipaddr_is_multicast(uip_udp_conn->ripaddr))) {
-
-			goto udp_found;
-		}
-#endif
-
-		if(uip_udp_conn->lport != 0 &&
-				UDPBUF->destport == uip_udp_conn->lport &&
-				UDPBUF->srcport == uip_udp_conn->rport &&
-				(uip_ipaddr_cmp(UDPBUF->srcipaddr, uip_udp_conn->ripaddr)
-                || (UDPBUF->destport == 0x4400) // Fix for DHCP
-                || (uip_ipaddr_is_multicast(uip_udp_conn->ripaddr)))
-          )
-		{
-			goto udp_found;
-		}
-	}
-
-	tmp16 = BUF->destport;
-	/* Next, check listening connections. */
-	for(c = 0; c < UIP_LISTENPORTS; ++c) {
-		if(tmp16 == uip_udp_listenports[c]) {
-			uip_udp_conn = 0;
-			for(c = 0; c < UIP_UDP_CONNS; ++c) {
-				if(uip_udp_conns[c].lport == 0) {
-					uip_udp_conn = &uip_udp_conns[c];
-					break;
-				}
-			}
-			if (uip_udp_conn != 0) {
-				uip_udp_conn->lport = tmp16;
-				uip_udp_conn->rport = UDPBUF->srcport;
-				uip_udp_conn->ttl = UIP_TTL;
-				uip_udp_conn->udpflags = 0;
-				uip_flags = UIP_CONNECTED | UIP_NEWDATA;
-				uip_ipaddr_copy(uip_udp_conn->ripaddr, UDPBUF->srcipaddr);
-				goto udp_found_listener;
-			}
-		}
-	}
-
-	// No matching connection found
-	goto drop;
-
-	udp_found:
-	uip_flags = UIP_NEWDATA;
-	udp_found_listener:
-	uip_conn = NULL;
-	uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
-	uip_slen = 0;
-	UIP_UDP_APPCALL();
-	udp_send:
-	if(uip_slen == 0) {
-		goto drop;
-	}
-	uip_len = uip_slen + UIP_IPUDPH_LEN;
-
-#if UIP_CONF_IPV6
-	/* For IPv6, the IP length field does not include the IPv6 IP header
-	 length. */
-	BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-	BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-#else /* UIP_CONF_IPV6 */
-	BUF->len[0] = (uip_len >> 8);
-	BUF->len[1] = (uip_len & 0xff);
-#endif /* UIP_CONF_IPV6 */
-
-	BUF->ttl = uip_udp_conn->ttl;
-	BUF->proto = UIP_PROTO_UDP;
-
-	UDPBUF->udplen = HTONS(uip_slen + UIP_UDPH_LEN);
-	UDPBUF->udpchksum = 0;
-
-	BUF->srcport = uip_udp_conn->lport;
-	BUF->destport = uip_udp_conn->rport;
-
-	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
-	uip_ipaddr_copy(BUF->destipaddr, uip_udp_conn->ripaddr);
-    
-	uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPTCPH_LEN];
-
-#if UIP_UDP_CHECKSUMS
-	/* Calculate UDP checksum. */
-	UDPBUF->udpchksum = ~(uip_udpchksum());
-	if(UDPBUF->udpchksum == 0) {
-		UDPBUF->udpchksum = 0xffff;
-	}
-#endif /* UIP_UDP_CHECKSUMS */
-
-	goto ip_send_nolen;
-#endif /* UIP_UDP */
-
-	/* TCP input processing. */
-	tcp_input: UIP_STAT(++uip_stat.tcp.recv);
-
-	/* Start of TCP input header processing code. */
-
-	if (uip_tcpchksum() != 0xffff) { /* Compute and check the TCP
-	 checksum. */
-		UIP_STAT(++uip_stat.tcp.drop); UIP_STAT(++uip_stat.tcp.chkerr); UIP_LOG("tcp: bad checksum.");
-		goto drop;
-	}
-
-	/* Demultiplex this segment. */
-	/* First check any active connections. */
-	for (uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1]; ++uip_connr) {
-		if (uip_connr->tcpstateflags != UIP_CLOSED && BUF->destport
-				== uip_connr->lport && BUF->srcport == uip_connr->rport
-				&& uip_ipaddr_cmp(BUF->srcipaddr, uip_connr->ripaddr)) {
-			goto found;
-		}
-	}
-
-	/* If we didn't find and active connection that expected the packet,
-	 either this packet is an old duplicate, or this is a SYN packet
-	 destined for a connection in LISTEN. If the SYN flag isn't set,
-	 it is an old packet and we send a RST. */
-	if ((BUF->flags & TCP_CTL) != TCP_SYN) {
-		goto reset;
-	}
-
-	tmp16 = BUF->destport;
-	/* Next, check listening connections. */
-	for (c = 0; c < UIP_LISTENPORTS; ++c) {
-		if (tmp16 == uip_listenports[c])
-			goto found_listen;
-	}
-
-	/* No matching connection found, so we send a RST packet. */
-	UIP_STAT(++uip_stat.tcp.synrst);
-	reset:
-
-	/* We do not send resets in response to resets. */
-	if (BUF->flags & TCP_RST) {
-		goto drop;
-	}
-
-	UIP_STAT(++uip_stat.tcp.rst);
-
-	BUF->flags = TCP_RST | TCP_ACK;
-	uip_len = UIP_IPTCPH_LEN;
-	BUF->tcpoffset = 5 << 4;
-
-	/* Flip the seqno and ackno fields in the TCP header. */
-	xtcp_swap_words(BUF->seqno, BUF->ackno);
-
-	/* We also have to increase the sequence number we are
-	 acknowledging. If the least significant byte overflowed, we need
-	 to propagate the carry to the other bytes as well. */
-	xtcp_increment_word(BUF->ackno);
-
-
-	/* Swap port numbers. */
-	tmp16 = BUF->srcport;
-	BUF->srcport = BUF->destport;
-	BUF->destport = tmp16;
-
-	/* Swap IP addresses. */
-	uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
-	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
-
-	/* And send out the RST packet! */
-	goto tcp_send_noconn;
-
-	/* This label will be jumped to if we matched the incoming packet
-	 with a connection in LISTEN. In that case, we should create a new
-	 connection and send a SYNACK in return. */
-	found_listen:
-	/* First we check if there are any connections avaliable. Unused
-	 connections are kept in the same table as used connections, but
-	 unused ones have the tcpstate set to CLOSED. Also, connections in
-	 TIME_WAIT are kept track of and we'll use the oldest one if no
-	 CLOSED connections are found. Thanks to Eddie C. Dost for a very
-	 nice algorithm for the TIME_WAIT search. */
-	uip_connr = 0;
-	for (c = 0; c < UIP_CONNS; ++c) {
-		if (uip_conns[c].tcpstateflags == UIP_CLOSED) {
-			uip_connr = &uip_conns[c];
-			break;
-		}
-		if (uip_conns[c].tcpstateflags == UIP_TIME_WAIT) {
-			if (uip_connr == 0 || uip_conns[c].timer > uip_connr->timer) {
-				uip_connr = &uip_conns[c];
-			}
-		}
-	}
-
-	if (uip_connr == 0) {
-		/* All connections are used already, we drop packet and hope that
-		 the remote end will retransmit the packet at a time when we
-		 have more spare connections. */
-		UIP_STAT(++uip_stat.tcp.syndrop); UIP_LOG("tcp: found no unused connections.");
-		goto drop;
-	}
-	uip_conn = uip_connr;
-
-	/* Fill in the necessary fields for the new connection. */
-	uip_connr->rto = uip_connr->timer = UIP_RTO;
-	uip_connr->sa = 0;
-	uip_connr->sv = 4;
-	uip_connr->nrtx = 0;
-	uip_connr->lport = BUF->destport;
-	uip_connr->rport = BUF->srcport;
-	uip_ipaddr_copy(uip_connr->ripaddr, BUF->srcipaddr);
-	uip_connr->tcpstateflags = UIP_SYN_RCVD;
-
-	xtcp_copy_word(uip_connr->snd_nxt, iss);
-	uip_connr->len = 1;
-
-	/* rcv_nxt should be the seqno from the incoming packet + 1. */
-	xtcp_copy_word(uip_connr->rcv_nxt, BUF->seqno);
-	uip_add_rcv_nxt(1);
-
-	/* Parse the TCP MSS option, if present. */
-	if ((BUF->tcpoffset & 0xf0) > 0x50) {
-		for (c = 0; c < ((BUF->tcpoffset >> 4) - 5) << 2;) {
-			opt = uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + c];
-			if (opt == TCP_OPT_END) {
-				/* End of options. */
-				break;
-			} else if (opt == TCP_OPT_NOOP) {
-				++c;
-				/* NOP option. */
-			} else if (opt == TCP_OPT_MSS && uip_buf[UIP_TCPIP_HLEN
-					+ UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
-				/* An MSS option with the right option length. */
-				tmp16 = ((u16_t) uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c]
-						<< 8) | (u16_t) uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN
-						+ 3 + c];
-				uip_connr->initialmss = uip_connr->mss
-						= tmp16 > UIP_TCP_MSS ? UIP_TCP_MSS : tmp16;
-
-				/* And we are done processing options. */
-				break;
-			} else {
-				/* All other options have a length field, so that we easily
-				 can skip past them. */
-				if (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
-					/* If the length field is zero, the options are malformed
-					 and we don't process them further. */
-					break;
-				}
-				c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
-			}
-		}
-	}
-
-	/* Our response will be a SYNACK. */
-#if UIP_ACTIVE_OPEN
-	tcp_send_synack:
-	BUF->flags = TCP_ACK;
-
-	tcp_send_syn:
-	BUF->flags |= TCP_SYN;
-#else /* UIP_ACTIVE_OPEN */
-	tcp_send_synack: BUF->flags = TCP_SYN | TCP_ACK;
-#endif /* UIP_ACTIVE_OPEN */
-
-	/* We send out the TCP Maximum Segment Size option with our
-	 SYNACK. */
-	BUF->optdata[0] = TCP_OPT_MSS;
-	BUF->optdata[1] = TCP_OPT_MSS_LEN;
-	BUF->optdata[2] = (UIP_TCP_MSS) / 256;
-	BUF->optdata[3] = (UIP_TCP_MSS) & 255;
-	uip_len = UIP_IPTCPH_LEN + TCP_OPT_MSS_LEN;
-	BUF->tcpoffset = ((UIP_TCPH_LEN + TCP_OPT_MSS_LEN) / 4) << 4;
-	goto tcp_send;
-
-	/* This label will be jumped to if we found an active connection. */
-	found: uip_conn = uip_connr;
-	uip_flags = 0;
-	/* We do a very naive form of TCP reset processing; we just accept
-	 any RST and kill our connection. We should in fact check if the
-	 sequence number of this reset is wihtin our advertised window
-	 before we accept the reset. */
-	if (BUF->flags & TCP_RST) {
-		uip_connr->tcpstateflags = UIP_CLOSED;
-		UIP_LOG("tcp: got reset, aborting connection.");
-		uip_flags = UIP_ABORT;
-		UIP_APPCALL();
-		goto drop;
-	}
-	/* Calculated the length of the data, if the application has sent
-	 any data to us. */
-	c = (BUF->tcpoffset >> 4) << 2;
-	/* uip_len will contain the length of the actual TCP data. This is
-	 calculated by subtracing the length of the TCP header (in
-	 c) and the length of the IP header (20 bytes). */
-	uip_len = uip_len - c - UIP_IPH_LEN;
-
-	/* First, check if the sequence number of the incoming packet is
-	 what we're expecting next. If not, we send out an ACK with the
-	 correct numbers in. */
-	if (!(((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_SYN_SENT)
-			&& ((BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)))) {
-		if ((uip_len > 0 || ((BUF->flags & (TCP_SYN | TCP_FIN)) != 0))
-                    && (!xtcp_compare_words(BUF->seqno, uip_connr->rcv_nxt))) {
-			goto tcp_send_ack;
-		}
-	}
-
-	/* Next, check if the incoming segment acknowledges any outstanding
-	 data. If so, we update the sequence number, reset the length of
-	 the outstanding data, calculate RTT estimations, and reset the
-	 retransmission timer. */
-	if ((BUF->flags & TCP_ACK) && uip_outstanding(uip_connr)) {
-               uip_add32(uip_connr->snd_nxt, uip_connr->len);
-#if UIP_SLIDING_WINDOW
-               unsigned int ackno = xtcp_get_word(BUF->ackno);
-               int diff = xtcp_get_word(uip_acc32) - ackno;
-
-               if (diff >= 0 && diff < uip_connr->len)
-#else
-               if ((xtcp_compare_words(BUF->ackno, uip_acc32)))
-#endif
-                  {
-			/* Update sequence number. */
-#if UIP_SLIDING_WINDOW
-                    xtcp_copy_word(uip_connr->snd_nxt, BUF->ackno);
-#else
-                    xtcp_copy_word(uip_connr->snd_nxt, uip_acc32);
-#endif
-
-			/* Do RTT estimation, unless we have done retransmissions. */
-			if (uip_connr->nrtx == 0) {
-				signed char m;
-				m = uip_connr->rto - uip_connr->timer;
-				/* This is taken directly from VJs original code in his paper */
-				m = m - (uip_connr->sa >> 3);
-				uip_connr->sa += m;
-				if (m < 0) {
-					m = -m;
-				}
-				m = m - (uip_connr->sv >> 2);
-				uip_connr->sv += m;
-				uip_connr->rto = (uip_connr->sa >> 3) + uip_connr->sv;
-
-			}
-
-                        /* Set the acknowledged flag. */
-                        uip_flags = UIP_ACKDATA;
-
-			/* Reset the retransmission timer. */
-			uip_connr->timer = uip_connr->rto;
-
-			/* Reset length of outstanding data. */
-#if UIP_SLIDING_WINDOW
-
-
-
-                        uip_connr->midpoint = diff;
-			uip_connr->len = diff;
-
-#else
-			uip_connr->len = 0;
-#endif
-                    }
-
-	}
-
-        if (BUF->flags & TCP_PSH) {
-          uip_flags |= UIP_TCP_PUSH;
-        }
-
-	/* Do different things depending on in what state the connection is. */
-	switch (uip_connr->tcpstateflags & UIP_TS_MASK) {
-	/* CLOSED and LISTEN are not handled here. CLOSE_WAIT is not
-	 implemented, since we force the application to close when the
-	 peer sends a FIN (hence the application goes directly from
-	 ESTABLISHED to LAST_ACK). */
-	case UIP_SYN_RCVD:
-		/* In SYN_RCVD we have sent out a SYNACK in response to a SYN, and
-		 we are waiting for an ACK that acknowledges the data we sent
-		 out the last time. Therefore, we want to have the UIP_ACKDATA
-		 flag set. If so, we enter the ESTABLISHED state. */
-		if (uip_flags & UIP_ACKDATA) {
-			uip_connr->tcpstateflags = UIP_ESTABLISHED;
-			uip_flags = UIP_CONNECTED;
-			uip_connr->len = 0;
-			if (uip_len > 0) {
-				uip_flags |= UIP_NEWDATA;
-				uip_add_rcv_nxt(uip_len);
-			}
-			uip_slen = 0;
-			UIP_APPCALL();
-			goto appsend;
-		}
-		goto drop;
-#if UIP_ACTIVE_OPEN
-		case UIP_SYN_SENT:
-		/* In SYN_SENT, we wait for a SYNACK that is sent in response to
-		 our SYN. The rcv_nxt is set to sequence number in the SYNACK
-		 plus one, and we send an ACK. We move into the ESTABLISHED
-		 state. */
-		if((uip_flags & UIP_ACKDATA) &&
-				(BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)) {
-
-			/* Parse the TCP MSS option, if present. */
-			if((BUF->tcpoffset & 0xf0) > 0x50) {
-				for(c = 0; c < ((BUF->tcpoffset >> 4) - 5) << 2;) {
-					opt = uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + c];
-					if(opt == TCP_OPT_END) {
-						/* End of options. */
-						break;
-					} else if(opt == TCP_OPT_NOOP) {
-						++c;
-						/* NOP option. */
-					} else if(opt == TCP_OPT_MSS &&
-							uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
-						/* An MSS option with the right option length. */
-						tmp16 = (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
-						uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 3 + c];
-						uip_connr->initialmss =
-						uip_connr->mss = tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
-
-						/* And we are done processing options. */
-						break;
-					} else {
-						/* All other options have a length field, so that we easily
-						 can skip past them. */
-						if(uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
-							/* If the length field is zero, the options are malformed
-							 and we don't process them further. */
-							break;
-						}
-						c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
-					}
-				}
-			}
-			uip_connr->tcpstateflags = UIP_ESTABLISHED;
-			xtcp_copy_word(uip_connr->rcv_nxt, BUF->seqno);
-			uip_add_rcv_nxt(1);
-			uip_flags = UIP_CONNECTED | UIP_NEWDATA;
-			uip_connr->len = 0;
-			uip_len = 0;
-			uip_slen = 0;
-			UIP_APPCALL();
-			goto appsend;
-		}
-		/* Inform the application that the connection failed */
-		uip_flags = UIP_ABORT;
-		UIP_APPCALL();
-		/* The connection is closed after we send the RST */
-		uip_conn->tcpstateflags = UIP_CLOSED;
-		goto reset;
-#endif /* UIP_ACTIVE_OPEN */
-
-	case UIP_ESTABLISHED:
-		/* In the ESTABLISHED state, we call upon the application to feed
-		 data into the uip_buf. If the UIP_ACKDATA flag is set, the
-		 application should put new data into the buffer, otherwise we are
-		 retransmitting an old segment, and the application should put that
-		 data into the buffer.
-
-		 If the incoming packet is a FIN, we should close the connection on
-		 this side as well, and we send out a FIN and enter the LAST_ACK
-		 state. We require that there is no outstanding data; otherwise the
-		 sequence numbers will be screwed up. */
-
-		if (BUF->flags & TCP_FIN && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
-			if (uip_outstanding(uip_connr)) {
-				goto drop;
-			}
-			uip_add_rcv_nxt(1 + uip_len);
-			uip_flags |= UIP_CLOSE;
-			if (uip_len > 0) {
-				uip_flags |= UIP_NEWDATA;
-			}
-			UIP_APPCALL();
-			uip_connr->len = 1;
-			uip_connr->tcpstateflags = UIP_LAST_ACK;
-			uip_connr->nrtx = 0;
-			tcp_send_finack: BUF->flags = TCP_FIN | TCP_ACK;
-			goto tcp_send_nodata;
-		}
-
-		/* Check the URG flag. If this is set, the segment carries urgent
-		 data that we must pass to the application. */
-		if ((BUF->flags & TCP_URG) != 0) {
-#if UIP_URGDATA > 0
-			uip_urglen = (BUF->urgp[0] << 8) | BUF->urgp[1];
-			if(uip_urglen > uip_len) {
-				/* There is more urgent data in the next segment to come. */
-				uip_urglen = uip_len;
-			}
-			uip_add_rcv_nxt(uip_urglen);
-			uip_len -= uip_urglen;
-			uip_urgdata = uip_appdata;
-			uip_appdata += uip_urglen;
-		} else {
-			uip_urglen = 0;
-#else /* UIP_URGDATA > 0 */
-			uip_appdata = ((char *) uip_appdata) + ((BUF->urgp[0] << 8)
-					| BUF->urgp[1]);
-			uip_len -= (BUF->urgp[0] << 8) | BUF->urgp[1];
-#endif /* UIP_URGDATA > 0 */
-		}
-
-		/* If uip_len > 0 we have TCP data in the packet, and we flag this
-		 by setting the UIP_NEWDATA flag and update the sequence number
-		 we acknowledge. If the application has stopped the dataflow
-		 using uip_stop(), we must not accept any data packets from the
-		 remote host. */
-		if (uip_len > 0
-                    #ifndef UIP_ACCEPT_PACKETS_AFTER_PAUSE
-                    && !(uip_connr->tcpstateflags & UIP_STOPPED)
-                    #endif
-                    ) {
-			uip_flags |= UIP_NEWDATA;
-			uip_add_rcv_nxt(uip_len);
-		}
-
-		/* Check if the available buffer space advertised by the other end
-		 is smaller than the initial MSS for this connection. If so, we
-		 set the current MSS to the window size to ensure that the
-		 application does not send more data than the other end can
-		 handle.
-
-		 If the remote host advertises a zero window, we set the MSS to
-		 the initial MSS so that the application will send an entire MSS
-		 of data. This data will not be acknowledged by the receiver,
-		 and the application will retransmit it. This is called the
-		 "persistent timer" and uses the retransmission mechanim.
-		 */
-		tmp16 = ((u16_t)BUF->wnd[0] << 8) + (u16_t)BUF->wnd[1];
-		if (tmp16 > uip_connr->initialmss || tmp16 == 0) {
-			tmp16 = uip_connr->initialmss;
-		}
-		uip_connr->mss = tmp16;
-
-		/* If this packet constitutes an ACK for outstanding data (flagged
-		 by the UIP_ACKDATA flag, we should call the application since it
-		 might want to send more data. If the incoming packet had data
-		 from the peer (as flagged by the UIP_NEWDATA flag), the
-		 application must also be notified.
-
-		 When the application is called, the global variable uip_len
-		 contains the length of the incoming data. The application can
-		 access the incoming data through the global pointer
-		 uip_appdata, which usually points UIP_IPTCPH_LEN + UIP_LLH_LEN
-		 bytes into the uip_buf array.
-
-		 If the application wishes to send any data, this data should be
-		 put into the uip_appdata and the length of the data should be
-		 put into uip_len. If the application don't have any data to
-		 send, uip_len must be set to 0. */
-		if (uip_flags & (UIP_NEWDATA | UIP_ACKDATA)) {
-			uip_slen = 0;
-			UIP_APPCALL();
-
-			appsend:
-
-			if (uip_flags & UIP_ABORT) {
-				uip_slen = 0;
-				uip_connr->tcpstateflags = UIP_CLOSED;
-				BUF->flags = TCP_RST | TCP_ACK;
-				goto tcp_send_nodata;
-			}
-
-			if (uip_flags & UIP_CLOSE) {
-				uip_slen = 0;
-				uip_connr->len = 1;
-				uip_connr->tcpstateflags = UIP_FIN_WAIT_1;
-				uip_connr->nrtx = 0;
-				BUF->flags = TCP_FIN | TCP_ACK;
-				goto tcp_send_nodata;
-			}
-
-
-                        uip_connr->nrtx = 0;
-
-			/* If uip_slen > 0, the application has data to be sent. */
-			if (uip_slen > 0) {
-
-#if UIP_SLIDING_WINDOW
-                          if (uip_connr->midpoint) {
-                            uip_do_split = 0;
-                            uip_connr->len += uip_slen;
-                            uip_len = uip_slen + UIP_TCPIP_HLEN;
-                            BUF->flags = TCP_ACK | TCP_PSH;
-                            goto tcp_send_noopts;
-                          }
-                          else {
-                            /* Decide whether to split this packet and record the fact in the connection data */
-                            uip_do_split = (uip_slen > ACTUAL_UIP_PACKET_SPLIT_THRESHOLD);
-                            uip_connr->midpoint = 0;
-                          }
-#endif
-				/* If the connection has acknowledged data, the contents of
-				 the ->len variable should be discarded. */
-				if ((uip_flags & UIP_ACKDATA) != 0) {
-					uip_connr->len = 0;
-				}
-
-				/* If the ->len variable is non-zero the connection has
-				 already data in transit and cannot send anymore right
-				 now. */
-
-				if (uip_connr->len == 0) {
-
-					/* The application cannot send more than what is allowed by
-					 the mss (the minumum of the MSS and the available
-					 window). */
-					if (uip_slen > uip_connr->mss) {
-						uip_slen = uip_connr->mss;
-					}
-
-					/* Remember how much data we send out now so that we know
-					 when everything has been acknowledged. */
-    					  uip_connr->len = uip_slen;
-
-				} else {
-
-					/* If the application already had unacknowledged data, we
-					 make sure that the application does not send (i.e.,
-					 retransmit) out more than it previously sent out. */
-
-                                  uip_slen = uip_connr->len;
-
-				}
-
-			}
-
-
-
-			apprexmit: uip_appdata = uip_sappdata;
-
-			/* If the application has data to be sent, or if the incoming
-			 packet had new data in it, we must send out a packet. */
-			if (uip_slen > 0 && uip_connr->len > 0) {
-				/* Add the length of the IP and TCP headers. */
-				uip_len = uip_connr->len + UIP_TCPIP_HLEN;
-				/* We always set the ACK flag in response packets. */
-				BUF->flags = TCP_ACK | TCP_PSH;
-				/* Send the packet. */
-				goto tcp_send_noopts;
-			}
-			/* If there is no data to send, just send out a pure ACK if
-			 there is newdata. */
-			if (uip_flags & UIP_NEWDATA) {
-				uip_len = UIP_TCPIP_HLEN;
-				BUF->flags = TCP_ACK;
-				goto tcp_send_noopts;
-			}
-		}
-		goto drop;
-	case UIP_LAST_ACK:
-		/* We can close this connection if the peer has acknowledged our
-		 FIN. This is indicated by the UIP_ACKDATA flag. */
-		if (uip_flags & UIP_ACKDATA) {
-			uip_connr->tcpstateflags = UIP_CLOSED;
-			uip_flags = UIP_CLOSE;
-			UIP_APPCALL();
-		}
-		break;
-
-	case UIP_FIN_WAIT_1:
-		/* The application has closed the connection, but the remote host
-		 hasn't closed its end yet. Thus we do nothing but wait for a
-		 FIN from the other side. */
-		if (uip_len > 0) {
-			uip_add_rcv_nxt(uip_len);
-		}
-		if (BUF->flags & TCP_FIN) {
-			if (uip_flags & UIP_ACKDATA) {
-				uip_connr->tcpstateflags = UIP_TIME_WAIT;
-				uip_connr->timer = 0;
-				uip_connr->len = 0;
-			} else {
-				uip_connr->tcpstateflags = UIP_CLOSING;
-			}
-			uip_add_rcv_nxt(1);
-			uip_flags = UIP_CLOSE;
-			UIP_APPCALL();
-			goto tcp_send_ack;
-		} else if (uip_flags & UIP_ACKDATA) {
-			uip_connr->tcpstateflags = UIP_FIN_WAIT_2;
-			uip_connr->len = 0;
-			goto drop;
-		}
-		if (uip_len > 0) {
-			goto tcp_send_ack;
-		}
-		goto drop;
-
-	case UIP_FIN_WAIT_2:
-		if (uip_len > 0) {
-			uip_add_rcv_nxt(uip_len);
-		}
-		if (BUF->flags & TCP_FIN) {
-			uip_connr->tcpstateflags = UIP_TIME_WAIT;
-			uip_connr->timer = 0;
-			uip_add_rcv_nxt(1);
-			uip_flags = UIP_CLOSE;
-			UIP_APPCALL();
-			goto tcp_send_ack;
-		}
-		if (uip_len > 0) {
-			goto tcp_send_ack;
-		}
-		goto drop;
-
-	case UIP_TIME_WAIT:
-		goto tcp_send_ack;
-
-	case UIP_CLOSING:
-		if (uip_flags & UIP_ACKDATA) {
-			uip_connr->tcpstateflags = UIP_TIME_WAIT;
-			uip_connr->timer = 0;
-		}
-	}
-	goto drop;
-
-	/* We jump here when we are ready to send the packet, and just want
-	 to set the appropriate TCP sequence numbers in the TCP header. */
-	tcp_send_ack: BUF->flags = TCP_ACK;
-	tcp_send_nodata: uip_len = UIP_IPTCPH_LEN;
-	tcp_send_noopts: BUF->tcpoffset = (UIP_TCPH_LEN / 4) << 4;
-	tcp_send:
-	/* We're done with the input processing. We are now ready to send a
-	 reply. Our job is to fill in all the fields of the TCP and IP
-	 headers before calculating the checksum and finally send the
-	 packet. */
-	xtcp_copy_word(BUF->ackno, uip_connr->rcv_nxt);
-
-	xtcp_copy_word(BUF->seqno, uip_connr->snd_nxt);
-#if UIP_SLIDING_WINDOW
-        if (uip_connr->midpoint && uip_slen) {
-          uip_add32(BUF->seqno, uip_connr->midpoint);
-          xtcp_copy_word(BUF->seqno, uip_acc32);
-          uip_connr->midpoint = 0;
-        }
-        else if (!uip_do_split && uip_slen) {
-          // This case means we have only sent a half packet, we can send more
-          // if needed
-          uip_connr->midpoint = uip_slen;
-          // A call up to the xtcp stack to initiate a new send request
-          xtcpd_init_send_from_uip(uip_connr);
-        }
-#endif
-	BUF->proto = UIP_PROTO_TCP;
-
-	BUF->srcport = uip_connr->lport;
-	BUF->destport = uip_connr->rport;
-
-	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
-	uip_ipaddr_copy(BUF->destipaddr, uip_connr->ripaddr);
-
-	if (uip_connr->tcpstateflags & UIP_STOPPED) {
-		/* If the connection has issued uip_stop(), we advertise a zero
-		 window so that the remote host will stop sending data. */
-		BUF->wnd[0] = BUF->wnd[1] = 0;
-	} else {
-		BUF->wnd[0] = ((UIP_RECEIVE_WINDOW) >> 8);
-		BUF->wnd[1] = ((UIP_RECEIVE_WINDOW) & 0xff);
-	}
-
-	tcp_send_noconn: BUF->ttl = UIP_TTL;
-#if UIP_CONF_IPV6
-	/* For IPv6, the IP length field does not include the IPv6 IP header
-	 length. */
-	BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
-	BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
-#else /* UIP_CONF_IPV6 */
-	BUF->len[0] = (uip_len >> 8);
-	BUF->len[1] = (uip_len & 0xff);
-#endif /* UIP_CONF_IPV6 */
-
-	BUF->urgp[0] = BUF->urgp[1] = 0;
-
-	/* The TCP checksum is calculated later, in the uip_split_output function */
-
-	ip_send_nolen:
-
-#if UIP_CONF_IPV6
-	BUF->vtc = 0x60;
-	BUF->tcflow = 0x00;
-	BUF->flow = 0x00;
-#else /* UIP_CONF_IPV6 */
-	BUF->vhl = 0x45;
-	BUF->tos = 0;
-	BUF->ipoffset[0] = BUF->ipoffset[1] = 0;
-	++ipid;
-	BUF->ipid[0] = ipid >> 8;
-	BUF->ipid[1] = ipid & 0xff;
-	/* Calculate IP checksum. */
-	BUF->ipchksum = 0;
-	BUF->ipchksum = ~(uip_ipchksum());
-	DEBUG_PRINTF("uip ip_send_nolen: chkecum 0x%04x\n", uip_ipchksum());
-#endif /* UIP_CONF_IPV6 */
-
-	UIP_STAT(++uip_stat.tcp.sent);
-	send: DEBUG_PRINTF("Sending packet with length %d (%d)\n", uip_len,
-			(BUF->len[0] << 8) | BUF->len[1]);
-
-	UIP_STAT(++uip_stat.ip.sent);
-	/* Return and let the caller do the actual transmission. */
-	uip_flags = 0;
-	return;
-	drop: uip_len = 0;
-	uip_flags = 0;
-	return;
-}
-/*---------------------------------------------------------------------------*/
-u16_t htons(u16_t val) {
-	return HTONS(val);
-}
-/*---------------------------------------------------------------------------*/
-void uip_send(const void *data, int len) {
-	if (len > 0) {
-		uip_slen = len;
-		if (data != uip_sappdata) {
-			memcpy(uip_sappdata, (data), uip_slen);
-		}
-	}
-}
-/** @} */
+// Copyright (c) 2011, XMOS Ltd, All rights reserved
+// This software is freely distributable under a derivative of the
+// University of Illinois/NCSA Open Source License posted in
+// LICENSE.txt and at <http://github.xcore.com/>
+
+
+#define DEBUG_PRINTF(...) /*printf(__VA_ARGS__)*/
+
+/**
+ * \defgroup uip The uIP TCP/IP stack
+ * @{
+ *
+ * uIP is an implementation of the TCP/IP protocol stack intended for
+ * small 8-bit and 16-bit microcontrollers.
+ *
+ * uIP provides the necessary protocols for Internet communication,
+ * with a very small code footprint and RAM requirements - the uIP
+ * code size is on the order of a few kilobytes and RAM usage is on
+ * the order of a few hundred bytes.
+ */
+
+/**
+ * The uIP TCP/IP stack code.
+ * \author Adam Dunkels <adam@dunkels.com>
+ */
+
+/*
+ * Copyright (c) 2001-2003, Adam Dunkels.
+ * 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 uIP TCP/IP stack.
+ *
+ * $Id: uip.c,v 1.65 2006/06/11 21:46:39 adam Exp $
+ *
+ */
+
+/*
+ * uIP is a small implementation of the IP, UDP and TCP protocols (as
+ * well as some basic ICMP stuff). The implementation couples the IP,
+ * UDP, TCP and the application layers very tightly. To keep the size
+ * of the compiled code down, this code frequently uses the goto
+ * statement. While it would be possible to break the uip_process()
+ * function into many smaller functions, this would increase the code
+ * size because of the overhead of parameter passing and the fact that
+ * the optimier would not be as efficient.
+ *
+ * The principle is that we have a small buffer, called the uip_buf,
+ * in which the device driver puts an incoming packet. The TCP/IP
+ * stack parses the headers in the packet, and calls the
+ * application. If the remote host has sent data to the application,
+ * this data is present in the uip_buf and the application read the
+ * data from there. It is up to the application to put this data into
+ * a byte stream if needed. The application will not be fed with data
+ * that is out of sequence.
+ *
+ * If the application whishes to send data to the peer, it should put
+ * its data into the uip_buf. The uip_appdata pointer points to the
+ * first available byte. The TCP/IP stack will calculate the
+ * checksums, and fill in the necessary header fields and finally send
+ * the packet back to the peer.
+ */
+
+#include "uip.h"
+#include "uipopt.h"
+#include "uip_arch.h"
+#include <print.h>
+
+#include <xclib.h>
+
+
+#if UIP_CONF_IPV6
+#include "uip-neighbor.h"
+#endif /* UIP_CONF_IPV6 */
+
+#if UIP_IGMP
+#include "igmp.h"
+#endif
+#include <string.h>
+#define ACTUAL_UIP_PACKET_SPLIT_THRESHOLD (UIP_PACKET_SPLIT_THRESHOLD > 4 ? UIP_PACKET_SPLIT_THRESHOLD : 4)
+/*---------------------------------------------------------------------------*/
+/* Variable definitions. */
+
+/* The IP address of this host. If it is defined to be fixed (by
+ setting UIP_FIXEDADDR to 1 in uipopt.h), the address is set
+ here. Otherwise, the address */
+#if UIP_FIXEDADDR > 0
+const uip_ipaddr_t uip_hostaddr =
+{	HTONS((UIP_IPADDR0 << 8) | UIP_IPADDR1),
+	HTONS((UIP_IPADDR2 << 8) | UIP_IPADDR3)};
+const uip_ipaddr_t uip_draddr =
+{	HTONS((UIP_DRIPADDR0 << 8) | UIP_DRIPADDR1),
+	HTONS((UIP_DRIPADDR2 << 8) | UIP_DRIPADDR3)};
+const uip_ipaddr_t uip_netmask =
+{	HTONS((UIP_NETMASK0 << 8) | UIP_NETMASK1),
+	HTONS((UIP_NETMASK2 << 8) | UIP_NETMASK3)};
+#else
+uip_ipaddr_t uip_hostaddr, uip_draddr, uip_netmask;
+#endif /* UIP_FIXEDADDR */
+
+static const uip_ipaddr_t all_ones_addr =
+#if UIP_CONF_IPV6
+		{	0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff,0xffff};
+#else /* UIP_CONF_IPV6 */
+		{ 0xffff, 0xffff };
+#endif /* UIP_CONF_IPV6 */
+static const uip_ipaddr_t all_zeroes_addr =
+#if UIP_CONF_IPV6
+		{	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000};
+#else /* UIP_CONF_IPV6 */
+		{ 0x0000, 0x0000 };
+#endif /* UIP_CONF_IPV6 */
+
+#if UIP_FIXEDETHADDR
+const struct uip_eth_addr uip_ethaddr = { {UIP_ETHADDR0,
+		UIP_ETHADDR1,
+		UIP_ETHADDR2,
+		UIP_ETHADDR3,
+		UIP_ETHADDR4,
+		UIP_ETHADDR5}};
+#else
+struct uip_eth_addr uip_ethaddr = { { 0, 0, 0, 0, 0, 0 } };
+#endif
+
+#ifndef UIP_CONF_EXTERNAL_BUFFER
+u8_t uip_buf[UIP_BUFSIZE + 2]; /* The packet buffer that contains
+ incoming packets. */
+#endif /* UIP_CONF_EXTERNAL_BUFFER */
+
+void *uip_appdata; /* The uip_appdata pointer points to
+ application data. */
+void *uip_sappdata; /* The uip_appdata pointer points to
+ the application data which is to
+ be sent. */
+#if UIP_URGDATA > 0
+void *uip_urgdata; /* The uip_urgdata pointer points to
+ urgent data (out-of-band data), if
+ present. */
+u16_t uip_urglen, uip_surglen;
+#endif /* UIP_URGDATA > 0 */
+
+u16_t uip_len, uip_slen;
+/* The uip_len is either 8 or 16 bits,
+ depending on the maximum packet
+ size. */
+
+#if UIP_SLIDING_WINDOW
+int uip_do_split;
+#endif
+
+u32_t uip_flags; /* The uip_flags variable is used for
+ communication between the TCP/IP stack
+ and the application program. */
+struct uip_conn *uip_conn; /* uip_conn always points to the current
+ connection. */
+
+struct uip_conn uip_conns[UIP_CONNS];
+/* The uip_conns array holds all TCP
+ connections. */
+u16_t uip_listenports[UIP_LISTENPORTS];
+/* The uip_listenports list all currently
+ listning ports. */
+
+u16_t uip_udp_listenports[UIP_LISTENPORTS];
+/* The uip_listenports list all currently
+ listning ports. */
+#if UIP_UDP
+struct uip_udp_conn *uip_udp_conn;
+struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
+#endif /* UIP_UDP */
+
+// local network address
+static uip_ipaddr_t subnetaddr = { 0xffff, 0xffff };
+
+void uip_setsubnetaddr(void)
+{
+	uip_ipaddr_t newmask;
+
+	newmask[0]=~uip_netmask[0];
+	newmask[1]=~uip_netmask[1];
+
+	subnetaddr[0]=uip_hostaddr[0]|newmask[0];
+	subnetaddr[1]=uip_hostaddr[1]|newmask[1];
+}
+
+static u16_t ipid; /* Ths ipid variable is an increasing
+ number that is used for the IP ID
+ field. */
+
+void uip_setipid(u16_t id) {
+	ipid = id;
+}
+
+static u8_t iss[4]; /* The iss variable is used for the TCP
+ initial sequence number. */
+
+#if UIP_ACTIVE_OPEN
+static u16_t lastport; /* Keeps track of the last port used for
+ a new connection. */
+#endif /* UIP_ACTIVE_OPEN */
+
+/* Temporary variables. */
+u8_t uip_acc32[4];
+static u8_t c, opt;
+static u16_t tmp16;
+
+/* Structures and definitions. */
+#define TCP_FIN 0x01
+#define TCP_SYN 0x02
+#define TCP_RST 0x04
+#define TCP_PSH 0x08
+#define TCP_ACK 0x10
+#define TCP_URG 0x20
+#define TCP_CTL 0x3f
+
+#define TCP_OPT_END     0   /* End of TCP options list */
+#define TCP_OPT_NOOP    1   /* "No-operation" TCP option */
+#define TCP_OPT_MSS     2   /* Maximum segment size TCP option */
+
+#define TCP_OPT_MSS_LEN 4   /* Length of TCP MSS option. */
+
+#define ICMP_ECHO_REPLY 0
+#define ICMP_ECHO       8
+
+#define ICMP6_ECHO_REPLY             129
+#define ICMP6_ECHO                   128
+#define ICMP6_NEIGHBOR_SOLICITATION  135
+#define ICMP6_NEIGHBOR_ADVERTISEMENT 136
+
+#define ICMP6_FLAG_S (1 << 6)
+
+#define ICMP6_OPTION_SOURCE_LINK_ADDRESS 1
+#define ICMP6_OPTION_TARGET_LINK_ADDRESS 2
+
+/* Macros. */
+#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
+#define FBUF ((struct uip_tcpip_hdr *)&uip_reassbuf[0])
+#define ICMPBUF ((struct uip_icmpip_hdr *)&uip_buf[UIP_LLH_LEN])
+#define UDPBUF ((struct uip_udpip_hdr *)&uip_buf[UIP_LLH_LEN])
+
+#if UIP_STATISTICS == 1
+struct uip_stats uip_stat;
+#define UIP_STAT(s) s
+#else
+#define UIP_STAT(s)
+#endif /* UIP_STATISTICS == 1 */
+
+#if UIP_LOGGING == 1
+#include <stdio.h>
+void uip_log(char *msg);
+#define UIP_LOG(m) uip_log(m)
+#else
+#define UIP_LOG(m)
+#endif /* UIP_LOGGING == 1 */
+
+
+
+
+/* Useful operations on 4-byte words misaligned by 2 */
+
+static void xtcp_swap_words(u8_t* a, u8_t* b)
+{
+	short c;
+
+	c = *(short*)(&a[0]);
+	*(short*)(&a[0]) = *(short*)(&b[0]);
+	*(short*)(&b[0]) = (short)c;
+
+	c = *(short*)(&a[2]);
+	*(short*)(&a[2]) = *(short*)(&b[2]);
+	*(short*)(&b[2]) = (short)c;
+}
+
+static void xtcp_increment_word(u8_t* a)
+{
+	unsigned s = ((*(short*)(&a[2])) << 16) + *(short*)(&a[0]);
+	s = byterev(byterev(s)+1);
+	*(short*)(&a[0]) = (short)s;
+	*(short*)(&BUF->ackno[2]) = (short)(s >> 16);
+}
+
+__attribute__ ((noinline))
+void xtcp_copy_word(u8_t*d, u8_t* s)
+{
+	*(short*)(&d[0]) = *(short*)(&s[0]);
+	*(short*)(&d[2]) = *(short*)(&s[2]);
+}
+
+__attribute__ ((noinline))
+static int xtcp_compare_words(const u8_t* a, const u8_t* b)
+{
+	return (*(short*)(&a[0]) == *(short*)(&b[0])) &&
+		   (*(short*)(&a[2]) == *(short*)(&b[2]));
+}
+
+
+
+#if UIP_SLIDING_WINDOW
+static int xtcp_get_word(const u8_t *a) {
+  unsigned int aw = ((*(unsigned short*)(&a[2])) << 16) + *(unsigned short*)(&a[0]);
+  return byterev(aw);
+}
+
+/*static void xtcp_put_word(const u8_t *a, unsigned int s) {
+  *(short*)(&a[0]) = (short)s;
+  *(short*)(&a[2]) = (short)(s >> 16);
+  }*/
+
+#endif
+
+__attribute__ ((noinline))
+void uip_add32(u8_t *op32, u16_t op16) {
+	  unsigned int *res = (unsigned int *)uip_acc32;
+	  unsigned int x = ((*(unsigned short*)(&op32[2])) << 16) + *(unsigned short*)(&op32[0]);
+	  x = byterev(x);
+	  *res = byterev(x + op16);
+}
+
+
+
+void uip_ipaddr_copy(void *dest, const void *src)
+{
+	xtcp_copy_word((u8_t*)dest, (u8_t*)src);
+}
+
+int uip_ipaddr_cmp(const void *addr1, const void *addr2)
+{
+    return xtcp_compare_words(addr1, addr2);
+}
+
+
+/* Alternative faster checksum computation */
+
+static int onesReduce(unsigned int sum, int carry) {
+    sum = (sum & 0xffff) + (sum >> 16) + carry;
+    return (sum & 0xffff) + (sum >> 16);
+}
+
+static u16_t chksum(u16_t sum, const u8_t *byte_data, u16_t lengthInBytes) {
+    int i;
+    short* data = (short*)byte_data;
+    unsigned s = sum;
+    for(i = 0; i < (lengthInBytes>>1); i++) {
+        s += byterev(data[i]) >> 16;
+    }
+    if (lengthInBytes & 1) {
+        s += byte_data[2*i] << 8;
+    }
+    sum = onesReduce(s, 0);
+    return sum;
+}
+
+
+/*---------------------------------------------------------------------------*/
+u16_t uip_chksum(u16_t *data, u16_t len) {
+	return htons(chksum(0, (u8_t *) data, len));
+}
+/*---------------------------------------------------------------------------*/
+#ifndef UIP_ARCH_IPCHKSUM
+u16_t uip_ipchksum(void) {
+	u16_t sum;
+
+	sum = chksum(0, &uip_buf[UIP_LLH_LEN], UIP_IPH_LEN);
+	DEBUG_PRINTF("uip_ipchksum: sum 0x%04x\n", sum);
+	return (sum == 0) ? 0xffff : htons(sum);
+}
+#endif
+/*---------------------------------------------------------------------------*/
+static u16_t upper_layer_chksum(u8_t proto) {
+	u16_t upper_layer_len;
+	u16_t sum;
+
+#if UIP_CONF_IPV6
+	upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
+#else /* UIP_CONF_IPV6 */
+	upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
+#endif /* UIP_CONF_IPV6 */
+
+	/* First sum pseudoheader. */
+
+	/* IP protocol and length fields. This addition cannot carry. */
+	sum = upper_layer_len + proto;
+	/* Sum IP source and destination addresses. */
+	sum = chksum(sum, (u8_t *) &BUF->srcipaddr[0], 2 * sizeof(uip_ipaddr_t));
+
+	/* Sum TCP header and data. */
+	sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN], upper_layer_len);
+
+	return (sum == 0) ? 0xffff : htons(sum);
+}
+/*---------------------------------------------------------------------------*/
+#if UIP_CONF_IPV6
+u16_t
+uip_icmp6chksum(void)
+{
+	return upper_layer_chksum(UIP_PROTO_ICMP6);
+
+}
+#endif /* UIP_CONF_IPV6 */
+/*---------------------------------------------------------------------------*/
+u16_t uip_tcpchksum(void) {
+	return upper_layer_chksum(UIP_PROTO_TCP);
+}
+/*---------------------------------------------------------------------------*/
+#if UIP_UDP_CHECKSUMS
+u16_t
+uip_udpchksum(void)
+{
+	return upper_layer_chksum(UIP_PROTO_UDP);
+}
+#endif /* UIP_UDP_CHECKSUMS */
+
+/*---------------------------------------------------------------------------*/
+void uip_init(void) {
+	memset(uip_listenports, 0, sizeof(uip_listenports));
+	memset(uip_udp_listenports, 0, sizeof(uip_listenports));
+	memset(uip_conns, 0, sizeof(uip_conns));
+#if UIP_ACTIVE_OPEN
+	lastport = 1024;
+#endif /* UIP_ACTIVE_OPEN */
+
+#if UIP_UDP
+	memset(uip_udp_conns, 0, sizeof(uip_udp_conns));
+#endif /* UIP_UDP */
+}
+
+/*---------------------------------------------------------------------------*/
+#if UIP_ACTIVE_OPEN
+struct uip_conn *
+uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
+{
+	register struct uip_conn *conn, *cconn;
+
+	/* Find an unused local port. */
+	again:
+	++lastport;
+
+	if(lastport >= 32000) {
+		lastport = 4096;
+	}
+
+	/* Check if this port is already in use, and if so try to find another one. */
+	for(c = 0; c < UIP_CONNS; ++c) {
+		conn = &uip_conns[c];
+		if(conn->tcpstateflags != UIP_CLOSED &&
+				conn->lport == htons(lastport)) {
+			goto again;
+		}
+	}
+
+	conn = 0;
+	for(c = 0; c < UIP_CONNS; ++c) {
+		cconn = &uip_conns[c];
+		if(cconn->tcpstateflags == UIP_CLOSED) {
+			conn = cconn;
+			break;
+		}
+		if(cconn->tcpstateflags == UIP_TIME_WAIT) {
+			if(conn == 0 ||
+					cconn->timer > conn->timer) {
+				conn = cconn;
+			}
+		}
+	}
+
+	if(conn == 0) {
+		// max tcp connections reached
+		return 0;
+	}
+
+	conn->tcpstateflags = UIP_SYN_SENT;
+
+	conn->snd_nxt[0] = iss[0];
+	conn->snd_nxt[1] = iss[1];
+	conn->snd_nxt[2] = iss[2];
+	conn->snd_nxt[3] = iss[3];
+
+	conn->initialmss = conn->mss = UIP_TCP_MSS;
+
+	conn->len = 1; /* TCP length of the SYN is one. */
+	conn->nrtx = 0;
+	conn->timer = 1; /* Send the SYN next time around. */
+	conn->rto = UIP_RTO;
+	conn->sa = 0;
+	conn->sv = 16; /* Initial value of the RTT variance. */
+	conn->lport = htons(lastport);
+	conn->rport = rport;
+	uip_ipaddr_copy(&conn->ripaddr, ripaddr);
+#if UIP_SLIDING_WINDOW
+        conn->midpoint = 0;
+#endif
+	return conn;
+}
+#endif /* UIP_ACTIVE_OPEN */
+/*---------------------------------------------------------------------------*/
+#if UIP_UDP
+struct uip_udp_conn *
+uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport)
+{
+	register struct uip_udp_conn *conn;
+
+	/* Find an unused local port. */
+	again:
+	++lastport;
+
+	if(lastport >= 32000) {
+		lastport = 4096;
+	}
+
+	for(c = 0; c < UIP_UDP_CONNS; ++c) {
+		if(uip_udp_conns[c].lport == htons(lastport)) {
+			goto again;
+		}
+	}
+
+	conn = 0;
+	for(c = 0; c < UIP_UDP_CONNS; ++c) {
+		if(uip_udp_conns[c].lport == 0) {
+			conn = &uip_udp_conns[c];
+			break;
+		}
+	}
+
+	if(conn == 0) {
+		return 0;
+	}
+
+	conn->lport = HTONS(lastport);
+	conn->rport = rport;
+
+	if(ripaddr == NULL) {
+		memset(conn->ripaddr, 0, sizeof(uip_ipaddr_t));
+	} else {
+		uip_ipaddr_copy(&conn->ripaddr, ripaddr);
+	}
+	conn->ttl = UIP_TTL;
+	conn->udpflags = 0;
+	return conn;
+}
+#endif /* UIP_UDP */
+/*---------------------------------------------------------------------------*/
+void uip_unlisten(u16_t port) {
+	for (c = 0; c < UIP_LISTENPORTS; ++c) {
+		if (uip_listenports[c] == port) {
+			uip_listenports[c] = 0;
+			return;
+		}
+	}
+}
+
+void uip_udp_unlisten(u16_t port) {
+	for (c = 0; c < UIP_LISTENPORTS; ++c) {
+		if (uip_udp_listenports[c] == port) {
+			uip_udp_listenports[c] = 0;
+			return;
+		}
+	}
+}
+/*---------------------------------------------------------------------------*/
+void uip_listen(u16_t port) {
+	for (c = 0; c < UIP_LISTENPORTS; ++c) {
+		if (uip_listenports[c] == 0) {
+			uip_listenports[c] = port;
+			return;
+		}
+	}
+}
+
+void uip_udp_listen(u16_t port) {
+	for (c = 0; c < UIP_LISTENPORTS; ++c) {
+		if (uip_udp_listenports[c] == 0) {
+			uip_udp_listenports[c] = port;
+			return;
+		}
+	}
+}
+
+/*---------------------------------------------------------------------------*/
+/* XXX: IP fragment reassembly: not well-tested. */
+
+#if UIP_REASSEMBLY && !UIP_CONF_IPV6
+#define UIP_REASS_BUFSIZE (UIP_BUFSIZE - UIP_LLH_LEN)
+static u8_t uip_reassbuf[UIP_REASS_BUFSIZE];
+static u8_t uip_reassbitmap[UIP_REASS_BUFSIZE / (8 * 8)];
+static const u8_t bitmap_bits[8] = {0xff, 0x7f, 0x3f, 0x1f,
+	0x0f, 0x07, 0x03, 0x01};
+static u16_t uip_reasslen;
+static u8_t uip_reassflags;
+#define UIP_REASS_FLAG_LASTFRAG 0x01
+static u8_t uip_reasstmr;
+
+#define IP_MF   0x20
+
+static u8_t
+uip_reass(void)
+{
+	u16_t offset, len;
+	u16_t i;
+
+	/* 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(uip_reasstmr == 0) {
+		memcpy(uip_reassbuf, &BUF->vhl, UIP_IPH_LEN);
+		uip_reasstmr = UIP_REASS_MAXAGE;
+		uip_reassflags = 0;
+		/* Clear the bitmap. */
+		memset(uip_reassbitmap, 0, sizeof(uip_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(BUF->srcipaddr[0] == FBUF->srcipaddr[0] &&
+			BUF->srcipaddr[1] == FBUF->srcipaddr[1] &&
+			BUF->destipaddr[0] == FBUF->destipaddr[0] &&
+			BUF->destipaddr[1] == FBUF->destipaddr[1] &&
+			BUF->ipid[0] == FBUF->ipid[0] &&
+			BUF->ipid[1] == FBUF->ipid[1]) {
+
+		len = (BUF->len[0] << 8) + BUF->len[1] - (BUF->vhl & 0x0f) * 4;
+		offset = (((BUF->ipoffset[0] & 0x3f) << 8) + BUF->ipoffset[1]) * 8;
+
+		/* If the offset or the offset + fragment length overflows the
+		 reassembly buffer, we discard the entire packet. */
+		if(offset > UIP_REASS_BUFSIZE ||
+				offset + len > UIP_REASS_BUFSIZE) {
+			uip_reasstmr = 0;
+			goto nullreturn;
+		}
+
+		/* Copy the fragment into the reassembly buffer, at the right
+		 offset. */
+		memcpy(&uip_reassbuf[UIP_IPH_LEN + offset],
+				(char *)BUF + (int)((BUF->vhl & 0x0f) * 4),
+				len);
+
+		/* Update the bitmap. */
+		if(offset / (8 * 8) == (offset + len) / (8 * 8)) {
+			/* If the two endpoints are in the same byte, we only update
+			 that byte. */
+
+			uip_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. */
+			uip_reassbitmap[offset / (8 * 8)] |=
+			bitmap_bits[(offset / 8 ) & 7];
+			for(i = 1 + offset / (8 * 8); i < (offset + len) / (8 * 8); ++i) {
+				uip_reassbitmap[i] = 0xff;
+			}
+			uip_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((BUF->ipoffset[0] & IP_MF) == 0) {
+			uip_reassflags |= UIP_REASS_FLAG_LASTFRAG;
+			uip_reasslen = offset + len;
+		}
+
+		/* 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(uip_reassflags & UIP_REASS_FLAG_LASTFRAG) {
+			/* Check all bytes up to and including all but the last byte in
+			 the bitmap. */
+			for(i = 0; i < uip_reasslen / (8 * 8) - 1; ++i) {
+				if(uip_reassbitmap[i] != 0xff) {
+					goto nullreturn;
+				}
+			}
+			/* Check the last byte in the bitmap. It should contain just the
+			 right amount of bits. */
+			if(uip_reassbitmap[uip_reasslen / (8 * 8)] !=
+					(u8_t)~bitmap_bits[uip_reasslen / 8 & 7]) {
+				goto nullreturn;
+			}
+
+			/* 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. */
+			uip_reasstmr = 0;
+			memcpy(BUF, FBUF, uip_reasslen);
+
+			/* Pretend to be a "normal" (i.e., not fragmented) IP packet
+			 from now on. */
+			BUF->ipoffset[0] = BUF->ipoffset[1] = 0;
+			BUF->len[0] = uip_reasslen >> 8;
+			BUF->len[1] = uip_reasslen & 0xff;
+			BUF->ipchksum = 0;
+			BUF->ipchksum = ~(uip_ipchksum());
+
+			return uip_reasslen;
+		}
+	}
+
+	nullreturn:
+	return 0;
+}
+#endif /* UIP_REASSEMBLY */
+/*---------------------------------------------------------------------------*/
+static void uip_add_rcv_nxt(u16_t n) {
+	uip_add32(uip_conn->rcv_nxt, n);
+	xtcp_copy_word(uip_conn->rcv_nxt, uip_acc32);
+}
+/*---------------------------------------------------------------------------*/
+
+void xtcpd_init_send_from_uip(struct uip_conn *conn);
+
+void uip_process(u8_t flag) {
+	register struct uip_conn *uip_connr = uip_conn;
+
+
+        #if UIP_SLIDING_WINDOW
+        uip_do_split = 0;
+        uip_slen = 0;
+        #endif
+
+
+#if UIP_UDP
+	if(flag == UIP_UDP_SEND_CONN) {
+		goto udp_send;
+	}
+#endif /* UIP_UDP */
+
+	uip_sappdata = uip_appdata = &uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN];
+
+	/* Check if we were invoked because of a poll request for a
+	 particular connection. */
+	if (flag == UIP_POLL_REQUEST) {
+		if ((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED
+                    #if UIP_SLIDING_WINDOW
+                    && ((!uip_outstanding(uip_connr)) || uip_connr->midpoint)
+                    #else
+                    && !uip_outstanding(uip_connr)
+                    #endif
+                    ) {
+			uip_flags = UIP_POLL;
+                        uip_len = 0;
+                        uip_slen = 0;
+			UIP_APPCALL();
+			goto appsend;
+		}
+		goto drop;
+
+		/* Check if we were invoked because of the perodic timer fireing. */
+	} else if (flag == UIP_TIMER) {
+#if UIP_REASSEMBLY
+		if(uip_reasstmr != 0) {
+			--uip_reasstmr;
+		}
+#endif /* UIP_REASSEMBLY */
+		/* Increase the initial sequence number. */
+		xtcp_increment_word(iss);
+
+		/* Reset the length variables. */
+		uip_len = 0;
+		uip_slen = 0;
+
+		/* Check if the connection is in a state in which we simply wait
+		 for the connection to time out. If so, we increase the
+		 connection's timer and remove the connection if it times
+		 out. */
+		if (uip_connr->tcpstateflags == UIP_TIME_WAIT
+				|| uip_connr->tcpstateflags == UIP_FIN_WAIT_2) {
+			++(uip_connr->timer);
+			if (uip_connr->timer == UIP_TIME_WAIT_TIMEOUT) {
+				uip_connr->tcpstateflags = UIP_CLOSED;
+			}
+		} else if (uip_connr->tcpstateflags != UIP_CLOSED) {
+			/* If the connection has outstanding data, we increase the
+			 connection's timer and see if it has reached the RTO value
+			 in which case we retransmit. */
+			if (uip_outstanding(uip_connr)) {
+				if (uip_connr->timer-- == 0) {
+					if (uip_connr->nrtx == UIP_MAXRTX
+							|| ((uip_connr->tcpstateflags == UIP_SYN_SENT
+									|| uip_connr->tcpstateflags == UIP_SYN_RCVD)
+									&& uip_connr->nrtx == UIP_MAXSYNRTX)) {
+						uip_connr->tcpstateflags = UIP_CLOSED;
+
+						/* We call UIP_APPCALL() with uip_flags set to
+						 UIP_TIMEDOUT to inform the application that the
+						 connection has timed out. */
+						uip_flags = UIP_TIMEDOUT;
+						UIP_APPCALL();
+
+						/* We also send a reset packet to the remote host. */
+						BUF->flags = TCP_RST | TCP_ACK;
+						goto tcp_send_nodata;
+					}
+
+					/* Exponential backoff. */
+					uip_connr->timer = UIP_RTO << (uip_connr->nrtx > 4 ? 4
+							: uip_connr->nrtx);
+					++(uip_connr->nrtx);
+
+					/* Ok, so we need to retransmit. We do this differently
+					 depending on which state we are in. In ESTABLISHED, we
+					 call upon the application so that it may prepare the
+					 data for the retransmit. In SYN_RCVD, we resend the
+					 SYNACK that we sent earlier and in LAST_ACK we have to
+					 retransmit our FINACK. */
+					UIP_STAT(++uip_stat.tcp.rexmit);
+					switch (uip_connr->tcpstateflags & UIP_TS_MASK) {
+					case UIP_SYN_RCVD:
+						/* In the SYN_RCVD state, we should retransmit our
+						 SYNACK. */
+						goto tcp_send_synack;
+
+#if UIP_ACTIVE_OPEN
+					case UIP_SYN_SENT:
+						/* In the SYN_SENT state, we retransmit out SYN. */
+						BUF->flags = 0;
+						goto tcp_send_syn;
+#endif /* UIP_ACTIVE_OPEN */
+
+					case UIP_ESTABLISHED:
+						/* In the ESTABLISHED state, we call upon the application
+						 to do the actual retransmit after which we jump into
+						 the code for sending out the packet (the apprexmit
+						 label). */
+						uip_flags = UIP_REXMIT;
+						UIP_APPCALL();
+						goto apprexmit;
+
+					case UIP_FIN_WAIT_1:
+					case UIP_CLOSING:
+					case UIP_LAST_ACK:
+						/* In all these states we should retransmit a FINACK. */
+						goto tcp_send_finack;
+
+					}
+				}
+			} else if ((uip_connr->tcpstateflags & UIP_TS_MASK)
+					== UIP_ESTABLISHED) {
+				/* If there was no need for a retransmission, we poll the
+				 application for new data. */
+				uip_flags = UIP_POLL;
+				UIP_APPCALL();
+				goto appsend;
+			}
+		}
+		goto drop;
+	}
+#if UIP_UDP
+	if(flag == UIP_UDP_TIMER || flag == UIP_UDP_ACKDATA) {
+		if(uip_udp_conn->lport != 0) {
+			uip_conn = NULL;
+			uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
+			uip_len = uip_slen = 0;
+			if (flag == UIP_UDP_ACKDATA) {
+				uip_flags = UIP_ACKDATA;
+				uip_udp_conn->udpflags ^= UDP_SENT;
+			}
+			else
+			uip_flags = UIP_POLL;
+			UIP_UDP_APPCALL();
+			goto udp_send;
+		} else {
+			goto drop;
+		}
+	}
+	else if(flag == UIP_UDP_ARP_EVENT) {
+		if(uip_udp_conn->lport != 0 &&
+				(uip_udp_conn->udpflags & UDP_PENDING_ARP)) {
+			uip_conn = NULL;
+			uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
+			uip_len = uip_slen = 0;
+			uip_flags = UIP_REXMIT;
+			uip_udp_conn->udpflags ^= UDP_PENDING_ARP;
+			UIP_UDP_APPCALL();
+			goto udp_send;
+		} else {
+			goto drop;
+		}
+	}
+
+#endif
+
+	/* This is where the input processing starts. */
+	UIP_STAT(++uip_stat.ip.recv);
+
+	/* Start of IP input header processing code. */
+
+#if UIP_CONF_IPV6
+	/* Check validity of the IP header. */
+	if((BUF->vtc & 0xf0) != 0x60) { /* IP version and header length. */
+		UIP_STAT(++uip_stat.ip.drop);
+		UIP_STAT(++uip_stat.ip.vhlerr);
+		UIP_LOG("ipv6: invalid version.");
+		goto drop;
+	}
+#else /* UIP_CONF_IPV6 */
+	/* Check validity of the IP header. */
+	if (BUF->vhl != 0x45) { /* IP version and header length. */
+		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.vhlerr); UIP_LOG("ip: invalid version or header length: ");
+#if UIP_CONF_LOGGING
+		printhexln(BUF->vhl);
+#endif
+		goto drop;
+	}
+#endif /* UIP_CONF_IPV6 */
+
+	/* Check the size of the packet. If the size reported to us in
+	 uip_len is smaller the size reported in the IP header, we assume
+	 that the packet has been corrupted in transit. If the size of
+	 uip_len is larger than the size reported in the IP packet header,
+	 the packet has been padded and we set uip_len to the correct
+	 value.. */
+
+	if ((BUF->len[0] << 8) + BUF->len[1] <= uip_len) {
+		uip_len = (BUF->len[0] << 8) + BUF->len[1];
+
+#if UIP_CONF_IPV6
+		uip_len += 40; /* The length reported in the IPv6 header is the
+		 length of the payload that follows the
+		 header. However, uIP uses the uip_len variable
+		 for holding the size of the entire packet,
+		 including the IP header. For IPv4 this is not a
+		 problem as the length field in the IPv4 header
+		 contains the length of the entire packet. But
+		 for IPv6 we need to add the size of the IPv6
+		 header (40 bytes). */
+#endif /* UIP_CONF_IPV6 */
+	} else {
+		UIP_LOG("ip: packet shorter than reported in IP header.");
+		goto drop;
+	}
+
+#if !UIP_CONF_IPV6
+	/* Check the fragment flag. */
+	if ((BUF->ipoffset[0] & 0x3f) != 0 || BUF->ipoffset[1] != 0) {
+#if UIP_REASSEMBLY
+		uip_len = uip_reass();
+		if(uip_len == 0) {
+			goto drop;
+		}
+#else /* UIP_REASSEMBLY */
+		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.fragerr); UIP_LOG("ip: fragment dropped.");
+		goto drop;
+#endif /* UIP_REASSEMBLY */
+	}
+#endif /* UIP_CONF_IPV6 */
+
+	if (uip_ipaddr_cmp(uip_hostaddr, all_zeroes_addr)) {
+		/* If we are configured to use ping IP address configuration and
+		 hasn't been assigned an IP address yet, we accept all ICMP
+		 packets. */
+#if UIP_PINGADDRCONF && !UIP_CONF_IPV6
+		if(BUF->proto == UIP_PROTO_ICMP) {
+			UIP_LOG("ip: possible ping config packet received.");
+			goto icmp_input;
+		} else {
+			UIP_LOG("ip: packet dropped since no address assigned.");
+			goto drop;
+		}
+#endif /* UIP_PINGADDRCONF */
+
+	} else {
+		/* If IP broadcast support is configured, we check for a broadcast
+		 UDP packet, which may be destined to us. */
+#if UIP_BROADCAST
+		DEBUG_PRINTF("UDP IP checksum 0x%04x\n", uip_ipchksum());
+		if(BUF->proto == UIP_PROTO_UDP &&
+				(uip_ipaddr_cmp(BUF->destipaddr, all_ones_addr) ||
+				uip_ipaddr_cmp(BUF->destipaddr, subnetaddr) ||
+                uip_ipaddr_is_multicast(BUF->destipaddr)) // Fix for UDP multicast traffic
+				/*&&
+				 uip_ipchksum() == 0xffff*/) {
+			goto udp_input;
+		}
+#endif /* UIP_BROADCAST */
+
+		/* Check if the packet is destined for our IP address */
+#if !UIP_CONF_IPV6
+		if (!uip_ipaddr_cmp(BUF->destipaddr, uip_hostaddr)
+#if UIP_IGMP
+				&& !igmp_check_addr(BUF->destipaddr)
+#endif
+				) {
+			UIP_STAT(++uip_stat.ip.drop);
+			goto drop;
+		}
+#else /* UIP_CONF_IPV6 */
+		/* For IPv6, packet reception is a little trickier as we need to
+		 make sure that we listen to certain multicast addresses (all
+		 hosts multicast address, and the solicited-node multicast
+		 address) as well. However, we will cheat here and accept all
+		 multicast packets that are sent to the ff02::/16 addresses. */
+		if(!uip_ipaddr_cmp(BUF->destipaddr, uip_hostaddr) &&
+				BUF->destipaddr[0] != HTONS(0xff02)) {
+			UIP_STAT(++uip_stat.ip.drop);
+			goto drop;
+		}
+#endif /* UIP_CONF_IPV6 */
+	}
+
+#if !UIP_CONF_IPV6
+	if (uip_ipchksum() != 0xffff) { /* Compute and check the IP header
+	 checksum. */
+		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.chkerr); UIP_LOG("ip: bad checksum.");
+		goto drop;
+	}
+#endif /* UIP_CONF_IPV6 */
+
+	if (BUF->proto == UIP_PROTO_TCP) { /* Check for TCP packet. If so,
+	 proceed with TCP input
+	 processing. */
+		goto tcp_input;
+	}
+
+#if UIP_UDP
+	if(BUF->proto == UIP_PROTO_UDP) {
+		goto udp_input;
+	}
+#endif /* UIP_UDP */
+
+#if !UIP_CONF_IPV6
+
+#if UIP_IGMP
+	if (BUF->proto == UIP_PROTO_IGMP) {
+		igmp_in();
+		return;
+	}
+#endif
+
+	/* ICMPv4 processing code follows. */
+	if (BUF->proto != UIP_PROTO_ICMP) { /* We only allow ICMP packets from
+	 here. */
+		UIP_STAT(++uip_stat.ip.drop); UIP_STAT(++uip_stat.ip.protoerr); UIP_LOG("ip: neither tcp nor icmp.");
+		goto drop;
+	}
+
+#if UIP_PINGADDRCONF
+	icmp_input:
+#endif /* UIP_PINGADDRCONF */
+	UIP_STAT(++uip_stat.icmp.recv);
+
+	/* ICMP echo (i.e., ping) processing. This is simple, we only change
+	 the ICMP type from ECHO to ECHO_REPLY and adjust the ICMP
+	 checksum before we return the packet. */
+	if (ICMPBUF->type != ICMP_ECHO) {
+		UIP_STAT(++uip_stat.icmp.drop); UIP_STAT(++uip_stat.icmp.typeerr); UIP_LOG("icmp: not icmp echo.");
+		goto drop;
+	}
+
+	/* If we are configured to use ping IP address assignment, we use
+	 the destination IP address of this ping packet and assign it to
+	 ourself. */
+#if UIP_PINGADDRCONF
+	if((uip_hostaddr[0] | uip_hostaddr[1]) == 0) {
+		uip_hostaddr[0] = BUF->destipaddr[0];
+		uip_hostaddr[1] = BUF->destipaddr[1];
+	}
+#endif /* UIP_PINGADDRCONF */
+
+	ICMPBUF->type = ICMP_ECHO_REPLY;
+
+	if (ICMPBUF->icmpchksum >= HTONS(0xffff - (ICMP_ECHO << 8))) {
+		ICMPBUF->icmpchksum += HTONS(ICMP_ECHO << 8) + 1;
+	} else {
+		ICMPBUF->icmpchksum += HTONS(ICMP_ECHO << 8);
+	}
+
+	/* Swap IP addresses. */
+	uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
+	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
+
+	UIP_STAT(++uip_stat.icmp.sent);
+	goto send;
+
+	/* End of IPv4 input header processing code. */
+#else /* !UIP_CONF_IPV6 */
+
+	/* This is IPv6 ICMPv6 processing code. */
+	DEBUG_PRINTF("icmp6_input: length %d\n", uip_len);
+
+	if(BUF->proto != UIP_PROTO_ICMP6) { /* We only allow ICMPv6 packets from
+	 here. */
+		UIP_STAT(++uip_stat.ip.drop);
+		UIP_STAT(++uip_stat.ip.protoerr);
+		UIP_LOG("ip: neither tcp nor icmp6.");
+		goto drop;
+	}
+
+	UIP_STAT(++uip_stat.icmp.recv);
+
+	/* If we get a neighbor solicitation for our address we should send
+	 a neighbor advertisement message back. */
+	if(ICMPBUF->type == ICMP6_NEIGHBOR_SOLICITATION) {
+		if(uip_ipaddr_cmp(ICMPBUF->icmp6data, uip_hostaddr)) {
+
+			if(ICMPBUF->options[0] == ICMP6_OPTION_SOURCE_LINK_ADDRESS) {
+				/* Save the sender's address in our neighbor list. */
+				uip_neighbor_add(ICMPBUF->srcipaddr, &(ICMPBUF->options[2]));
+			}
+
+			/* We should now send a neighbor advertisement back to where the
+			 neighbor solicication came from. */
+			ICMPBUF->type = ICMP6_NEIGHBOR_ADVERTISEMENT;
+			ICMPBUF->flags = ICMP6_FLAG_S; /* Solicited flag. */
+
+			ICMPBUF->reserved1 = ICMPBUF->reserved2 = ICMPBUF->reserved3 = 0;
+
+			uip_ipaddr_copy(ICMPBUF->destipaddr, ICMPBUF->srcipaddr);
+			uip_ipaddr_copy(ICMPBUF->srcipaddr, uip_hostaddr);
+			ICMPBUF->options[0] = ICMP6_OPTION_TARGET_LINK_ADDRESS;
+			ICMPBUF->options[1] = 1; /* Options length, 1 = 8 bytes. */
+			memcpy(&(ICMPBUF->options[2]), &uip_ethaddr, sizeof(uip_ethaddr));
+			ICMPBUF->icmpchksum = 0;
+			ICMPBUF->icmpchksum = ~uip_icmp6chksum();
+			goto send;
+
+		}
+		goto drop;
+	} else if(ICMPBUF->type == ICMP6_ECHO) {
+		/* ICMP echo (i.e., ping) processing. This is simple, we only
+		 change the ICMP type from ECHO to ECHO_REPLY and update the
+		 ICMP checksum before we return the packet. */
+
+		ICMPBUF->type = ICMP6_ECHO_REPLY;
+
+		uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
+		uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
+		ICMPBUF->icmpchksum = 0;
+		ICMPBUF->icmpchksum = ~uip_icmp6chksum();
+
+		UIP_STAT(++uip_stat.icmp.sent);
+		goto send;
+	} else {
+		DEBUG_PRINTF("Unknown icmp6 message type %d\n", ICMPBUF->type);
+		UIP_STAT(++uip_stat.icmp.drop);
+		UIP_STAT(++uip_stat.icmp.typeerr);
+		UIP_LOG("icmp: unknown ICMP message.");
+		goto drop;
+	}
+
+	/* End of IPv6 ICMP processing. */
+
+#endif /* !UIP_CONF_IPV6 */
+
+#if UIP_UDP
+	/* UDP input processing. */
+	udp_input:
+	/* UDP processing is really just a hack. We don't do anything to the
+	 UDP/IP headers, but let the UDP application do all the hard
+	 work. If the application sets uip_slen, it has a packet to
+	 send. */
+
+#if UIP_UDP_CHECKSUMS
+	uip_len = uip_len - UIP_IPUDPH_LEN;
+	uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
+	if(UDPBUF->udpchksum != 0 && uip_udpchksum() != 0xffff) {
+		UIP_STAT(++uip_stat.udp.drop);
+		UIP_STAT(++uip_stat.udp.chkerr);
+		UIP_LOG("udp: bad checksum.");
+		goto drop;
+	}
+#else /* UIP_UDP_CHECKSUMS */
+	uip_len = uip_len - UIP_IPUDPH_LEN;
+#endif /* UIP_UDP_CHECKSUMS */
+
+	/* Demultiplex this UDP packet between the UDP "connections". */
+	for(uip_udp_conn = &uip_udp_conns[0];
+			uip_udp_conn < &uip_udp_conns[UIP_UDP_CONNS];
+			++uip_udp_conn) {
+		/* If the local UDP port is non-zero, the connection is considered
+		 to be used. If so, the local port number is checked against the
+		 destination port number in the received packet. If the two port
+		 numbers match, the remote port number is checked if the
+		 connection is bound to a remote port. Finally, if the
+		 connection is bound to a remote IP address, the source IP
+		 address of the packet is checked. */
+
+#if 0
+		if(uip_udp_conn->lport != 0 &&
+				UDPBUF->destport == uip_udp_conn->lport &&
+				(uip_udp_conn->rport == 0 ||
+						(uip_udp_conn->udpflags & UDP_IS_SERVER_CONN) ||
+						UDPBUF->srcport == uip_udp_conn->rport) &&
+				((uip_udp_conn->udpflags & UDP_IS_SERVER_CONN) ||
+						uip_ipaddr_cmp(uip_udp_conn->ripaddr, all_zeroes_addr) ||
+						uip_ipaddr_cmp(uip_udp_conn->ripaddr, all_ones_addr) ||
+						uip_ipaddr_cmp(uip_udp_conn->ripaddr, subnetaddr) ||
+						uip_ipaddr_cmp(BUF->srcipaddr, uip_udp_conn->ripaddr) ||
+						uip_ipaddr_is_multicast(uip_udp_conn->ripaddr))) {
+
+			goto udp_found;
+		}
+#endif
+
+		if(uip_udp_conn->lport != 0 &&
+				UDPBUF->destport == uip_udp_conn->lport &&
+				UDPBUF->srcport == uip_udp_conn->rport &&
+				(uip_ipaddr_cmp(UDPBUF->srcipaddr, uip_udp_conn->ripaddr)
+                || (UDPBUF->destport == 0x4400) // Fix for DHCP
+                || (uip_ipaddr_is_multicast(uip_udp_conn->ripaddr)))
+          )
+		{
+			goto udp_found;
+		}
+	}
+
+	tmp16 = BUF->destport;
+	/* Next, check listening connections. */
+	for(c = 0; c < UIP_LISTENPORTS; ++c) {
+		if(tmp16 == uip_udp_listenports[c]) {
+			uip_udp_conn = 0;
+			for(c = 0; c < UIP_UDP_CONNS; ++c) {
+				if(uip_udp_conns[c].lport == 0) {
+					uip_udp_conn = &uip_udp_conns[c];
+					break;
+				}
+			}
+			if (uip_udp_conn != 0) {
+				uip_udp_conn->lport = tmp16;
+				uip_udp_conn->rport = UDPBUF->srcport;
+				uip_udp_conn->ttl = UIP_TTL;
+				uip_udp_conn->udpflags = 0;
+				uip_flags = UIP_CONNECTED | UIP_NEWDATA;
+				uip_ipaddr_copy(uip_udp_conn->ripaddr, UDPBUF->srcipaddr);
+				goto udp_found_listener;
+			}
+		}
+	}
+
+	// No matching connection found
+	goto drop;
+
+	udp_found:
+	uip_flags = UIP_NEWDATA;
+	udp_found_listener:
+	uip_conn = NULL;
+	uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];
+	uip_slen = 0;
+	UIP_UDP_APPCALL();
+	udp_send:
+	if(uip_slen == 0) {
+		goto drop;
+	}
+	uip_len = uip_slen + UIP_IPUDPH_LEN;
+
+#if UIP_CONF_IPV6
+	/* For IPv6, the IP length field does not include the IPv6 IP header
+	 length. */
+	BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
+	BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
+#else /* UIP_CONF_IPV6 */
+	BUF->len[0] = (uip_len >> 8);
+	BUF->len[1] = (uip_len & 0xff);
+#endif /* UIP_CONF_IPV6 */
+
+	BUF->ttl = uip_udp_conn->ttl;
+	BUF->proto = UIP_PROTO_UDP;
+
+	UDPBUF->udplen = HTONS(uip_slen + UIP_UDPH_LEN);
+	UDPBUF->udpchksum = 0;
+
+	BUF->srcport = uip_udp_conn->lport;
+	BUF->destport = uip_udp_conn->rport;
+
+	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
+	uip_ipaddr_copy(BUF->destipaddr, uip_udp_conn->ripaddr);
+
+	uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPTCPH_LEN];
+
+#if UIP_UDP_CHECKSUMS
+	/* Calculate UDP checksum. */
+	UDPBUF->udpchksum = ~(uip_udpchksum());
+	if(UDPBUF->udpchksum == 0) {
+		UDPBUF->udpchksum = 0xffff;
+	}
+#endif /* UIP_UDP_CHECKSUMS */
+
+	goto ip_send_nolen;
+#endif /* UIP_UDP */
+
+	/* TCP input processing. */
+	tcp_input: UIP_STAT(++uip_stat.tcp.recv);
+
+	/* Start of TCP input header processing code. */
+
+	if (uip_tcpchksum() != 0xffff) { /* Compute and check the TCP
+	 checksum. */
+		UIP_STAT(++uip_stat.tcp.drop); UIP_STAT(++uip_stat.tcp.chkerr); UIP_LOG("tcp: bad checksum.");
+		goto drop;
+	}
+
+	/* Demultiplex this segment. */
+	/* First check any active connections. */
+	for (uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1]; ++uip_connr) {
+		if (uip_connr->tcpstateflags != UIP_CLOSED && BUF->destport
+				== uip_connr->lport && BUF->srcport == uip_connr->rport
+				&& uip_ipaddr_cmp(BUF->srcipaddr, uip_connr->ripaddr)) {
+			goto found;
+		}
+	}
+
+	/* If we didn't find and active connection that expected the packet,
+	 either this packet is an old duplicate, or this is a SYN packet
+	 destined for a connection in LISTEN. If the SYN flag isn't set,
+	 it is an old packet and we send a RST. */
+	if ((BUF->flags & TCP_CTL) != TCP_SYN) {
+		goto reset;
+	}
+
+	tmp16 = BUF->destport;
+	/* Next, check listening connections. */
+	for (c = 0; c < UIP_LISTENPORTS; ++c) {
+		if (tmp16 == uip_listenports[c])
+			goto found_listen;
+	}
+
+	/* No matching connection found, so we send a RST packet. */
+	UIP_STAT(++uip_stat.tcp.synrst);
+	reset:
+
+	/* We do not send resets in response to resets. */
+	if (BUF->flags & TCP_RST) {
+		goto drop;
+	}
+
+	UIP_STAT(++uip_stat.tcp.rst);
+
+	BUF->flags = TCP_RST | TCP_ACK;
+	uip_len = UIP_IPTCPH_LEN;
+	BUF->tcpoffset = 5 << 4;
+
+	/* Flip the seqno and ackno fields in the TCP header. */
+	xtcp_swap_words(BUF->seqno, BUF->ackno);
+
+	/* We also have to increase the sequence number we are
+	 acknowledging. If the least significant byte overflowed, we need
+	 to propagate the carry to the other bytes as well. */
+	xtcp_increment_word(BUF->ackno);
+
+
+	/* Swap port numbers. */
+	tmp16 = BUF->srcport;
+	BUF->srcport = BUF->destport;
+	BUF->destport = tmp16;
+
+	/* Swap IP addresses. */
+	uip_ipaddr_copy(BUF->destipaddr, BUF->srcipaddr);
+	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
+
+	/* And send out the RST packet! */
+	goto tcp_send_noconn;
+
+	/* This label will be jumped to if we matched the incoming packet
+	 with a connection in LISTEN. In that case, we should create a new
+	 connection and send a SYNACK in return. */
+	found_listen:
+	/* First we check if there are any connections avaliable. Unused
+	 connections are kept in the same table as used connections, but
+	 unused ones have the tcpstate set to CLOSED. Also, connections in
+	 TIME_WAIT are kept track of and we'll use the oldest one if no
+	 CLOSED connections are found. Thanks to Eddie C. Dost for a very
+	 nice algorithm for the TIME_WAIT search. */
+	uip_connr = 0;
+	for (c = 0; c < UIP_CONNS; ++c) {
+		if (uip_conns[c].tcpstateflags == UIP_CLOSED) {
+			uip_connr = &uip_conns[c];
+			break;
+		}
+		if (uip_conns[c].tcpstateflags == UIP_TIME_WAIT) {
+			if (uip_connr == 0 || uip_conns[c].timer > uip_connr->timer) {
+				uip_connr = &uip_conns[c];
+			}
+		}
+	}
+
+	if (uip_connr == 0) {
+		/* All connections are used already, we drop packet and hope that
+		 the remote end will retransmit the packet at a time when we
+		 have more spare connections. */
+		UIP_STAT(++uip_stat.tcp.syndrop); UIP_LOG("tcp: found no unused connections.");
+		goto drop;
+	}
+	uip_conn = uip_connr;
+
+	/* Fill in the necessary fields for the new connection. */
+	uip_connr->rto = uip_connr->timer = UIP_RTO;
+	uip_connr->sa = 0;
+	uip_connr->sv = 4;
+	uip_connr->nrtx = 0;
+	uip_connr->lport = BUF->destport;
+	uip_connr->rport = BUF->srcport;
+	uip_ipaddr_copy(uip_connr->ripaddr, BUF->srcipaddr);
+	uip_connr->tcpstateflags = UIP_SYN_RCVD;
+
+	xtcp_copy_word(uip_connr->snd_nxt, iss);
+	uip_connr->len = 1;
+
+	/* rcv_nxt should be the seqno from the incoming packet + 1. */
+	xtcp_copy_word(uip_connr->rcv_nxt, BUF->seqno);
+	uip_add_rcv_nxt(1);
+
+	/* Parse the TCP MSS option, if present. */
+	if ((BUF->tcpoffset & 0xf0) > 0x50) {
+		for (c = 0; c < ((BUF->tcpoffset >> 4) - 5) << 2;) {
+			opt = uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + c];
+			if (opt == TCP_OPT_END) {
+				/* End of options. */
+				break;
+			} else if (opt == TCP_OPT_NOOP) {
+				++c;
+				/* NOP option. */
+			} else if (opt == TCP_OPT_MSS && uip_buf[UIP_TCPIP_HLEN
+					+ UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
+				/* An MSS option with the right option length. */
+				tmp16 = ((u16_t) uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c]
+						<< 8) | (u16_t) uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN
+						+ 3 + c];
+				uip_connr->initialmss = uip_connr->mss
+						= tmp16 > UIP_TCP_MSS ? UIP_TCP_MSS : tmp16;
+
+				/* And we are done processing options. */
+				break;
+			} else {
+				/* All other options have a length field, so that we easily
+				 can skip past them. */
+				if (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
+					/* If the length field is zero, the options are malformed
+					 and we don't process them further. */
+					break;
+				}
+				c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
+			}
+		}
+	}
+
+	/* Our response will be a SYNACK. */
+#if UIP_ACTIVE_OPEN
+	tcp_send_synack:
+	BUF->flags = TCP_ACK;
+
+	tcp_send_syn:
+	BUF->flags |= TCP_SYN;
+#else /* UIP_ACTIVE_OPEN */
+	tcp_send_synack: BUF->flags = TCP_SYN | TCP_ACK;
+#endif /* UIP_ACTIVE_OPEN */
+
+	/* We send out the TCP Maximum Segment Size option with our
+	 SYNACK. */
+	BUF->optdata[0] = TCP_OPT_MSS;
+	BUF->optdata[1] = TCP_OPT_MSS_LEN;
+	BUF->optdata[2] = (UIP_TCP_MSS) / 256;
+	BUF->optdata[3] = (UIP_TCP_MSS) & 255;
+	uip_len = UIP_IPTCPH_LEN + TCP_OPT_MSS_LEN;
+	BUF->tcpoffset = ((UIP_TCPH_LEN + TCP_OPT_MSS_LEN) / 4) << 4;
+	goto tcp_send;
+
+	/* This label will be jumped to if we found an active connection. */
+	found: uip_conn = uip_connr;
+	uip_flags = 0;
+	/* We do a very naive form of TCP reset processing; we just accept
+	 any RST and kill our connection. We should in fact check if the
+	 sequence number of this reset is wihtin our advertised window
+	 before we accept the reset. */
+	if (BUF->flags & TCP_RST) {
+		uip_connr->tcpstateflags = UIP_CLOSED;
+		UIP_LOG("tcp: got reset, aborting connection.");
+		uip_flags = UIP_ABORT;
+		UIP_APPCALL();
+		goto drop;
+	}
+	/* Calculated the length of the data, if the application has sent
+	 any data to us. */
+	c = (BUF->tcpoffset >> 4) << 2;
+	/* uip_len will contain the length of the actual TCP data. This is
+	 calculated by subtracing the length of the TCP header (in
+	 c) and the length of the IP header (20 bytes). */
+	uip_len = uip_len - c - UIP_IPH_LEN;
+
+	/* First, check if the sequence number of the incoming packet is
+	 what we're expecting next. If not, we send out an ACK with the
+	 correct numbers in. */
+	if (!(((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_SYN_SENT)
+			&& ((BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)))) {
+		if ((uip_len > 0 || ((BUF->flags & (TCP_SYN | TCP_FIN)) != 0))
+                    && (!xtcp_compare_words(BUF->seqno, uip_connr->rcv_nxt))) {
+			goto tcp_send_ack;
+		}
+	}
+
+	/* Next, check if the incoming segment acknowledges any outstanding
+	 data. If so, we update the sequence number, reset the length of
+	 the outstanding data, calculate RTT estimations, and reset the
+	 retransmission timer. */
+	if ((BUF->flags & TCP_ACK) && uip_outstanding(uip_connr)) {
+               uip_add32(uip_connr->snd_nxt, uip_connr->len);
+#if UIP_SLIDING_WINDOW
+               unsigned int ackno = xtcp_get_word(BUF->ackno);
+               int diff = xtcp_get_word(uip_acc32) - ackno;
+
+               if (diff >= 0 && diff < uip_connr->len)
+#else
+               if ((xtcp_compare_words(BUF->ackno, uip_acc32)))
+#endif
+                  {
+			/* Update sequence number. */
+#if UIP_SLIDING_WINDOW
+                    xtcp_copy_word(uip_connr->snd_nxt, BUF->ackno);
+#else
+                    xtcp_copy_word(uip_connr->snd_nxt, uip_acc32);
+#endif
+
+			/* Do RTT estimation, unless we have done retransmissions. */
+			if (uip_connr->nrtx == 0) {
+				signed char m;
+				m = uip_connr->rto - uip_connr->timer;
+				/* This is taken directly from VJs original code in his paper */
+				m = m - (uip_connr->sa >> 3);
+				uip_connr->sa += m;
+				if (m < 0) {
+					m = -m;
+				}
+				m = m - (uip_connr->sv >> 2);
+				uip_connr->sv += m;
+				uip_connr->rto = (uip_connr->sa >> 3) + uip_connr->sv;
+
+			}
+
+                        /* Set the acknowledged flag. */
+                        uip_flags = UIP_ACKDATA;
+
+			/* Reset the retransmission timer. */
+			uip_connr->timer = uip_connr->rto;
+
+			/* Reset length of outstanding data. */
+#if UIP_SLIDING_WINDOW
+
+
+
+                        uip_connr->midpoint = diff;
+			uip_connr->len = diff;
+
+#else
+			uip_connr->len = 0;
+#endif
+                    }
+
+	}
+
+        if (BUF->flags & TCP_PSH) {
+          uip_flags |= UIP_TCP_PUSH;
+        }
+
+	/* Do different things depending on in what state the connection is. */
+	switch (uip_connr->tcpstateflags & UIP_TS_MASK) {
+	/* CLOSED and LISTEN are not handled here. CLOSE_WAIT is not
+	 implemented, since we force the application to close when the
+	 peer sends a FIN (hence the application goes directly from
+	 ESTABLISHED to LAST_ACK). */
+	case UIP_SYN_RCVD:
+		/* In SYN_RCVD we have sent out a SYNACK in response to a SYN, and
+		 we are waiting for an ACK that acknowledges the data we sent
+		 out the last time. Therefore, we want to have the UIP_ACKDATA
+		 flag set. If so, we enter the ESTABLISHED state. */
+		if (uip_flags & UIP_ACKDATA) {
+			uip_connr->tcpstateflags = UIP_ESTABLISHED;
+			uip_flags = UIP_CONNECTED;
+			uip_connr->len = 0;
+			if (uip_len > 0) {
+				uip_flags |= UIP_NEWDATA;
+				uip_add_rcv_nxt(uip_len);
+			}
+			uip_slen = 0;
+			UIP_APPCALL();
+			goto appsend;
+		}
+		goto drop;
+#if UIP_ACTIVE_OPEN
+		case UIP_SYN_SENT:
+		/* In SYN_SENT, we wait for a SYNACK that is sent in response to
+		 our SYN. The rcv_nxt is set to sequence number in the SYNACK
+		 plus one, and we send an ACK. We move into the ESTABLISHED
+		 state. */
+		if((uip_flags & UIP_ACKDATA) &&
+				(BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK)) {
+
+			/* Parse the TCP MSS option, if present. */
+			if((BUF->tcpoffset & 0xf0) > 0x50) {
+				for(c = 0; c < ((BUF->tcpoffset >> 4) - 5) << 2;) {
+					opt = uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + c];
+					if(opt == TCP_OPT_END) {
+						/* End of options. */
+						break;
+					} else if(opt == TCP_OPT_NOOP) {
+						++c;
+						/* NOP option. */
+					} else if(opt == TCP_OPT_MSS &&
+							uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == TCP_OPT_MSS_LEN) {
+						/* An MSS option with the right option length. */
+						tmp16 = (uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 2 + c] << 8) |
+						uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 3 + c];
+						uip_connr->initialmss =
+						uip_connr->mss = tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
+
+						/* And we are done processing options. */
+						break;
+					} else {
+						/* All other options have a length field, so that we easily
+						 can skip past them. */
+						if(uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c] == 0) {
+							/* If the length field is zero, the options are malformed
+							 and we don't process them further. */
+							break;
+						}
+						c += uip_buf[UIP_TCPIP_HLEN + UIP_LLH_LEN + 1 + c];
+					}
+				}
+			}
+			uip_connr->tcpstateflags = UIP_ESTABLISHED;
+			xtcp_copy_word(uip_connr->rcv_nxt, BUF->seqno);
+			uip_add_rcv_nxt(1);
+			uip_flags = UIP_CONNECTED | UIP_NEWDATA;
+			uip_connr->len = 0;
+			uip_len = 0;
+			uip_slen = 0;
+			UIP_APPCALL();
+			goto appsend;
+		}
+		/* Inform the application that the connection failed */
+		uip_flags = UIP_ABORT;
+		UIP_APPCALL();
+		/* The connection is closed after we send the RST */
+		uip_conn->tcpstateflags = UIP_CLOSED;
+		goto reset;
+#endif /* UIP_ACTIVE_OPEN */
+
+	case UIP_ESTABLISHED:
+		/* In the ESTABLISHED state, we call upon the application to feed
+		 data into the uip_buf. If the UIP_ACKDATA flag is set, the
+		 application should put new data into the buffer, otherwise we are
+		 retransmitting an old segment, and the application should put that
+		 data into the buffer.
+
+		 If the incoming packet is a FIN, we should close the connection on
+		 this side as well, and we send out a FIN and enter the LAST_ACK
+		 state. We require that there is no outstanding data; otherwise the
+		 sequence numbers will be screwed up. */
+
+		if (BUF->flags & TCP_FIN && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
+			if (uip_outstanding(uip_connr)) {
+				goto drop;
+			}
+			uip_add_rcv_nxt(1 + uip_len);
+			uip_flags |= UIP_CLOSE;
+			if (uip_len > 0) {
+				uip_flags |= UIP_NEWDATA;
+			}
+			UIP_APPCALL();
+			uip_connr->len = 1;
+			uip_connr->tcpstateflags = UIP_LAST_ACK;
+			uip_connr->nrtx = 0;
+			tcp_send_finack: BUF->flags = TCP_FIN | TCP_ACK;
+			goto tcp_send_nodata;
+		}
+
+		/* Check the URG flag. If this is set, the segment carries urgent
+		 data that we must pass to the application. */
+		if ((BUF->flags & TCP_URG) != 0) {
+#if UIP_URGDATA > 0
+			uip_urglen = (BUF->urgp[0] << 8) | BUF->urgp[1];
+			if(uip_urglen > uip_len) {
+				/* There is more urgent data in the next segment to come. */
+				uip_urglen = uip_len;
+			}
+			uip_add_rcv_nxt(uip_urglen);
+			uip_len -= uip_urglen;
+			uip_urgdata = uip_appdata;
+			uip_appdata += uip_urglen;
+		} else {
+			uip_urglen = 0;
+#else /* UIP_URGDATA > 0 */
+			uip_appdata = ((char *) uip_appdata) + ((BUF->urgp[0] << 8)
+					| BUF->urgp[1]);
+			uip_len -= (BUF->urgp[0] << 8) | BUF->urgp[1];
+#endif /* UIP_URGDATA > 0 */
+		}
+
+		/* If uip_len > 0 we have TCP data in the packet, and we flag this
+		 by setting the UIP_NEWDATA flag and update the sequence number
+		 we acknowledge. If the application has stopped the dataflow
+		 using uip_stop(), we must not accept any data packets from the
+		 remote host. */
+		if (uip_len > 0
+                    #ifndef UIP_ACCEPT_PACKETS_AFTER_PAUSE
+                    && !(uip_connr->tcpstateflags & UIP_STOPPED)
+                    #endif
+                    ) {
+			uip_flags |= UIP_NEWDATA;
+			uip_add_rcv_nxt(uip_len);
+		}
+
+		/* Check if the available buffer space advertised by the other end
+		 is smaller than the initial MSS for this connection. If so, we
+		 set the current MSS to the window size to ensure that the
+		 application does not send more data than the other end can
+		 handle.
+
+		 If the remote host advertises a zero window, we set the MSS to
+		 the initial MSS so that the application will send an entire MSS
+		 of data. This data will not be acknowledged by the receiver,
+		 and the application will retransmit it. This is called the
+		 "persistent timer" and uses the retransmission mechanim.
+		 */
+		tmp16 = ((u16_t)BUF->wnd[0] << 8) + (u16_t)BUF->wnd[1];
+		if (tmp16 > uip_connr->initialmss || tmp16 == 0) {
+			tmp16 = uip_connr->initialmss;
+		}
+		uip_connr->mss = tmp16;
+
+		/* If this packet constitutes an ACK for outstanding data (flagged
+		 by the UIP_ACKDATA flag, we should call the application since it
+		 might want to send more data. If the incoming packet had data
+		 from the peer (as flagged by the UIP_NEWDATA flag), the
+		 application must also be notified.
+
+		 When the application is called, the global variable uip_len
+		 contains the length of the incoming data. The application can
+		 access the incoming data through the global pointer
+		 uip_appdata, which usually points UIP_IPTCPH_LEN + UIP_LLH_LEN
+		 bytes into the uip_buf array.
+
+		 If the application wishes to send any data, this data should be
+		 put into the uip_appdata and the length of the data should be
+		 put into uip_len. If the application don't have any data to
+		 send, uip_len must be set to 0. */
+		if (uip_flags & (UIP_NEWDATA | UIP_ACKDATA)) {
+			uip_slen = 0;
+			UIP_APPCALL();
+
+			appsend:
+
+			if (uip_flags & UIP_ABORT) {
+				uip_slen = 0;
+				uip_connr->tcpstateflags = UIP_CLOSED;
+				BUF->flags = TCP_RST | TCP_ACK;
+				goto tcp_send_nodata;
+			}
+
+			if (uip_flags & UIP_CLOSE) {
+				uip_slen = 0;
+				uip_connr->len = 1;
+				uip_connr->tcpstateflags = UIP_FIN_WAIT_1;
+				uip_connr->nrtx = 0;
+				BUF->flags = TCP_FIN | TCP_ACK;
+				goto tcp_send_nodata;
+			}
+
+
+                        uip_connr->nrtx = 0;
+
+			/* If uip_slen > 0, the application has data to be sent. */
+			if (uip_slen > 0) {
+
+#if UIP_SLIDING_WINDOW
+                          if (uip_connr->midpoint) {
+                            uip_do_split = 0;
+                            uip_connr->len += uip_slen;
+                            uip_len = uip_slen + UIP_TCPIP_HLEN;
+                            BUF->flags = TCP_ACK | TCP_PSH;
+                            goto tcp_send_noopts;
+                          }
+                          else {
+                            /* Decide whether to split this packet and record the fact in the connection data */
+                            uip_do_split = (uip_slen > ACTUAL_UIP_PACKET_SPLIT_THRESHOLD);
+                            uip_connr->midpoint = 0;
+                          }
+#endif
+				/* If the connection has acknowledged data, the contents of
+				 the ->len variable should be discarded. */
+				if ((uip_flags & UIP_ACKDATA) != 0) {
+					uip_connr->len = 0;
+				}
+
+				/* If the ->len variable is non-zero the connection has
+				 already data in transit and cannot send anymore right
+				 now. */
+
+				if (uip_connr->len == 0) {
+
+					/* The application cannot send more than what is allowed by
+					 the mss (the minumum of the MSS and the available
+					 window). */
+					if (uip_slen > uip_connr->mss) {
+						uip_slen = uip_connr->mss;
+					}
+
+					/* Remember how much data we send out now so that we know
+					 when everything has been acknowledged. */
+    					  uip_connr->len = uip_slen;
+
+				} else {
+
+					/* If the application already had unacknowledged data, we
+					 make sure that the application does not send (i.e.,
+					 retransmit) out more than it previously sent out. */
+
+                                  uip_slen = uip_connr->len;
+
+				}
+
+			}
+
+
+
+			apprexmit: uip_appdata = uip_sappdata;
+
+			/* If the application has data to be sent, or if the incoming
+			 packet had new data in it, we must send out a packet. */
+			if (uip_slen > 0 && uip_connr->len > 0) {
+				/* Add the length of the IP and TCP headers. */
+				uip_len = uip_connr->len + UIP_TCPIP_HLEN;
+				/* We always set the ACK flag in response packets. */
+				BUF->flags = TCP_ACK | TCP_PSH;
+				/* Send the packet. */
+				goto tcp_send_noopts;
+			}
+			/* If there is no data to send, just send out a pure ACK if
+			 there is newdata. */
+			if (uip_flags & UIP_NEWDATA) {
+				uip_len = UIP_TCPIP_HLEN;
+				BUF->flags = TCP_ACK;
+				goto tcp_send_noopts;
+			}
+		}
+		goto drop;
+	case UIP_LAST_ACK:
+		/* We can close this connection if the peer has acknowledged our
+		 FIN. This is indicated by the UIP_ACKDATA flag. */
+		if (uip_flags & UIP_ACKDATA) {
+			uip_connr->tcpstateflags = UIP_CLOSED;
+			uip_flags = UIP_CLOSE;
+			UIP_APPCALL();
+		}
+		break;
+
+	case UIP_FIN_WAIT_1:
+		/* The application has closed the connection, but the remote host
+		 hasn't closed its end yet. Thus we do nothing but wait for a
+		 FIN from the other side. */
+		if (uip_len > 0) {
+			uip_add_rcv_nxt(uip_len);
+		}
+		if (BUF->flags & TCP_FIN) {
+			if (uip_flags & UIP_ACKDATA) {
+				uip_connr->tcpstateflags = UIP_TIME_WAIT;
+				uip_connr->timer = 0;
+				uip_connr->len = 0;
+			} else {
+				uip_connr->tcpstateflags = UIP_CLOSING;
+			}
+			uip_add_rcv_nxt(1);
+			uip_flags = UIP_CLOSE;
+			UIP_APPCALL();
+			goto tcp_send_ack;
+		} else if (uip_flags & UIP_ACKDATA) {
+			uip_connr->tcpstateflags = UIP_FIN_WAIT_2;
+			uip_connr->len = 0;
+			goto drop;
+		}
+		if (uip_len > 0) {
+			goto tcp_send_ack;
+		}
+		goto drop;
+
+	case UIP_FIN_WAIT_2:
+		if (uip_len > 0) {
+			uip_add_rcv_nxt(uip_len);
+		}
+		if (BUF->flags & TCP_FIN) {
+			uip_connr->tcpstateflags = UIP_TIME_WAIT;
+			uip_connr->timer = 0;
+			uip_add_rcv_nxt(1);
+			uip_flags = UIP_CLOSE;
+			UIP_APPCALL();
+			goto tcp_send_ack;
+		}
+		if (uip_len > 0) {
+			goto tcp_send_ack;
+		}
+		goto drop;
+
+	case UIP_TIME_WAIT:
+		goto tcp_send_ack;
+
+	case UIP_CLOSING:
+		if (uip_flags & UIP_ACKDATA) {
+			uip_connr->tcpstateflags = UIP_TIME_WAIT;
+			uip_connr->timer = 0;
+		}
+	}
+	goto drop;
+
+	/* We jump here when we are ready to send the packet, and just want
+	 to set the appropriate TCP sequence numbers in the TCP header. */
+	tcp_send_ack: BUF->flags = TCP_ACK;
+	tcp_send_nodata: uip_len = UIP_IPTCPH_LEN;
+	tcp_send_noopts: BUF->tcpoffset = (UIP_TCPH_LEN / 4) << 4;
+	tcp_send:
+	/* We're done with the input processing. We are now ready to send a
+	 reply. Our job is to fill in all the fields of the TCP and IP
+	 headers before calculating the checksum and finally send the
+	 packet. */
+	xtcp_copy_word(BUF->ackno, uip_connr->rcv_nxt);
+
+	xtcp_copy_word(BUF->seqno, uip_connr->snd_nxt);
+#if UIP_SLIDING_WINDOW
+        if (uip_connr->midpoint && uip_slen) {
+          uip_add32(BUF->seqno, uip_connr->midpoint);
+          xtcp_copy_word(BUF->seqno, uip_acc32);
+          uip_connr->midpoint = 0;
+        }
+        else if (!uip_do_split && uip_slen) {
+          // This case means we have only sent a half packet, we can send more
+          // if needed
+          uip_connr->midpoint = uip_slen;
+          // A call up to the xtcp stack to initiate a new send request
+          xtcpd_init_send_from_uip(uip_connr);
+        }
+#endif
+	BUF->proto = UIP_PROTO_TCP;
+
+	BUF->srcport = uip_connr->lport;
+	BUF->destport = uip_connr->rport;
+
+	uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);
+	uip_ipaddr_copy(BUF->destipaddr, uip_connr->ripaddr);
+
+	if (uip_connr->tcpstateflags & UIP_STOPPED) {
+		/* If the connection has issued uip_stop(), we advertise a zero
+		 window so that the remote host will stop sending data. */
+		BUF->wnd[0] = BUF->wnd[1] = 0;
+	} else {
+		BUF->wnd[0] = ((UIP_RECEIVE_WINDOW) >> 8);
+		BUF->wnd[1] = ((UIP_RECEIVE_WINDOW) & 0xff);
+	}
+
+	tcp_send_noconn: BUF->ttl = UIP_TTL;
+#if UIP_CONF_IPV6
+	/* For IPv6, the IP length field does not include the IPv6 IP header
+	 length. */
+	BUF->len[0] = ((uip_len - UIP_IPH_LEN) >> 8);
+	BUF->len[1] = ((uip_len - UIP_IPH_LEN) & 0xff);
+#else /* UIP_CONF_IPV6 */
+	BUF->len[0] = (uip_len >> 8);
+	BUF->len[1] = (uip_len & 0xff);
+#endif /* UIP_CONF_IPV6 */
+
+	BUF->urgp[0] = BUF->urgp[1] = 0;
+
+	/* The TCP checksum is calculated later, in the uip_split_output function */
+
+	ip_send_nolen:
+
+#if UIP_CONF_IPV6
+	BUF->vtc = 0x60;
+	BUF->tcflow = 0x00;
+	BUF->flow = 0x00;
+#else /* UIP_CONF_IPV6 */
+	BUF->vhl = 0x45;
+	BUF->tos = 0;
+	BUF->ipoffset[0] = BUF->ipoffset[1] = 0;
+	++ipid;
+	BUF->ipid[0] = ipid >> 8;
+	BUF->ipid[1] = ipid & 0xff;
+	/* Calculate IP checksum. */
+	BUF->ipchksum = 0;
+	BUF->ipchksum = ~(uip_ipchksum());
+	DEBUG_PRINTF("uip ip_send_nolen: chkecum 0x%04x\n", uip_ipchksum());
+#endif /* UIP_CONF_IPV6 */
+
+	UIP_STAT(++uip_stat.tcp.sent);
+	send: DEBUG_PRINTF("Sending packet with length %d (%d)\n", uip_len,
+			(BUF->len[0] << 8) | BUF->len[1]);
+
+	UIP_STAT(++uip_stat.ip.sent);
+	/* Return and let the caller do the actual transmission. */
+	uip_flags = 0;
+	return;
+	drop: uip_len = 0;
+	uip_flags = 0;
+	return;
+}
+/*---------------------------------------------------------------------------*/
+u16_t htons(u16_t val) {
+	return HTONS(val);
+}
+/*---------------------------------------------------------------------------*/
+void uip_send(const void *data, int len) {
+	if (len > 0) {
+		uip_slen = len;
+		if (data != uip_sappdata) {
+			memcpy(uip_sappdata, (data), uip_slen);
+		}
+	}
+}
+/** @} */
diff --git a/module_xtcp/src/xtcp_uip/uip.h b/module_xtcp/src/xtcp_uip/uip.h
index 4da680c..3809585 100644
--- a/module_xtcp/src/xtcp_uip/uip.h
+++ b/module_xtcp/src/xtcp_uip/uip.h
@@ -1,1676 +1,1678 @@
-// Copyright (c) 2011, XMOS Ltd, All rights reserved
-// This software is freely distributable under a derivative of the
-// University of Illinois/NCSA Open Source License posted in
-// LICENSE.txt and at <http://github.xcore.com/>
-
-
-
-/**
- * \addtogroup uip
- * @{
- */
-
-/**
- * \file
- * Header file for the uIP TCP/IP stack.
- * \author Adam Dunkels <adam@dunkels.com>
- *
- * The uIP TCP/IP stack header file contains definitions for a number
- * of C macros that are used by uIP programs as well as internal uIP
- * structures, TCP/IP header structures and function declarations.
- *
- */
-
-
-/*
- * Copyright (c) 2001-2003, Adam Dunkels.
- * 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 uIP TCP/IP stack.
- *
- * $Id: uip.h,v 1.40 2006/06/08 07:12:07 adam Exp $
- *
- */
-
-#ifndef __UIP_H__
-#define __UIP_H__
-
-#include "uipopt.h"
-
-/**
- * Repressentation of an IP address.
- *
- */
-typedef u16_t uip_ip4addr_t[2];
-typedef u16_t uip_ip6addr_t[8];
-#if UIP_CONF_IPV6
-typedef uip_ip6addr_t uip_ipaddr_t;
-#else /* UIP_CONF_IPV6 */
-typedef uip_ip4addr_t uip_ipaddr_t;
-#endif /* UIP_CONF_IPV6 */
-
-/*---------------------------------------------------------------------------*/
-/* First, the functions that should be called from the
- * system. Initialization, the periodic timer and incoming packets are
- * handled by the following three functions.
- */
-
-/**
- * \defgroup uipconffunc uIP configuration functions
- * @{
- *
- * The uIP configuration functions are used for setting run-time
- * parameters in uIP such as IP addresses.
- */
-
-/**
- * Set the IP address of this host.
- *
- * The IP address is represented as a 4-byte array where the first
- * octet of the IP address is put in the first member of the 4-byte
- * array.
- *
- * Example:
- \code
-
- uip_ipaddr_t addr;
-
- uip_ipaddr(&addr, 192,168,1,2);
- uip_sethostaddr(&addr);
- 
- \endcode
- * \param addr A pointer to an IP address of type uip_ipaddr_t;
- *
- * \sa uip_ipaddr()
- *
- * \hideinitializer
- */
-#define uip_sethostaddr(addr) uip_ipaddr_copy(uip_hostaddr, (addr))
-
-/**
- * Get the IP address of this host.
- *
- * The IP address is represented as a 4-byte array where the first
- * octet of the IP address is put in the first member of the 4-byte
- * array.
- *
- * Example:
- \code
- uip_ipaddr_t hostaddr;
-
- uip_gethostaddr(&hostaddr);
- \endcode
- * \param addr A pointer to a uip_ipaddr_t variable that will be
- * filled in with the currently configured IP address.
- *
- * \hideinitializer
- */
-#define uip_gethostaddr(addr) uip_ipaddr_copy((addr), uip_hostaddr)
-
-/**
- * Set the default router's IP address.
- *
- * \param addr A pointer to a uip_ipaddr_t variable containing the IP
- * address of the default router.
- *
- * \sa uip_ipaddr()
- *
- * \hideinitializer
- */
-#define uip_setdraddr(addr) uip_ipaddr_copy(uip_draddr, (addr))
-
-/**
- * Set the netmask.
- *
- * \param addr A pointer to a uip_ipaddr_t variable containing the IP
- * address of the netmask.
- *
- * \sa uip_ipaddr()
- *
- * \hideinitializer
- */
-#define uip_setnetmask(addr) uip_ipaddr_copy(uip_netmask, (addr))
-
-
-/**
- * Get the default router's IP address.
- *
- * \param addr A pointer to a uip_ipaddr_t variable that will be
- * filled in with the IP address of the default router.
- *
- * \hideinitializer
- */
-#define uip_getdraddr(addr) uip_ipaddr_copy((addr), uip_draddr)
-
-/**
- * Get the netmask.
- *
- * \param addr A pointer to a uip_ipaddr_t variable that will be
- * filled in with the value of the netmask.
- *
- * \hideinitializer
- */
-#define uip_getnetmask(addr) uip_ipaddr_copy((addr), uip_netmask)
-
-/** @} */
-
-/**
- * \defgroup uipinit uIP initialization functions
- * @{
- *
- * The uIP initialization functions are used for booting uIP.
- */
-
-/**
- * uIP initialization function.
- *
- * This function should be called at boot up to initilize the uIP
- * TCP/IP stack.
- */
-void uip_init(void);
-
-/**
- * uIP initialization function.
- *
- * This function may be used at boot time to set the initial ip_id.
- */
-void uip_setipid(u16_t id);
-
-/** @} */
-
-/**
- * \defgroup uipdevfunc uIP device driver functions
- * @{
- *
- * These functions are used by a network device driver for interacting
- * with uIP.
- */
-
-/**
- * Process an incoming packet.
- *
- * This function should be called when the device driver has received
- * a packet from the network. The packet from the device driver must
- * be present in the uip_buf buffer, and the length of the packet
- * should be placed in the uip_len variable.
- *
- * When the function returns, there may be an outbound packet placed
- * in the uip_buf packet buffer. If so, the uip_len variable is set to
- * the length of the packet. If no packet is to be sent out, the
- * uip_len variable is set to 0.
- *
- * The usual way of calling the function is presented by the source
- * code below.
- \code
-  uip_len = devicedriver_poll();
-  if(uip_len > 0) {
-    uip_input();
-    if(uip_len > 0) {
-      devicedriver_send();
-    }
-  }
- \endcode
- *
- * \note If you are writing a uIP device driver that needs ARP
- * (Address Resolution Protocol), e.g., when running uIP over
- * Ethernet, you will need to call the uIP ARP code before calling
- * this function:
- \code
-  #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
-  uip_len = ethernet_devicedrver_poll();
-  if(uip_len > 0) {
-    if(BUF->type == HTONS(UIP_ETHTYPE_IP)) {
-      uip_arp_ipin();
-      uip_input();
-      if(uip_len > 0) {
-        uip_arp_out();
-	ethernet_devicedriver_send();
-      }
-    } else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) {
-      uip_arp_arpin();
-      if(uip_len > 0) {
-	ethernet_devicedriver_send();
-      }
-    }
- \endcode
- *
- * \hideinitializer
- */
-#define uip_input()        uip_process(UIP_DATA)
-
-/**
- * Periodic processing for a connection identified by its number.
- *
- * This function does the necessary periodic processing (timers,
- * polling) for a uIP TCP conneciton, and should be called when the
- * periodic uIP timer goes off. It should be called for every
- * connection, regardless of whether they are open of closed.
- *
- * When the function returns, it may have an outbound packet waiting
- * for service in the uIP packet buffer, and if so the uip_len
- * variable is set to a value larger than zero. The device driver
- * should be called to send out the packet.
- *
- * The ususal way of calling the function is through a for() loop like
- * this:
- \code
-  for(i = 0; i < UIP_CONNS; ++i) {
-    uip_periodic(i);
-    if(uip_len > 0) {
-      devicedriver_send();
-    }
-  }
- \endcode
- *
- * \note If you are writing a uIP device driver that needs ARP
- * (Address Resolution Protocol), e.g., when running uIP over
- * Ethernet, you will need to call the uip_arp_out() function before
- * calling the device driver:
- \code
-  for(i = 0; i < UIP_CONNS; ++i) {
-    uip_periodic(i);
-    if(uip_len > 0) {
-      uip_arp_out();
-      ethernet_devicedriver_send();
-    }
-  }
- \endcode
- *
- * \param conn The number of the connection which is to be periodically polled.
- *
- * \hideinitializer
- */
-#define uip_periodic(conn) do { uip_conn = &uip_conns[conn]; \
-                                uip_process(UIP_TIMER); } while (0)
-
-/**
- *
- *
- */
-#define uip_conn_active(conn) (uip_conns[conn].tcpstateflags != UIP_CLOSED)
-
-/**
- * Perform periodic processing for a connection identified by a pointer
- * to its structure.
- *
- * Same as uip_periodic() but takes a pointer to the actual uip_conn
- * struct instead of an integer as its argument. This function can be
- * used to force periodic processing of a specific connection.
- *
- * \param conn A pointer to the uip_conn struct for the connection to
- * be processed.
- *
- * \hideinitializer
- */
-#define uip_periodic_conn(conn) do { uip_conn = conn; \
-                                     uip_process(UIP_TIMER); } while (0)
-
-/**
- * Reuqest that a particular connection should be polled.
- *
- * Similar to uip_periodic_conn() but does not perform any timer
- * processing. The application is polled for new data.
- *
- * \param conn A pointer to the uip_conn struct for the connection to
- * be processed.
- *
- * \hideinitializer
- */
-#define uip_poll_conn(conn) do { uip_conn = conn; \
-                                 uip_process(UIP_POLL_REQUEST); } while (0)
-
-
-#if UIP_UDP
-/**
- * Periodic processing for a UDP connection identified by its number.
- *
- * This function is essentially the same as uip_periodic(), but for
- * UDP connections. It is called in a similar fashion as the
- * uip_periodic() function:
- \code
-  for(i = 0; i < UIP_UDP_CONNS; i++) {
-    uip_udp_periodic(i);
-    if(uip_len > 0) {
-      devicedriver_send();
-    }
-  }
- \endcode
- *
- * \note As for the uip_periodic() function, special care has to be
- * taken when using uIP together with ARP and Ethernet:
- \code
-  for(i = 0; i < UIP_UDP_CONNS; i++) {
-    uip_udp_periodic(i);
-    if(uip_len > 0) {
-      uip_arp_out();
-      ethernet_devicedriver_send();
-    }
-  }
- \endcode
- *
- * \param conn The number of the UDP connection to be processed.
- *
- * \hideinitializer
- */
-#define uip_udp_periodic(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
-                                uip_process(UIP_UDP_TIMER); } while (0)
-
-
-/**
- * Processing of a UDP connection after an ARP reply.
- *
- * This function handles udp connections after an arp reply comes in. Possibly
- * retransmitting datagrams that were not transmitted due to having to create
- * an arp request before.
- *
- \code
-  uip_arp_arpin();
-  if(uip_len > 0) {
-    devicedriver_send();
-  }
-  for(i = 0; i < UIP_UDP_CONNS; i++) {
-    uip_udp_arp_event(i);
-    if(uip_len > 0) {
-      devicedriver_send();
-    }
-  }
- \endcode
- *
- *
- * \param conn The number of the UDP connection to be processed.
- *
- * \hideinitializer
- */
-#define uip_udp_arp_event(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
-                                uip_process(UIP_UDP_ARP_EVENT); } while (0)
-
-
-#define uip_udp_conn_has_ack(conn) ((conn)->udpflags & UDP_SENT)
-
-#define uip_udp_ackdata(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
-                                uip_process(UIP_UDP_ACKDATA); } while (0)
-
-/**
- * Periodic processing for a UDP connection identified by a pointer to
- * its structure.
- *
- * Same as uip_udp_periodic() but takes a pointer to the actual
- * uip_conn struct instead of an integer as its argument. This
- * function can be used to force periodic processing of a specific
- * connection.
- *
- * \param conn A pointer to the uip_udp_conn struct for the connection
- * to be processed.
- *
- * \hideinitializer
- */
-#define uip_udp_periodic_conn(conn) do { uip_udp_conn = conn; \
-                                         uip_process(UIP_UDP_TIMER); } while (0)
-
-
-#endif /* UIP_UDP */
-
-/**
- * The uIP packet buffer.
- *
- * The uip_buf array is used to hold incoming and outgoing
- * packets. The device driver should place incoming data into this
- * buffer. When sending data, the device driver should read the link
- * level headers and the TCP/IP headers from this buffer. The size of
- * the link level headers is configured by the UIP_LLH_LEN define.
- *
- * \note The application data need not be placed in this buffer, so
- * the device driver must read it from the place pointed to by the
- * uip_appdata pointer as illustrated by the following example:
- \code
- void
- devicedriver_send(void)
- {
-    hwsend(&uip_buf[0], UIP_LLH_LEN);
-    if(uip_len <= UIP_LLH_LEN + UIP_TCPIP_HLEN) {
-      hwsend(&uip_buf[UIP_LLH_LEN], uip_len - UIP_LLH_LEN);
-    } else {
-      hwsend(&uip_buf[UIP_LLH_LEN], UIP_TCPIP_HLEN);
-      hwsend(uip_appdata, uip_len - UIP_TCPIP_HLEN - UIP_LLH_LEN);
-    }
- }
- \endcode
- */
-//extern u8_t uip_buf[UIP_BUFSIZE+2];
-extern u8_t *uip_buf;
-
-/** @} */
-
-/*---------------------------------------------------------------------------*/
-/* Functions that are used by the uIP application program. Opening and
- * closing connections, sending and receiving data, etc. is all
- * handled by the functions below.
-*/
-/**
- * \defgroup uipappfunc uIP application functions
- * @{
- *
- * Functions used by an application running of top of uIP.
- */
-
-/**
- * Start listening to the specified port.
- *
- * \note Since this function expects the port number in network byte
- * order, a conversion using HTONS() or htons() is necessary.
- *
- \code
- uip_listen(HTONS(80));
- \endcode
- *
- * \param port A 16-bit port number in network byte order.
- */
-void uip_listen(u16_t port);
-void uip_udp_listen(u16_t port);
-
-/**
- * Stop listening to the specified port.
- *
- * \note Since this function expects the port number in network byte
- * order, a conversion using HTONS() or htons() is necessary.
- *
- \code
- uip_unlisten(HTONS(80));
- \endcode
- *
- * \param port A 16-bit port number in network byte order.
- */
-void uip_unlisten(u16_t port);
-void uip_udp_unlisten(u16_t port);
-
-/**
- * Connect to a remote host using TCP.
- *
- * This function is used to start a new connection to the specified
- * port on the specied host. It allocates a new connection identifier,
- * sets the connection to the SYN_SENT state and sets the
- * retransmission timer to 0. This will cause a TCP SYN segment to be
- * sent out the next time this connection is periodically processed,
- * which usually is done within 0.5 seconds after the call to
- * uip_connect().
- *
- * \note This function is avaliable only if support for active open
- * has been configured by defining UIP_ACTIVE_OPEN to 1 in uipopt.h.
- *
- * \note Since this function requires the port number to be in network
- * byte order, a conversion using HTONS() or htons() is necessary.
- *
- \code
- uip_ipaddr_t ipaddr;
-
- uip_ipaddr(&ipaddr, 192,168,1,2);
- uip_connect(&ipaddr, HTONS(80));
- \endcode
- *
- * \param ripaddr The IP address of the remote hot.
- *
- * \param port A 16-bit port number in network byte order.
- *
- * \return A pointer to the uIP connection identifier for the new connection,
- * or NULL if no connection could be allocated.
- *
- */
-struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
-
-
-
-/**
- * \internal
- *
- * Check if a connection has outstanding (i.e., unacknowledged) data.
- *
- * \param conn A pointer to the uip_conn structure for the connection.
- *
- * \hideinitializer
- */
-#define uip_outstanding(conn) ((conn)->len)
-
-/**
- * Send data on the current connection.
- *
- * This function is used to send out a single segment of TCP
- * data. Only applications that have been invoked by uIP for event
- * processing can send data.
- *
- * The amount of data that actually is sent out after a call to this
- * funcion is determined by the maximum amount of data TCP allows. uIP
- * will automatically crop the data so that only the appropriate
- * amount of data is sent. The function uip_mss() can be used to query
- * uIP for the amount of data that actually will be sent.
- *
- * \note This function does not guarantee that the sent data will
- * arrive at the destination. If the data is lost in the network, the
- * application will be invoked with the uip_rexmit() event being
- * set. The application will then have to resend the data using this
- * function.
- *
- * \param data A pointer to the data which is to be sent.
- *
- * \param len The maximum amount of data bytes to be sent.
- *
- * \hideinitializer
- */
-void uip_send(const void *data, int len);
-
-/**
- * The length of any incoming data that is currently avaliable (if avaliable)
- * in the uip_appdata buffer.
- *
- * The test function uip_data() must first be used to check if there
- * is any data available at all.
- *
- * \hideinitializer
- */
-/*void uip_datalen(void);*/
-#define uip_datalen()       uip_len
-
-/**
- * The length of any out-of-band data (urgent data) that has arrived
- * on the connection.
- *
- * \note The configuration parameter UIP_URGDATA must be set for this
- * function to be enabled.
- *
- * \hideinitializer
- */
-#define uip_urgdatalen()    uip_urglen
-
-/**
- * Close the current connection.
- *
- * This function will close the current connection in a nice way.
- *
- * \hideinitializer
- */
-#define uip_close()         (uip_flags = UIP_CLOSE)
-
-/**
- * Abort the current connection.
- *
- * This function will abort (reset) the current connection, and is
- * usually used when an error has occured that prevents using the
- * uip_close() function.
- *
- * \hideinitializer
- */
-#define uip_abort()         (uip_flags = UIP_ABORT)
-
-/**
- * Tell the sending host to stop sending data.
- *
- * This function will close our receiver's window so that we stop
- * receiving data for the current connection.
- *
- * \hideinitializer
- */
-#define uip_stop()          (uip_conn->tcpstateflags |= UIP_STOPPED)
-
-/**
- * Find out if the current connection has been previously stopped with
- * uip_stop().
- *
- * \hideinitializer
- */
-#define uip_stopped(conn)   ((conn)->tcpstateflags & UIP_STOPPED)
-
-/**
- * Restart the current connection, if is has previously been stopped
- * with uip_stop().
- *
- * This function will open the receiver's window again so that we
- * start receiving data for the current connection.
- *
- * \hideinitializer
- */
-#define uip_restart()         do { uip_flags |= UIP_NEWDATA; \
-                                   uip_conn->tcpstateflags &= ~UIP_STOPPED; \
-                              } while(0)
-
-
-/* uIP tests that can be made to determine in what state the current
-   connection is, and what the application function should do. */
-
-/**
- * Is the current connection a UDP connection?
- *
- * This function checks whether the current connection is a UDP connection.
- *
- * \hideinitializer
- *
- */
-#define uip_udpconnection() (uip_conn == NULL)
-
-/**
- * Is new incoming data available?
- *
- * Will reduce to non-zero if there is new data for the application
- * present at the uip_appdata pointer. The size of the data is
- * avaliable through the uip_len variable.
- *
- * \hideinitializer
- */
-#define uip_newdata()   (uip_flags & UIP_NEWDATA)
-
-/**
- * Has previously sent data been acknowledged?
- *
- * Will reduce to non-zero if the previously sent data has been
- * acknowledged by the remote host. This means that the application
- * can send new data.
- *
- * \hideinitializer
- */
-#define uip_acked()   (uip_flags & UIP_ACKDATA)
-
-/**
- * Has the connection just been connected?
- *
- * Reduces to non-zero if the current connection has been connected to
- * a remote host. This will happen both if the connection has been
- * actively opened (with uip_connect()) or passively opened (with
- * uip_listen()).
- *
- * \hideinitializer
- */
-#define uip_connected() (uip_flags & UIP_CONNECTED)
-
-/**
- * Has the connection been closed by the other end?
- *
- * Is non-zero if the connection has been closed by the remote
- * host. The application may then do the necessary clean-ups.
- *
- * \hideinitializer
- */
-#define uip_closed()    (uip_flags & UIP_CLOSE)
-
-
-/**
- * Has the other end just sent a packet with the PUSH flag sent
- *
- * \hideinitializer
- */
-#define uip_tcp_push()    (uip_flags & UIP_TCP_PUSH)
-
-/**
- * Has the connection been aborted by the other end?
- *
- * Non-zero if the current connection has been aborted (reset) by the
- * remote host.
- *
- * \hideinitializer
- */
-#define uip_aborted()    (uip_flags & UIP_ABORT)
-
-/**
- * Has the connection timed out?
- *
- * Non-zero if the current connection has been aborted due to too many
- * retransmissions.
- *
- * \hideinitializer
- */
-#define uip_timedout()    (uip_flags & UIP_TIMEDOUT)
-
-/**
- * Do we need to retransmit previously data?
- *
- * Reduces to non-zero if the previously sent data has been lost in
- * the network, and the application should retransmit it. The
- * application should send the exact same data as it did the last
- * time, using the uip_send() function.
- *
- * \hideinitializer
- */
-#define uip_rexmit()     (uip_flags & UIP_REXMIT)
-
-/**
- * Is the connection being polled by uIP?
- *
- * Is non-zero if the reason the application is invoked is that the
- * current connection has been idle for a while and should be
- * polled.
- *
- * The polling event can be used for sending data without having to
- * wait for the remote host to send data.
- *
- * \hideinitializer
- */
-#define uip_poll()       (uip_flags & UIP_POLL)
-
-/**
- * Get the initial maxium segment size (MSS) of the current
- * connection.
- *
- * \hideinitializer
- */
-#define uip_initialmss()             (uip_conn->initialmss)
-
-/**
- * Get the current maxium segment size that can be sent on the current
- * connection.
- *
- * The current maxiumum segment size that can be sent on the
- * connection is computed from the receiver's window and the MSS of
- * the connection (which also is available by calling
- * uip_initialmss()).
- *
- * \hideinitializer
- */
-#define uip_mss()             (uip_conn->mss)
-
-/**
- * Set up a new UDP connection.
- *
- * This function sets up a new UDP connection. The function will
- * automatically allocate an unused local port for the new
- * connection. However, another port can be chosen by using the
- * uip_udp_bind() call, after the uip_udp_new() function has been
- * called.
- *
- * Example:
- \code
- uip_ipaddr_t addr;
- struct uip_udp_conn *c;
- 
- uip_ipaddr(&addr, 192,168,2,1);
- c = uip_udp_new(&addr, HTONS(12345));
- if(c != NULL) {
-   uip_udp_bind(c, HTONS(12344));
- }
- \endcode
- * \param ripaddr The IP address of the remote host.
- *
- * \param rport The remote port number in network byte order.
- *
- * \return The uip_udp_conn structure for the new connection or NULL
- * if no connection could be allocated.
- */
-struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
-
-/**
- * Removed a UDP connection.
- *
- * \param conn A pointer to the uip_udp_conn structure for the connection.
- *
- * \hideinitializer
- */
-#define uip_udp_remove(conn) (conn)->lport = 0
-
-/**
- * Bind a UDP connection to a local port.
- *
- * \param conn A pointer to the uip_udp_conn structure for the
- * connection.
- *
- * \param port The local port number, in network byte order.
- *
- * \hideinitializer
- */
-#define uip_udp_bind(conn, port) (conn)->lport = port
-
-/**
- * Send a UDP datagram of length len on the current connection.
- *
- * This function can only be called in response to a UDP event (poll
- * or newdata). The data must be present in the uip_buf buffer, at the
- * place pointed to by the uip_appdata pointer.
- *
- * \param len The length of the data in the uip_buf buffer.
- *
- * \hideinitializer
- */
-#define uip_udp_send(len) uip_send((char *)uip_appdata, len)
-
-/** @} */
-
-/* uIP convenience and converting functions. */
-
-/**
- * \defgroup uipconvfunc uIP conversion functions
- * @{
- *
- * These functions can be used for converting between different data
- * formats used by uIP.
- */
- 
-/**
- * Construct an IP address from four bytes.
- *
- * This function constructs an IP address of the type that uIP handles
- * internally from four bytes. The function is handy for specifying IP
- * addresses to use with e.g. the uip_connect() function.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr;
- struct uip_conn *c;
- 
- uip_ipaddr(&ipaddr, 192,168,1,2);
- c = uip_connect(&ipaddr, HTONS(80));
- \endcode
- *
- * \param addr A pointer to a uip_ipaddr_t variable that will be
- * filled in with the IP address.
- *
- * \param addr0 The first octet of the IP address.
- * \param addr1 The second octet of the IP address.
- * \param addr2 The third octet of the IP address.
- * \param addr3 The forth octet of the IP address.
- *
- * \hideinitializer
- */
-#define uip_ipaddr(addr, addr0,addr1,addr2,addr3) do { \
-                     ((u16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
-                     ((u16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
-                  } while(0)
-
-/**
- * Construct an IPv6 address from eight 16-bit words.
- *
- * This function constructs an IPv6 address.
- *
- * \hideinitializer
- */
-#define uip_ip6addr(addr, addr0,addr1,addr2,addr3,addr4,addr5,addr6,addr7) do { \
-                     ((u16_t *)(addr))[0] = HTONS((addr0)); \
-                     ((u16_t *)(addr))[1] = HTONS((addr1)); \
-                     ((u16_t *)(addr))[2] = HTONS((addr2)); \
-                     ((u16_t *)(addr))[3] = HTONS((addr3)); \
-                     ((u16_t *)(addr))[4] = HTONS((addr4)); \
-                     ((u16_t *)(addr))[5] = HTONS((addr5)); \
-                     ((u16_t *)(addr))[6] = HTONS((addr6)); \
-                     ((u16_t *)(addr))[7] = HTONS((addr7)); \
-                  } while(0)
-
-/**
- * Copy an IP address to another IP address.
- *
- * Copies an IP address from one place to another.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr1, ipaddr2;
-
- uip_ipaddr(&ipaddr1, 192,16,1,2);
- uip_ipaddr_copy(&ipaddr2, &ipaddr1);
- \endcode
- *
- * \param dest The destination for the copy.
- * \param src The source from where to copy.
- *
- * \hideinitializer
- */
-#if !UIP_CONF_IPV6
-void uip_ipaddr_copy(void *dest, const void *src);
-#else /* !UIP_CONF_IPV6 */
-#define uip_ipaddr_copy(dest, src) memcpy(dest, src, sizeof(uip_ip6addr_t))
-#endif /* !UIP_CONF_IPV6 */
-
-/**
- * Compare two IP addresses
- *
- * Compares two IP addresses.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr1, ipaddr2;
-
- uip_ipaddr(&ipaddr1, 192,16,1,2);
- if(uip_ipaddr_cmp(&ipaddr2, &ipaddr1)) {
-    printf("They are the same");
- }
- \endcode
- *
- * \param addr1 The first IP address.
- * \param addr2 The second IP address.
- *
- * \hideinitializer
- */
-#if !UIP_CONF_IPV6
-int uip_ipaddr_cmp(const void *addr1, const void *addr2);
-#define uip_ipaddr_is_multicast(addr) ((((u16_t *)addr)[0] & 0xff) == 224)
-#else /* !UIP_CONF_IPV6 */
-#define uip_ipaddr_cmp(addr1, addr2) (memcmp(addr1, addr2, sizeof(uip_ip6addr_t)) == 0)
-
-#endif /* !UIP_CONF_IPV6 */
-
-
-
-/**
- * Compare two IP addresses with netmasks
- *
- * Compares two IP addresses with netmasks. The masks are used to mask
- * out the bits that are to be compared.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr1, ipaddr2, mask;
-
- uip_ipaddr(&mask, 255,255,255,0);
- uip_ipaddr(&ipaddr1, 192,16,1,2);
- uip_ipaddr(&ipaddr2, 192,16,1,3);
- if(uip_ipaddr_maskcmp(&ipaddr1, &ipaddr2, &mask)) {
-    printf("They are the same");
- }
- \endcode
- *
- * \param addr1 The first IP address.
- * \param addr2 The second IP address.
- * \param mask The netmask.
- *
- * \hideinitializer
- */
-#define uip_ipaddr_maskcmp(addr1, addr2, mask) \
-                          (((((u16_t *)addr1)[0] & ((u16_t *)mask)[0]) == \
-                            (((u16_t *)addr2)[0] & ((u16_t *)mask)[0])) && \
-                           ((((u16_t *)addr1)[1] & ((u16_t *)mask)[1]) == \
-                            (((u16_t *)addr2)[1] & ((u16_t *)mask)[1])))
-
-
-/**
- * Mask out the network part of an IP address.
- *
- * Masks out the network part of an IP address, given the address and
- * the netmask.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr1, ipaddr2, netmask;
-
- uip_ipaddr(&ipaddr1, 192,16,1,2);
- uip_ipaddr(&netmask, 255,255,255,0);
- uip_ipaddr_mask(&ipaddr2, &ipaddr1, &netmask);
- \endcode
- *
- * In the example above, the variable "ipaddr2" will contain the IP
- * address 192.168.1.0.
- *
- * \param dest Where the result is to be placed.
- * \param src The IP address.
- * \param mask The netmask.
- *
- * \hideinitializer
- */
-#define uip_ipaddr_mask(dest, src, mask) do { \
-                     ((u16_t *)dest)[0] = ((u16_t *)src)[0] & ((u16_t *)mask)[0]; \
-                     ((u16_t *)dest)[1] = ((u16_t *)src)[1] & ((u16_t *)mask)[1]; \
-                  } while(0)
-
-/**
- * Pick the first octet of an IP address.
- *
- * Picks out the first octet of an IP address.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr;
- u8_t octet;
-
- uip_ipaddr(&ipaddr, 1,2,3,4);
- octet = uip_ipaddr1(&ipaddr);
- \endcode
- *
- * In the example above, the variable "octet" will contain the value 1.
- *
- * \hideinitializer
- */
-#define uip_ipaddr1(addr) (htons(((u16_t *)(addr))[0]) >> 8)
-
-/**
- * Pick the second octet of an IP address.
- *
- * Picks out the second octet of an IP address.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr;
- u8_t octet;
-
- uip_ipaddr(&ipaddr, 1,2,3,4);
- octet = uip_ipaddr2(&ipaddr);
- \endcode
- *
- * In the example above, the variable "octet" will contain the value 2.
- *
- * \hideinitializer
- */
-#define uip_ipaddr2(addr) (htons(((u16_t *)(addr))[0]) & 0xff)
-
-/**
- * Pick the third octet of an IP address.
- *
- * Picks out the third octet of an IP address.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr;
- u8_t octet;
-
- uip_ipaddr(&ipaddr, 1,2,3,4);
- octet = uip_ipaddr3(&ipaddr);
- \endcode
- *
- * In the example above, the variable "octet" will contain the value 3.
- *
- * \hideinitializer
- */
-#define uip_ipaddr3(addr) (htons(((u16_t *)(addr))[1]) >> 8)
-
-/**
- * Pick the fourth octet of an IP address.
- *
- * Picks out the fourth octet of an IP address.
- *
- * Example:
- \code
- uip_ipaddr_t ipaddr;
- u8_t octet;
-
- uip_ipaddr(&ipaddr, 1,2,3,4);
- octet = uip_ipaddr4(&ipaddr);
- \endcode
- *
- * In the example above, the variable "octet" will contain the value 4.
- *
- * \hideinitializer
- */
-#define uip_ipaddr4(addr) (htons(((u16_t *)(addr))[1]) & 0xff)
-
-/**
- * Convert 16-bit quantity from host byte order to network byte order.
- *
- * This macro is primarily used for converting constants from host
- * byte order to network byte order. For converting variables to
- * network byte order, use the htons() function instead.
- *
- * \hideinitializer
- */
-#ifndef HTONS
-#   if UIP_BYTE_ORDER == UIP_BIG_ENDIAN
-#      define HTONS(n) (n)
-#   else /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
-#      define HTONS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
-#   endif /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
-#else
-#error "HTONS already defined!"
-#endif /* HTONS */
-
-/**
- * Convert 16-bit quantity from host byte order to network byte order.
- *
- * This function is primarily used for converting variables from host
- * byte order to network byte order. For converting constants to
- * network byte order, use the HTONS() macro instead.
- */
-#ifndef htons
-u16_t htons(u16_t val);
-#endif /* htons */
-#ifndef ntohs
-#define ntohs htons
-#endif
-
-/** @} */
-
-/**
- * Pointer to the application data in the packet buffer.
- *
- * This pointer points to the application data when the application is
- * called. If the application wishes to send data, the application may
- * use this space to write the data into before calling uip_send().
- */
-extern void *uip_appdata;
-
-#if UIP_URGDATA > 0
-/* u8_t *uip_urgdata:
- *
- * This pointer points to any urgent data that has been received. Only
- * present if compiled with support for urgent data (UIP_URGDATA).
- */
-extern void *uip_urgdata;
-#endif /* UIP_URGDATA > 0 */
-
-
-/**
- * \defgroup uipdrivervars Variables used in uIP device drivers
- * @{
- *
- * uIP has a few global variables that are used in device drivers for
- * uIP.
- */
-
-/**
- * The length of the packet in the uip_buf buffer.
- *
- * The global variable uip_len holds the length of the packet in the
- * uip_buf buffer.
- *
- * When the network device driver calls the uIP input function,
- * uip_len should be set to the length of the packet in the uip_buf
- * buffer.
- *
- * When sending packets, the device driver should use the contents of
- * the uip_len variable to determine the length of the outgoing
- * packet.
- *
- */
-extern u16_t uip_len;
-
-/** @} */
-
-#if UIP_URGDATA > 0
-extern u16_t uip_urglen, uip_surglen;
-#endif /* UIP_URGDATA > 0 */
-
-
-/**
- * Representation of a uIP TCP connection.
- *
- * The uip_conn structure is used for identifying a connection. All
- * but one field in the structure are to be considered read-only by an
- * application. The only exception is the appstate field whos purpose
- * is to let the application store application-specific state (e.g.,
- * file pointers) for the connection. The type of this field is
- * configured in the "uipopt.h" header file.
- */
-
-struct uip_conn {
-  uip_ipaddr_t ripaddr;   /**< The IP address of the remote host. */
-  
-  u16_t lport;        /**< The local TCP port, in network byte order. */
-  u16_t rport;        /**< The local remote TCP port, in network byte
-			 order. */
-  
-  u8_t rcv_nxt[4];    /**< The sequence number that we expect to
-			 receive next. */
-  u8_t snd_nxt[4];    /**< The sequence number that was last sent by
-                         us. */
-  u16_t len;          /**< Length of the data that was previously sent. */
-  u16_t mss;          /**< Current maximum segment size for the
-			 connection. */
-  u16_t initialmss;   /**< Initial maximum segment size for the
-			 connection. */
-  u8_t sa;            /**< Retransmission time-out calculation state
-			 variable. */
-  u8_t sv;            /**< Retransmission time-out calculation state
-			 variable. */
-  u8_t rto;           /**< Retransmission time-out. */
-  u8_t tcpstateflags; /**< TCP state and flags. */
-  u8_t timer;         /**< The retransmission timer. */
-  u8_t nrtx;          /**< The number of retransmissions for the last
-			 segment sent. */
-
-#if UIP_SLIDING_WINDOW
-  u8_t midpoint;
-#endif
-  /** The application state. */
-  uip_tcp_appstate_t appstate;
-};
-
-/**
- * Pointer to the current TCP connection.
- *
- * The uip_conn pointer can be used to access the current TCP
- * connection.
- */
-extern struct uip_conn *uip_conn;
-/* The array containing all uIP connections. */
-extern struct uip_conn uip_conns[UIP_CONNS];
-/**
- * \addtogroup uiparch
- * @{
- */
-
-/**
- * 4-byte array used for the 32-bit sequence number calculations.
- */
-extern u8_t uip_acc32[4];
-
-/** @} */
-
-
-#if UIP_UDP
-/**
- * Representation of a uIP UDP connection.
- */
-struct uip_udp_conn {
-  uip_ipaddr_t ripaddr;   /**< The IP address of the remote peer. */
-  u16_t lport;        /**< The local port number in network byte order. */
-  u16_t rport;        /**< The remote port number in network byte order. */
-  u8_t  ttl;          /**< Default time-to-live. */
-  u8_t  udpflags;     /**< UDP state flags */
-
-  /** The application state. */
-  uip_udp_appstate_t appstate;
-};
-
-/* This flag is used when a udp packet isn't sent due to an arp request. 
- */
-#define UDP_PENDING_ARP 1
-
-/* This flag is used when a udp packet is succesfully sent
- */
-#define UDP_SENT 2
-
-/* This flag is used when a udp connection is a "server" connect i.e.
-   accepts packets from any source
- */
-#define UDP_IS_SERVER_CONN 4
-
-/**
- * The current UDP connection.
- */
-extern struct uip_udp_conn *uip_udp_conn;
-extern struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
-#endif /* UIP_UDP */
-
-/**
- * The structure holding the TCP/IP statistics that are gathered if
- * UIP_STATISTICS is set to 1.
- *
- */
-struct uip_stats {
-  struct {
-    uip_stats_t drop;     /**< Number of dropped packets at the IP
-			     layer. */
-    uip_stats_t recv;     /**< Number of received packets at the IP
-			     layer. */
-    uip_stats_t sent;     /**< Number of sent packets at the IP
-			     layer. */
-    uip_stats_t vhlerr;   /**< Number of packets dropped due to wrong
-			     IP version or header length. */
-    uip_stats_t hblenerr; /**< Number of packets dropped due to wrong
-			     IP length, high byte. */
-    uip_stats_t lblenerr; /**< Number of packets dropped due to wrong
-			     IP length, low byte. */
-    uip_stats_t fragerr;  /**< Number of packets dropped since they
-			     were IP fragments. */
-    uip_stats_t chkerr;   /**< Number of packets dropped due to IP
-			     checksum errors. */
-    uip_stats_t protoerr; /**< Number of packets dropped since they
-			     were neither ICMP, UDP nor TCP. */
-  } ip;                   /**< IP statistics. */
-  struct {
-    uip_stats_t drop;     /**< Number of dropped ICMP packets. */
-    uip_stats_t recv;     /**< Number of received ICMP packets. */
-    uip_stats_t sent;     /**< Number of sent ICMP packets. */
-    uip_stats_t typeerr;  /**< Number of ICMP packets with a wrong
-			     type. */
-  } icmp;                 /**< ICMP statistics. */
-  struct {
-    uip_stats_t drop;     /**< Number of dropped TCP segments. */
-    uip_stats_t recv;     /**< Number of recived TCP segments. */
-    uip_stats_t sent;     /**< Number of sent TCP segments. */
-    uip_stats_t chkerr;   /**< Number of TCP segments with a bad
-			     checksum. */
-    uip_stats_t ackerr;   /**< Number of TCP segments with a bad ACK
-			     number. */
-    uip_stats_t rst;      /**< Number of recevied TCP RST (reset) segments. */
-    uip_stats_t rexmit;   /**< Number of retransmitted TCP segments. */
-    uip_stats_t syndrop;  /**< Number of dropped SYNs due to too few
-			     connections was avaliable. */
-    uip_stats_t synrst;   /**< Number of SYNs for closed ports,
-			     triggering a RST. */
-  } tcp;                  /**< TCP statistics. */
-#if UIP_UDP
-  struct {
-    uip_stats_t drop;     /**< Number of dropped UDP segments. */
-    uip_stats_t recv;     /**< Number of recived UDP segments. */
-    uip_stats_t sent;     /**< Number of sent UDP segments. */
-    uip_stats_t chkerr;   /**< Number of UDP segments with a bad
-			     checksum. */
-  } udp;                  /**< UDP statistics. */
-#endif /* UIP_UDP */
-};
-
-/**
- * The uIP TCP/IP statistics.
- *
- * This is the variable in which the uIP TCP/IP statistics are gathered.
- */
-extern struct uip_stats uip_stat;
-
-
-/*---------------------------------------------------------------------------*/
-/* All the stuff below this point is internal to uIP and should not be
- * used directly by an application or by a device driver.
- */
-/*---------------------------------------------------------------------------*/
-/* u8_t uip_flags:
- *
- * When the application is called, uip_flags will contain the flags
- * that are defined in this file. Please read below for more
- * infomation.
- */
-extern u32_t uip_flags;
-
-/* The following flags may be set in the global variable uip_flags
-   before calling the application callback. The UIP_ACKDATA,
-   UIP_NEWDATA, and UIP_CLOSE flags may both be set at the same time,
-   whereas the others are mutualy exclusive. Note that these flags
-   should *NOT* be accessed directly, but only through the uIP
-   functions/macros. */
-
-#define UIP_ACKDATA   1     /* Signifies that the outstanding data was
-			       acked and the application should send
-			       out new data instead of retransmitting
-			       the last data. */
-#define UIP_NEWDATA   2     /* Flags the fact that the peer has sent
-			       us new data. */
-#define UIP_REXMIT    4     /* Tells the application to retransmit the
-			       data that was last sent. */
-#define UIP_POLL      8     /* Used for polling the application, to
-			       check if the application has data that
-			       it wants to send. */
-#define UIP_CLOSE     16    /* The remote host has closed the
-			       connection, thus the connection has
-			       gone away. Or the application signals
-			       that it wants to close the
-			       connection. */
-#define UIP_ABORT     32    /* The remote host has aborted the
-			       connection, thus the connection has
-			       gone away. Or the application signals
-			       that it wants to abort the
-			       connection. */
-#define UIP_CONNECTED 64    /* We have got a connection from a remote
-                               host and have set up a new connection
-                               for it, or an active connection has
-                               been successfully established. */
-
-#define UIP_TIMEDOUT  128   /* The connection has been aborted due to
-			       too many retransmissions. */
-
-#define UIP_TCP_PUSH   256   /* Flags the fact that the other side set the
-                               TCP_PUSH flag. */
-
-/* uip_process(flag):
- *
- * The actual uIP function which does all the work.
- */
-void uip_process(u8_t flag);
-
-/* The following flags are passed as an argument to the uip_process()
-   function. They are used to distinguish between the two cases where
-   uip_process() is called. It can be called either because we have
-   incoming data that should be processed, or because the periodic
-   timer has fired. These values are never used directly, but only in
-   the macrose defined in this file. */
- 
-#define UIP_DATA          1     /* Tells uIP that there is incoming
-				   data in the uip_buf buffer. The
-				   length of the data is stored in the
-				   global variable uip_len. */
-#define UIP_TIMER         2     /* Tells uIP that the periodic timer
-				   has fired. */
-#define UIP_POLL_REQUEST  3     /* Tells uIP that a connection should
-				   be polled. */
-#define UIP_UDP_SEND_CONN 4     /* Tells uIP that a UDP datagram
-				   should be constructed in the
-				   uip_buf buffer. */
-#if UIP_UDP
-#define UIP_UDP_TIMER         5
-#define UIP_UDP_ARP_EVENT     6
-#define UIP_UDP_ACKDATA       7
-#endif /* UIP_UDP */
-
-/* The TCP states used in the uip_conn->tcpstateflags. */
-#define UIP_CLOSED      0
-#define UIP_SYN_RCVD    1
-#define UIP_SYN_SENT    2
-#define UIP_ESTABLISHED 3
-#define UIP_FIN_WAIT_1  4
-#define UIP_FIN_WAIT_2  5
-#define UIP_CLOSING     6
-#define UIP_TIME_WAIT   7
-#define UIP_LAST_ACK    8
-#define UIP_TS_MASK     15
-  
-#define UIP_STOPPED      16
-
-/* The TCP and IP headers. */
-struct uip_tcpip_hdr {
-#if UIP_CONF_IPV6
-  /* IPv6 header. */
-  u8_t vtc,
-    tcflow;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
-  uip_ip6addr_t srcipaddr, destipaddr;
-#else /* UIP_CONF_IPV6 */
-  /* IPv4 header. */
-  u8_t vhl,
-    tos,
-    len[2],
-    ipid[2],
-    ipoffset[2],
-    ttl,
-    proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
-    destipaddr[2];
-#endif /* UIP_CONF_IPV6 */
-  
-  /* TCP header. */
-  u16_t srcport,
-    destport;
-  u8_t seqno[4],
-    ackno[4],
-    tcpoffset,
-    flags,
-    wnd[2];
-  u16_t tcpchksum;
-  u8_t urgp[2];
-  u8_t optdata[4];
-};
-
-/* The ICMP and IP headers. */
-struct uip_icmpip_hdr {
-#if UIP_CONF_IPV6
-  /* IPv6 header. */
-  u8_t vtc,
-    tcf;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
-  uip_ip6addr_t srcipaddr, destipaddr;
-#else /* UIP_CONF_IPV6 */
-  /* IPv4 header. */
-  u8_t vhl,
-    tos,
-    len[2],
-    ipid[2],
-    ipoffset[2],
-    ttl,
-    proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
-    destipaddr[2];
-#endif /* UIP_CONF_IPV6 */
-  
-  /* ICMP (echo) header. */
-  u8_t type, icode;
-  u16_t icmpchksum;
-#if !UIP_CONF_IPV6
-  u16_t id, seqno;
-#else /* !UIP_CONF_IPV6 */
-  u8_t flags, reserved1, reserved2, reserved3;
-  u8_t icmp6data[16];
-  u8_t options[1];
-#endif /* !UIP_CONF_IPV6 */
-};
-
-
-/* The UDP and IP headers. */
-struct uip_udpip_hdr {
-#if UIP_CONF_IPV6
-  /* IPv6 header. */
-  u8_t vtc,
-    tcf;
-  u16_t flow;
-  u8_t len[2];
-  u8_t proto, ttl;
-  uip_ip6addr_t srcipaddr, destipaddr;
-#else /* UIP_CONF_IPV6 */
-  /* IP header. */
-  u8_t vhl,
-    tos,
-    len[2],
-    ipid[2],
-    ipoffset[2],
-    ttl,
-    proto;
-  u16_t ipchksum;
-  u16_t srcipaddr[2],
-    destipaddr[2];
-#endif /* UIP_CONF_IPV6 */
-  
-  /* UDP header. */
-  u16_t srcport,
-    destport;
-  u16_t udplen;
-  u16_t udpchksum;
-};
-
-
-
-/**
- * The buffer size available for user data in the \ref uip_buf buffer.
- *
- * This macro holds the available size for user data in the \ref
- * uip_buf buffer. The macro is intended to be used for checking
- * bounds of available user data.
- *
- * Example:
- \code
- snprintf(uip_appdata, UIP_APPDATA_SIZE, "%u\n", i);
- \endcode
- *
- * \hideinitializer
- */
-#define UIP_APPDATA_SIZE (UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN)
-
-
-#define UIP_PROTO_ICMP  1
-#define UIP_PROTO_IGMP   6
-#define UIP_PROTO_TCP   6
-#define UIP_PROTO_UDP   17
-#define UIP_PROTO_ICMP6 58
-
-/* Header sizes. */
-#if UIP_CONF_IPV6
-#define UIP_IPH_LEN    40
-#else /* UIP_CONF_IPV6 */
-#define UIP_IPH_LEN    20    /* Size of IP header */
-#endif /* UIP_CONF_IPV6 */
-#define UIP_UDPH_LEN    8    /* Size of UDP header */
-#define UIP_TCPH_LEN   20    /* Size of TCP header */
-#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN)    /* Size of IP +
-							  UDP
-							  header */
-#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN)    /* Size of IP +
-							  TCP
-							  header */
-#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN
-
-
-#if UIP_FIXEDADDR
-extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
-#else /* UIP_FIXEDADDR */
-extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
-#endif /* UIP_FIXEDADDR */
-
-
-
-/**
- * Representation of a 48-bit Ethernet address.
- */
-struct uip_eth_addr {
-  u8_t addr[6];
-};
-
-/**
- * Calculate the Internet checksum over a buffer.
- *
- * The Internet checksum is the one's complement of the one's
- * complement sum of all 16-bit words in the buffer.
- *
- * See RFC1071.
- *
- * \param buf A pointer to the buffer over which the checksum is to be
- * computed.
- *
- * \param len The length of the buffer over which the checksum is to
- * be computed.
- *
- * \return The Internet checksum of the buffer.
- */
-u16_t uip_chksum(u16_t *buf, u16_t len);
-
-/**
- * Calculate the IP header checksum of the packet header in uip_buf.
- *
- * The IP header checksum is the Internet checksum of the 20 bytes of
- * the IP header.
- *
- * \return The IP header checksum of the IP header in the uip_buf
- * buffer.
- */
-u16_t uip_ipchksum(void);
-
-/**
- * Calculate the TCP checksum of the packet in uip_buf and uip_appdata.
- *
- * The TCP checksum is the Internet checksum of data contents of the
- * TCP segment, and a pseudo-header as defined in RFC793.
- *
- * \return The TCP checksum of the TCP segment in uip_buf and pointed
- * to by uip_appdata.
- */
-u16_t uip_tcpchksum(void);
-
-/**
- * Calculate the UDP checksum of the packet in uip_buf and uip_appdata.
- *
- * The UDP checksum is the Internet checksum of data contents of the
- * UDP segment, and a pseudo-header as defined in RFC768.
- *
- * \return The UDP checksum of the UDP segment in uip_buf and pointed
- * to by uip_appdata.
- */
-u16_t uip_udpchksum(void);
-
-
-#endif /* __UIP_H__ */
-
-
-/** @} */
+// Copyright (c) 2011, XMOS Ltd, All rights reserved
+// This software is freely distributable under a derivative of the
+// University of Illinois/NCSA Open Source License posted in
+// LICENSE.txt and at <http://github.xcore.com/>
+
+
+
+/**
+ * \addtogroup uip
+ * @{
+ */
+
+/**
+ * \file
+ * Header file for the uIP TCP/IP stack.
+ * \author Adam Dunkels <adam@dunkels.com>
+ *
+ * The uIP TCP/IP stack header file contains definitions for a number
+ * of C macros that are used by uIP programs as well as internal uIP
+ * structures, TCP/IP header structures and function declarations.
+ *
+ */
+
+
+/*
+ * Copyright (c) 2001-2003, Adam Dunkels.
+ * 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 uIP TCP/IP stack.
+ *
+ * $Id: uip.h,v 1.40 2006/06/08 07:12:07 adam Exp $
+ *
+ */
+
+#ifndef __UIP_H__
+#define __UIP_H__
+
+#include "uipopt.h"
+
+/**
+ * Repressentation of an IP address.
+ *
+ */
+typedef u16_t uip_ip4addr_t[2];
+typedef u16_t uip_ip6addr_t[8];
+#if UIP_CONF_IPV6
+typedef uip_ip6addr_t uip_ipaddr_t;
+#else /* UIP_CONF_IPV6 */
+typedef uip_ip4addr_t uip_ipaddr_t;
+#endif /* UIP_CONF_IPV6 */
+
+void uip_setsubnetaddr(void);
+
+/*---------------------------------------------------------------------------*/
+/* First, the functions that should be called from the
+ * system. Initialization, the periodic timer and incoming packets are
+ * handled by the following three functions.
+ */
+
+/**
+ * \defgroup uipconffunc uIP configuration functions
+ * @{
+ *
+ * The uIP configuration functions are used for setting run-time
+ * parameters in uIP such as IP addresses.
+ */
+
+/**
+ * Set the IP address of this host.
+ *
+ * The IP address is represented as a 4-byte array where the first
+ * octet of the IP address is put in the first member of the 4-byte
+ * array.
+ *
+ * Example:
+ \code
+
+ uip_ipaddr_t addr;
+
+ uip_ipaddr(&addr, 192,168,1,2);
+ uip_sethostaddr(&addr);
+
+ \endcode
+ * \param addr A pointer to an IP address of type uip_ipaddr_t;
+ *
+ * \sa uip_ipaddr()
+ *
+ * \hideinitializer
+ */
+#define uip_sethostaddr(addr) uip_ipaddr_copy(uip_hostaddr, (addr))
+
+/**
+ * Get the IP address of this host.
+ *
+ * The IP address is represented as a 4-byte array where the first
+ * octet of the IP address is put in the first member of the 4-byte
+ * array.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t hostaddr;
+
+ uip_gethostaddr(&hostaddr);
+ \endcode
+ * \param addr A pointer to a uip_ipaddr_t variable that will be
+ * filled in with the currently configured IP address.
+ *
+ * \hideinitializer
+ */
+#define uip_gethostaddr(addr) uip_ipaddr_copy((addr), uip_hostaddr)
+
+/**
+ * Set the default router's IP address.
+ *
+ * \param addr A pointer to a uip_ipaddr_t variable containing the IP
+ * address of the default router.
+ *
+ * \sa uip_ipaddr()
+ *
+ * \hideinitializer
+ */
+#define uip_setdraddr(addr) uip_ipaddr_copy(uip_draddr, (addr))
+
+/**
+ * Set the netmask.
+ *
+ * \param addr A pointer to a uip_ipaddr_t variable containing the IP
+ * address of the netmask.
+ *
+ * \sa uip_ipaddr()
+ *
+ * \hideinitializer
+ */
+#define uip_setnetmask(addr) uip_ipaddr_copy(uip_netmask, (addr))
+
+
+/**
+ * Get the default router's IP address.
+ *
+ * \param addr A pointer to a uip_ipaddr_t variable that will be
+ * filled in with the IP address of the default router.
+ *
+ * \hideinitializer
+ */
+#define uip_getdraddr(addr) uip_ipaddr_copy((addr), uip_draddr)
+
+/**
+ * Get the netmask.
+ *
+ * \param addr A pointer to a uip_ipaddr_t variable that will be
+ * filled in with the value of the netmask.
+ *
+ * \hideinitializer
+ */
+#define uip_getnetmask(addr) uip_ipaddr_copy((addr), uip_netmask)
+
+/** @} */
+
+/**
+ * \defgroup uipinit uIP initialization functions
+ * @{
+ *
+ * The uIP initialization functions are used for booting uIP.
+ */
+
+/**
+ * uIP initialization function.
+ *
+ * This function should be called at boot up to initilize the uIP
+ * TCP/IP stack.
+ */
+void uip_init(void);
+
+/**
+ * uIP initialization function.
+ *
+ * This function may be used at boot time to set the initial ip_id.
+ */
+void uip_setipid(u16_t id);
+
+/** @} */
+
+/**
+ * \defgroup uipdevfunc uIP device driver functions
+ * @{
+ *
+ * These functions are used by a network device driver for interacting
+ * with uIP.
+ */
+
+/**
+ * Process an incoming packet.
+ *
+ * This function should be called when the device driver has received
+ * a packet from the network. The packet from the device driver must
+ * be present in the uip_buf buffer, and the length of the packet
+ * should be placed in the uip_len variable.
+ *
+ * When the function returns, there may be an outbound packet placed
+ * in the uip_buf packet buffer. If so, the uip_len variable is set to
+ * the length of the packet. If no packet is to be sent out, the
+ * uip_len variable is set to 0.
+ *
+ * The usual way of calling the function is presented by the source
+ * code below.
+ \code
+  uip_len = devicedriver_poll();
+  if(uip_len > 0) {
+    uip_input();
+    if(uip_len > 0) {
+      devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ * \note If you are writing a uIP device driver that needs ARP
+ * (Address Resolution Protocol), e.g., when running uIP over
+ * Ethernet, you will need to call the uIP ARP code before calling
+ * this function:
+ \code
+  #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
+  uip_len = ethernet_devicedrver_poll();
+  if(uip_len > 0) {
+    if(BUF->type == HTONS(UIP_ETHTYPE_IP)) {
+      uip_arp_ipin();
+      uip_input();
+      if(uip_len > 0) {
+        uip_arp_out();
+	ethernet_devicedriver_send();
+      }
+    } else if(BUF->type == HTONS(UIP_ETHTYPE_ARP)) {
+      uip_arp_arpin();
+      if(uip_len > 0) {
+	ethernet_devicedriver_send();
+      }
+    }
+ \endcode
+ *
+ * \hideinitializer
+ */
+#define uip_input()        uip_process(UIP_DATA)
+
+/**
+ * Periodic processing for a connection identified by its number.
+ *
+ * This function does the necessary periodic processing (timers,
+ * polling) for a uIP TCP conneciton, and should be called when the
+ * periodic uIP timer goes off. It should be called for every
+ * connection, regardless of whether they are open of closed.
+ *
+ * When the function returns, it may have an outbound packet waiting
+ * for service in the uIP packet buffer, and if so the uip_len
+ * variable is set to a value larger than zero. The device driver
+ * should be called to send out the packet.
+ *
+ * The ususal way of calling the function is through a for() loop like
+ * this:
+ \code
+  for(i = 0; i < UIP_CONNS; ++i) {
+    uip_periodic(i);
+    if(uip_len > 0) {
+      devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ * \note If you are writing a uIP device driver that needs ARP
+ * (Address Resolution Protocol), e.g., when running uIP over
+ * Ethernet, you will need to call the uip_arp_out() function before
+ * calling the device driver:
+ \code
+  for(i = 0; i < UIP_CONNS; ++i) {
+    uip_periodic(i);
+    if(uip_len > 0) {
+      uip_arp_out();
+      ethernet_devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ * \param conn The number of the connection which is to be periodically polled.
+ *
+ * \hideinitializer
+ */
+#define uip_periodic(conn) do { uip_conn = &uip_conns[conn]; \
+                                uip_process(UIP_TIMER); } while (0)
+
+/**
+ *
+ *
+ */
+#define uip_conn_active(conn) (uip_conns[conn].tcpstateflags != UIP_CLOSED)
+
+/**
+ * Perform periodic processing for a connection identified by a pointer
+ * to its structure.
+ *
+ * Same as uip_periodic() but takes a pointer to the actual uip_conn
+ * struct instead of an integer as its argument. This function can be
+ * used to force periodic processing of a specific connection.
+ *
+ * \param conn A pointer to the uip_conn struct for the connection to
+ * be processed.
+ *
+ * \hideinitializer
+ */
+#define uip_periodic_conn(conn) do { uip_conn = conn; \
+                                     uip_process(UIP_TIMER); } while (0)
+
+/**
+ * Reuqest that a particular connection should be polled.
+ *
+ * Similar to uip_periodic_conn() but does not perform any timer
+ * processing. The application is polled for new data.
+ *
+ * \param conn A pointer to the uip_conn struct for the connection to
+ * be processed.
+ *
+ * \hideinitializer
+ */
+#define uip_poll_conn(conn) do { uip_conn = conn; \
+                                 uip_process(UIP_POLL_REQUEST); } while (0)
+
+
+#if UIP_UDP
+/**
+ * Periodic processing for a UDP connection identified by its number.
+ *
+ * This function is essentially the same as uip_periodic(), but for
+ * UDP connections. It is called in a similar fashion as the
+ * uip_periodic() function:
+ \code
+  for(i = 0; i < UIP_UDP_CONNS; i++) {
+    uip_udp_periodic(i);
+    if(uip_len > 0) {
+      devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ * \note As for the uip_periodic() function, special care has to be
+ * taken when using uIP together with ARP and Ethernet:
+ \code
+  for(i = 0; i < UIP_UDP_CONNS; i++) {
+    uip_udp_periodic(i);
+    if(uip_len > 0) {
+      uip_arp_out();
+      ethernet_devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ * \param conn The number of the UDP connection to be processed.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_periodic(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
+                                uip_process(UIP_UDP_TIMER); } while (0)
+
+
+/**
+ * Processing of a UDP connection after an ARP reply.
+ *
+ * This function handles udp connections after an arp reply comes in. Possibly
+ * retransmitting datagrams that were not transmitted due to having to create
+ * an arp request before.
+ *
+ \code
+  uip_arp_arpin();
+  if(uip_len > 0) {
+    devicedriver_send();
+  }
+  for(i = 0; i < UIP_UDP_CONNS; i++) {
+    uip_udp_arp_event(i);
+    if(uip_len > 0) {
+      devicedriver_send();
+    }
+  }
+ \endcode
+ *
+ *
+ * \param conn The number of the UDP connection to be processed.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_arp_event(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
+                                uip_process(UIP_UDP_ARP_EVENT); } while (0)
+
+
+#define uip_udp_conn_has_ack(conn) ((conn)->udpflags & UDP_SENT)
+
+#define uip_udp_ackdata(conn) do { uip_udp_conn = &uip_udp_conns[conn]; \
+                                uip_process(UIP_UDP_ACKDATA); } while (0)
+
+/**
+ * Periodic processing for a UDP connection identified by a pointer to
+ * its structure.
+ *
+ * Same as uip_udp_periodic() but takes a pointer to the actual
+ * uip_conn struct instead of an integer as its argument. This
+ * function can be used to force periodic processing of a specific
+ * connection.
+ *
+ * \param conn A pointer to the uip_udp_conn struct for the connection
+ * to be processed.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_periodic_conn(conn) do { uip_udp_conn = conn; \
+                                         uip_process(UIP_UDP_TIMER); } while (0)
+
+
+#endif /* UIP_UDP */
+
+/**
+ * The uIP packet buffer.
+ *
+ * The uip_buf array is used to hold incoming and outgoing
+ * packets. The device driver should place incoming data into this
+ * buffer. When sending data, the device driver should read the link
+ * level headers and the TCP/IP headers from this buffer. The size of
+ * the link level headers is configured by the UIP_LLH_LEN define.
+ *
+ * \note The application data need not be placed in this buffer, so
+ * the device driver must read it from the place pointed to by the
+ * uip_appdata pointer as illustrated by the following example:
+ \code
+ void
+ devicedriver_send(void)
+ {
+    hwsend(&uip_buf[0], UIP_LLH_LEN);
+    if(uip_len <= UIP_LLH_LEN + UIP_TCPIP_HLEN) {
+      hwsend(&uip_buf[UIP_LLH_LEN], uip_len - UIP_LLH_LEN);
+    } else {
+      hwsend(&uip_buf[UIP_LLH_LEN], UIP_TCPIP_HLEN);
+      hwsend(uip_appdata, uip_len - UIP_TCPIP_HLEN - UIP_LLH_LEN);
+    }
+ }
+ \endcode
+ */
+//extern u8_t uip_buf[UIP_BUFSIZE+2];
+extern u8_t *uip_buf;
+
+/** @} */
+
+/*---------------------------------------------------------------------------*/
+/* Functions that are used by the uIP application program. Opening and
+ * closing connections, sending and receiving data, etc. is all
+ * handled by the functions below.
+*/
+/**
+ * \defgroup uipappfunc uIP application functions
+ * @{
+ *
+ * Functions used by an application running of top of uIP.
+ */
+
+/**
+ * Start listening to the specified port.
+ *
+ * \note Since this function expects the port number in network byte
+ * order, a conversion using HTONS() or htons() is necessary.
+ *
+ \code
+ uip_listen(HTONS(80));
+ \endcode
+ *
+ * \param port A 16-bit port number in network byte order.
+ */
+void uip_listen(u16_t port);
+void uip_udp_listen(u16_t port);
+
+/**
+ * Stop listening to the specified port.
+ *
+ * \note Since this function expects the port number in network byte
+ * order, a conversion using HTONS() or htons() is necessary.
+ *
+ \code
+ uip_unlisten(HTONS(80));
+ \endcode
+ *
+ * \param port A 16-bit port number in network byte order.
+ */
+void uip_unlisten(u16_t port);
+void uip_udp_unlisten(u16_t port);
+
+/**
+ * Connect to a remote host using TCP.
+ *
+ * This function is used to start a new connection to the specified
+ * port on the specied host. It allocates a new connection identifier,
+ * sets the connection to the SYN_SENT state and sets the
+ * retransmission timer to 0. This will cause a TCP SYN segment to be
+ * sent out the next time this connection is periodically processed,
+ * which usually is done within 0.5 seconds after the call to
+ * uip_connect().
+ *
+ * \note This function is avaliable only if support for active open
+ * has been configured by defining UIP_ACTIVE_OPEN to 1 in uipopt.h.
+ *
+ * \note Since this function requires the port number to be in network
+ * byte order, a conversion using HTONS() or htons() is necessary.
+ *
+ \code
+ uip_ipaddr_t ipaddr;
+
+ uip_ipaddr(&ipaddr, 192,168,1,2);
+ uip_connect(&ipaddr, HTONS(80));
+ \endcode
+ *
+ * \param ripaddr The IP address of the remote hot.
+ *
+ * \param port A 16-bit port number in network byte order.
+ *
+ * \return A pointer to the uIP connection identifier for the new connection,
+ * or NULL if no connection could be allocated.
+ *
+ */
+struct uip_conn *uip_connect(uip_ipaddr_t *ripaddr, u16_t port);
+
+
+
+/**
+ * \internal
+ *
+ * Check if a connection has outstanding (i.e., unacknowledged) data.
+ *
+ * \param conn A pointer to the uip_conn structure for the connection.
+ *
+ * \hideinitializer
+ */
+#define uip_outstanding(conn) ((conn)->len)
+
+/**
+ * Send data on the current connection.
+ *
+ * This function is used to send out a single segment of TCP
+ * data. Only applications that have been invoked by uIP for event
+ * processing can send data.
+ *
+ * The amount of data that actually is sent out after a call to this
+ * funcion is determined by the maximum amount of data TCP allows. uIP
+ * will automatically crop the data so that only the appropriate
+ * amount of data is sent. The function uip_mss() can be used to query
+ * uIP for the amount of data that actually will be sent.
+ *
+ * \note This function does not guarantee that the sent data will
+ * arrive at the destination. If the data is lost in the network, the
+ * application will be invoked with the uip_rexmit() event being
+ * set. The application will then have to resend the data using this
+ * function.
+ *
+ * \param data A pointer to the data which is to be sent.
+ *
+ * \param len The maximum amount of data bytes to be sent.
+ *
+ * \hideinitializer
+ */
+void uip_send(const void *data, int len);
+
+/**
+ * The length of any incoming data that is currently avaliable (if avaliable)
+ * in the uip_appdata buffer.
+ *
+ * The test function uip_data() must first be used to check if there
+ * is any data available at all.
+ *
+ * \hideinitializer
+ */
+/*void uip_datalen(void);*/
+#define uip_datalen()       uip_len
+
+/**
+ * The length of any out-of-band data (urgent data) that has arrived
+ * on the connection.
+ *
+ * \note The configuration parameter UIP_URGDATA must be set for this
+ * function to be enabled.
+ *
+ * \hideinitializer
+ */
+#define uip_urgdatalen()    uip_urglen
+
+/**
+ * Close the current connection.
+ *
+ * This function will close the current connection in a nice way.
+ *
+ * \hideinitializer
+ */
+#define uip_close()         (uip_flags = UIP_CLOSE)
+
+/**
+ * Abort the current connection.
+ *
+ * This function will abort (reset) the current connection, and is
+ * usually used when an error has occured that prevents using the
+ * uip_close() function.
+ *
+ * \hideinitializer
+ */
+#define uip_abort()         (uip_flags = UIP_ABORT)
+
+/**
+ * Tell the sending host to stop sending data.
+ *
+ * This function will close our receiver's window so that we stop
+ * receiving data for the current connection.
+ *
+ * \hideinitializer
+ */
+#define uip_stop()          (uip_conn->tcpstateflags |= UIP_STOPPED)
+
+/**
+ * Find out if the current connection has been previously stopped with
+ * uip_stop().
+ *
+ * \hideinitializer
+ */
+#define uip_stopped(conn)   ((conn)->tcpstateflags & UIP_STOPPED)
+
+/**
+ * Restart the current connection, if is has previously been stopped
+ * with uip_stop().
+ *
+ * This function will open the receiver's window again so that we
+ * start receiving data for the current connection.
+ *
+ * \hideinitializer
+ */
+#define uip_restart()         do { uip_flags |= UIP_NEWDATA; \
+                                   uip_conn->tcpstateflags &= ~UIP_STOPPED; \
+                              } while(0)
+
+
+/* uIP tests that can be made to determine in what state the current
+   connection is, and what the application function should do. */
+
+/**
+ * Is the current connection a UDP connection?
+ *
+ * This function checks whether the current connection is a UDP connection.
+ *
+ * \hideinitializer
+ *
+ */
+#define uip_udpconnection() (uip_conn == NULL)
+
+/**
+ * Is new incoming data available?
+ *
+ * Will reduce to non-zero if there is new data for the application
+ * present at the uip_appdata pointer. The size of the data is
+ * avaliable through the uip_len variable.
+ *
+ * \hideinitializer
+ */
+#define uip_newdata()   (uip_flags & UIP_NEWDATA)
+
+/**
+ * Has previously sent data been acknowledged?
+ *
+ * Will reduce to non-zero if the previously sent data has been
+ * acknowledged by the remote host. This means that the application
+ * can send new data.
+ *
+ * \hideinitializer
+ */
+#define uip_acked()   (uip_flags & UIP_ACKDATA)
+
+/**
+ * Has the connection just been connected?
+ *
+ * Reduces to non-zero if the current connection has been connected to
+ * a remote host. This will happen both if the connection has been
+ * actively opened (with uip_connect()) or passively opened (with
+ * uip_listen()).
+ *
+ * \hideinitializer
+ */
+#define uip_connected() (uip_flags & UIP_CONNECTED)
+
+/**
+ * Has the connection been closed by the other end?
+ *
+ * Is non-zero if the connection has been closed by the remote
+ * host. The application may then do the necessary clean-ups.
+ *
+ * \hideinitializer
+ */
+#define uip_closed()    (uip_flags & UIP_CLOSE)
+
+
+/**
+ * Has the other end just sent a packet with the PUSH flag sent
+ *
+ * \hideinitializer
+ */
+#define uip_tcp_push()    (uip_flags & UIP_TCP_PUSH)
+
+/**
+ * Has the connection been aborted by the other end?
+ *
+ * Non-zero if the current connection has been aborted (reset) by the
+ * remote host.
+ *
+ * \hideinitializer
+ */
+#define uip_aborted()    (uip_flags & UIP_ABORT)
+
+/**
+ * Has the connection timed out?
+ *
+ * Non-zero if the current connection has been aborted due to too many
+ * retransmissions.
+ *
+ * \hideinitializer
+ */
+#define uip_timedout()    (uip_flags & UIP_TIMEDOUT)
+
+/**
+ * Do we need to retransmit previously data?
+ *
+ * Reduces to non-zero if the previously sent data has been lost in
+ * the network, and the application should retransmit it. The
+ * application should send the exact same data as it did the last
+ * time, using the uip_send() function.
+ *
+ * \hideinitializer
+ */
+#define uip_rexmit()     (uip_flags & UIP_REXMIT)
+
+/**
+ * Is the connection being polled by uIP?
+ *
+ * Is non-zero if the reason the application is invoked is that the
+ * current connection has been idle for a while and should be
+ * polled.
+ *
+ * The polling event can be used for sending data without having to
+ * wait for the remote host to send data.
+ *
+ * \hideinitializer
+ */
+#define uip_poll()       (uip_flags & UIP_POLL)
+
+/**
+ * Get the initial maxium segment size (MSS) of the current
+ * connection.
+ *
+ * \hideinitializer
+ */
+#define uip_initialmss()             (uip_conn->initialmss)
+
+/**
+ * Get the current maxium segment size that can be sent on the current
+ * connection.
+ *
+ * The current maxiumum segment size that can be sent on the
+ * connection is computed from the receiver's window and the MSS of
+ * the connection (which also is available by calling
+ * uip_initialmss()).
+ *
+ * \hideinitializer
+ */
+#define uip_mss()             (uip_conn->mss)
+
+/**
+ * Set up a new UDP connection.
+ *
+ * This function sets up a new UDP connection. The function will
+ * automatically allocate an unused local port for the new
+ * connection. However, another port can be chosen by using the
+ * uip_udp_bind() call, after the uip_udp_new() function has been
+ * called.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t addr;
+ struct uip_udp_conn *c;
+
+ uip_ipaddr(&addr, 192,168,2,1);
+ c = uip_udp_new(&addr, HTONS(12345));
+ if(c != NULL) {
+   uip_udp_bind(c, HTONS(12344));
+ }
+ \endcode
+ * \param ripaddr The IP address of the remote host.
+ *
+ * \param rport The remote port number in network byte order.
+ *
+ * \return The uip_udp_conn structure for the new connection or NULL
+ * if no connection could be allocated.
+ */
+struct uip_udp_conn *uip_udp_new(uip_ipaddr_t *ripaddr, u16_t rport);
+
+/**
+ * Removed a UDP connection.
+ *
+ * \param conn A pointer to the uip_udp_conn structure for the connection.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_remove(conn) (conn)->lport = 0
+
+/**
+ * Bind a UDP connection to a local port.
+ *
+ * \param conn A pointer to the uip_udp_conn structure for the
+ * connection.
+ *
+ * \param port The local port number, in network byte order.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_bind(conn, port) (conn)->lport = port
+
+/**
+ * Send a UDP datagram of length len on the current connection.
+ *
+ * This function can only be called in response to a UDP event (poll
+ * or newdata). The data must be present in the uip_buf buffer, at the
+ * place pointed to by the uip_appdata pointer.
+ *
+ * \param len The length of the data in the uip_buf buffer.
+ *
+ * \hideinitializer
+ */
+#define uip_udp_send(len) uip_send((char *)uip_appdata, len)
+
+/** @} */
+
+/* uIP convenience and converting functions. */
+
+/**
+ * \defgroup uipconvfunc uIP conversion functions
+ * @{
+ *
+ * These functions can be used for converting between different data
+ * formats used by uIP.
+ */
+
+/**
+ * Construct an IP address from four bytes.
+ *
+ * This function constructs an IP address of the type that uIP handles
+ * internally from four bytes. The function is handy for specifying IP
+ * addresses to use with e.g. the uip_connect() function.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr;
+ struct uip_conn *c;
+
+ uip_ipaddr(&ipaddr, 192,168,1,2);
+ c = uip_connect(&ipaddr, HTONS(80));
+ \endcode
+ *
+ * \param addr A pointer to a uip_ipaddr_t variable that will be
+ * filled in with the IP address.
+ *
+ * \param addr0 The first octet of the IP address.
+ * \param addr1 The second octet of the IP address.
+ * \param addr2 The third octet of the IP address.
+ * \param addr3 The forth octet of the IP address.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr(addr, addr0,addr1,addr2,addr3) do { \
+                     ((u16_t *)(addr))[0] = HTONS(((addr0) << 8) | (addr1)); \
+                     ((u16_t *)(addr))[1] = HTONS(((addr2) << 8) | (addr3)); \
+                  } while(0)
+
+/**
+ * Construct an IPv6 address from eight 16-bit words.
+ *
+ * This function constructs an IPv6 address.
+ *
+ * \hideinitializer
+ */
+#define uip_ip6addr(addr, addr0,addr1,addr2,addr3,addr4,addr5,addr6,addr7) do { \
+                     ((u16_t *)(addr))[0] = HTONS((addr0)); \
+                     ((u16_t *)(addr))[1] = HTONS((addr1)); \
+                     ((u16_t *)(addr))[2] = HTONS((addr2)); \
+                     ((u16_t *)(addr))[3] = HTONS((addr3)); \
+                     ((u16_t *)(addr))[4] = HTONS((addr4)); \
+                     ((u16_t *)(addr))[5] = HTONS((addr5)); \
+                     ((u16_t *)(addr))[6] = HTONS((addr6)); \
+                     ((u16_t *)(addr))[7] = HTONS((addr7)); \
+                  } while(0)
+
+/**
+ * Copy an IP address to another IP address.
+ *
+ * Copies an IP address from one place to another.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr1, ipaddr2;
+
+ uip_ipaddr(&ipaddr1, 192,16,1,2);
+ uip_ipaddr_copy(&ipaddr2, &ipaddr1);
+ \endcode
+ *
+ * \param dest The destination for the copy.
+ * \param src The source from where to copy.
+ *
+ * \hideinitializer
+ */
+#if !UIP_CONF_IPV6
+void uip_ipaddr_copy(void *dest, const void *src);
+#else /* !UIP_CONF_IPV6 */
+#define uip_ipaddr_copy(dest, src) memcpy(dest, src, sizeof(uip_ip6addr_t))
+#endif /* !UIP_CONF_IPV6 */
+
+/**
+ * Compare two IP addresses
+ *
+ * Compares two IP addresses.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr1, ipaddr2;
+
+ uip_ipaddr(&ipaddr1, 192,16,1,2);
+ if(uip_ipaddr_cmp(&ipaddr2, &ipaddr1)) {
+    printf("They are the same");
+ }
+ \endcode
+ *
+ * \param addr1 The first IP address.
+ * \param addr2 The second IP address.
+ *
+ * \hideinitializer
+ */
+#if !UIP_CONF_IPV6
+int uip_ipaddr_cmp(const void *addr1, const void *addr2);
+#define uip_ipaddr_is_multicast(addr) ((((u16_t *)addr)[0] & 0xff) == 224)
+#else /* !UIP_CONF_IPV6 */
+#define uip_ipaddr_cmp(addr1, addr2) (memcmp(addr1, addr2, sizeof(uip_ip6addr_t)) == 0)
+
+#endif /* !UIP_CONF_IPV6 */
+
+
+
+/**
+ * Compare two IP addresses with netmasks
+ *
+ * Compares two IP addresses with netmasks. The masks are used to mask
+ * out the bits that are to be compared.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr1, ipaddr2, mask;
+
+ uip_ipaddr(&mask, 255,255,255,0);
+ uip_ipaddr(&ipaddr1, 192,16,1,2);
+ uip_ipaddr(&ipaddr2, 192,16,1,3);
+ if(uip_ipaddr_maskcmp(&ipaddr1, &ipaddr2, &mask)) {
+    printf("They are the same");
+ }
+ \endcode
+ *
+ * \param addr1 The first IP address.
+ * \param addr2 The second IP address.
+ * \param mask The netmask.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr_maskcmp(addr1, addr2, mask) \
+                          (((((u16_t *)addr1)[0] & ((u16_t *)mask)[0]) == \
+                            (((u16_t *)addr2)[0] & ((u16_t *)mask)[0])) && \
+                           ((((u16_t *)addr1)[1] & ((u16_t *)mask)[1]) == \
+                            (((u16_t *)addr2)[1] & ((u16_t *)mask)[1])))
+
+
+/**
+ * Mask out the network part of an IP address.
+ *
+ * Masks out the network part of an IP address, given the address and
+ * the netmask.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr1, ipaddr2, netmask;
+
+ uip_ipaddr(&ipaddr1, 192,16,1,2);
+ uip_ipaddr(&netmask, 255,255,255,0);
+ uip_ipaddr_mask(&ipaddr2, &ipaddr1, &netmask);
+ \endcode
+ *
+ * In the example above, the variable "ipaddr2" will contain the IP
+ * address 192.168.1.0.
+ *
+ * \param dest Where the result is to be placed.
+ * \param src The IP address.
+ * \param mask The netmask.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr_mask(dest, src, mask) do { \
+                     ((u16_t *)dest)[0] = ((u16_t *)src)[0] & ((u16_t *)mask)[0]; \
+                     ((u16_t *)dest)[1] = ((u16_t *)src)[1] & ((u16_t *)mask)[1]; \
+                  } while(0)
+
+/**
+ * Pick the first octet of an IP address.
+ *
+ * Picks out the first octet of an IP address.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr;
+ u8_t octet;
+
+ uip_ipaddr(&ipaddr, 1,2,3,4);
+ octet = uip_ipaddr1(&ipaddr);
+ \endcode
+ *
+ * In the example above, the variable "octet" will contain the value 1.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr1(addr) (htons(((u16_t *)(addr))[0]) >> 8)
+
+/**
+ * Pick the second octet of an IP address.
+ *
+ * Picks out the second octet of an IP address.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr;
+ u8_t octet;
+
+ uip_ipaddr(&ipaddr, 1,2,3,4);
+ octet = uip_ipaddr2(&ipaddr);
+ \endcode
+ *
+ * In the example above, the variable "octet" will contain the value 2.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr2(addr) (htons(((u16_t *)(addr))[0]) & 0xff)
+
+/**
+ * Pick the third octet of an IP address.
+ *
+ * Picks out the third octet of an IP address.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr;
+ u8_t octet;
+
+ uip_ipaddr(&ipaddr, 1,2,3,4);
+ octet = uip_ipaddr3(&ipaddr);
+ \endcode
+ *
+ * In the example above, the variable "octet" will contain the value 3.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr3(addr) (htons(((u16_t *)(addr))[1]) >> 8)
+
+/**
+ * Pick the fourth octet of an IP address.
+ *
+ * Picks out the fourth octet of an IP address.
+ *
+ * Example:
+ \code
+ uip_ipaddr_t ipaddr;
+ u8_t octet;
+
+ uip_ipaddr(&ipaddr, 1,2,3,4);
+ octet = uip_ipaddr4(&ipaddr);
+ \endcode
+ *
+ * In the example above, the variable "octet" will contain the value 4.
+ *
+ * \hideinitializer
+ */
+#define uip_ipaddr4(addr) (htons(((u16_t *)(addr))[1]) & 0xff)
+
+/**
+ * Convert 16-bit quantity from host byte order to network byte order.
+ *
+ * This macro is primarily used for converting constants from host
+ * byte order to network byte order. For converting variables to
+ * network byte order, use the htons() function instead.
+ *
+ * \hideinitializer
+ */
+#ifndef HTONS
+#   if UIP_BYTE_ORDER == UIP_BIG_ENDIAN
+#      define HTONS(n) (n)
+#   else /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
+#      define HTONS(n) (u16_t)((((u16_t) (n)) << 8) | (((u16_t) (n)) >> 8))
+#   endif /* UIP_BYTE_ORDER == UIP_BIG_ENDIAN */
+#else
+#error "HTONS already defined!"
+#endif /* HTONS */
+
+/**
+ * Convert 16-bit quantity from host byte order to network byte order.
+ *
+ * This function is primarily used for converting variables from host
+ * byte order to network byte order. For converting constants to
+ * network byte order, use the HTONS() macro instead.
+ */
+#ifndef htons
+u16_t htons(u16_t val);
+#endif /* htons */
+#ifndef ntohs
+#define ntohs htons
+#endif
+
+/** @} */
+
+/**
+ * Pointer to the application data in the packet buffer.
+ *
+ * This pointer points to the application data when the application is
+ * called. If the application wishes to send data, the application may
+ * use this space to write the data into before calling uip_send().
+ */
+extern void *uip_appdata;
+
+#if UIP_URGDATA > 0
+/* u8_t *uip_urgdata:
+ *
+ * This pointer points to any urgent data that has been received. Only
+ * present if compiled with support for urgent data (UIP_URGDATA).
+ */
+extern void *uip_urgdata;
+#endif /* UIP_URGDATA > 0 */
+
+
+/**
+ * \defgroup uipdrivervars Variables used in uIP device drivers
+ * @{
+ *
+ * uIP has a few global variables that are used in device drivers for
+ * uIP.
+ */
+
+/**
+ * The length of the packet in the uip_buf buffer.
+ *
+ * The global variable uip_len holds the length of the packet in the
+ * uip_buf buffer.
+ *
+ * When the network device driver calls the uIP input function,
+ * uip_len should be set to the length of the packet in the uip_buf
+ * buffer.
+ *
+ * When sending packets, the device driver should use the contents of
+ * the uip_len variable to determine the length of the outgoing
+ * packet.
+ *
+ */
+extern u16_t uip_len;
+
+/** @} */
+
+#if UIP_URGDATA > 0
+extern u16_t uip_urglen, uip_surglen;
+#endif /* UIP_URGDATA > 0 */
+
+
+/**
+ * Representation of a uIP TCP connection.
+ *
+ * The uip_conn structure is used for identifying a connection. All
+ * but one field in the structure are to be considered read-only by an
+ * application. The only exception is the appstate field whos purpose
+ * is to let the application store application-specific state (e.g.,
+ * file pointers) for the connection. The type of this field is
+ * configured in the "uipopt.h" header file.
+ */
+
+struct uip_conn {
+  uip_ipaddr_t ripaddr;   /**< The IP address of the remote host. */
+
+  u16_t lport;        /**< The local TCP port, in network byte order. */
+  u16_t rport;        /**< The local remote TCP port, in network byte
+			 order. */
+
+  u8_t rcv_nxt[4];    /**< The sequence number that we expect to
+			 receive next. */
+  u8_t snd_nxt[4];    /**< The sequence number that was last sent by
+                         us. */
+  u16_t len;          /**< Length of the data that was previously sent. */
+  u16_t mss;          /**< Current maximum segment size for the
+			 connection. */
+  u16_t initialmss;   /**< Initial maximum segment size for the
+			 connection. */
+  u8_t sa;            /**< Retransmission time-out calculation state
+			 variable. */
+  u8_t sv;            /**< Retransmission time-out calculation state
+			 variable. */
+  u8_t rto;           /**< Retransmission time-out. */
+  u8_t tcpstateflags; /**< TCP state and flags. */
+  u8_t timer;         /**< The retransmission timer. */
+  u8_t nrtx;          /**< The number of retransmissions for the last
+			 segment sent. */
+
+#if UIP_SLIDING_WINDOW
+  u8_t midpoint;
+#endif
+  /** The application state. */
+  uip_tcp_appstate_t appstate;
+};
+
+/**
+ * Pointer to the current TCP connection.
+ *
+ * The uip_conn pointer can be used to access the current TCP
+ * connection.
+ */
+extern struct uip_conn *uip_conn;
+/* The array containing all uIP connections. */
+extern struct uip_conn uip_conns[UIP_CONNS];
+/**
+ * \addtogroup uiparch
+ * @{
+ */
+
+/**
+ * 4-byte array used for the 32-bit sequence number calculations.
+ */
+extern u8_t uip_acc32[4];
+
+/** @} */
+
+
+#if UIP_UDP
+/**
+ * Representation of a uIP UDP connection.
+ */
+struct uip_udp_conn {
+  uip_ipaddr_t ripaddr;   /**< The IP address of the remote peer. */
+  u16_t lport;        /**< The local port number in network byte order. */
+  u16_t rport;        /**< The remote port number in network byte order. */
+  u8_t  ttl;          /**< Default time-to-live. */
+  u8_t  udpflags;     /**< UDP state flags */
+
+  /** The application state. */
+  uip_udp_appstate_t appstate;
+};
+
+/* This flag is used when a udp packet isn't sent due to an arp request.
+ */
+#define UDP_PENDING_ARP 1
+
+/* This flag is used when a udp packet is succesfully sent
+ */
+#define UDP_SENT 2
+
+/* This flag is used when a udp connection is a "server" connect i.e.
+   accepts packets from any source
+ */
+#define UDP_IS_SERVER_CONN 4
+
+/**
+ * The current UDP connection.
+ */
+extern struct uip_udp_conn *uip_udp_conn;
+extern struct uip_udp_conn uip_udp_conns[UIP_UDP_CONNS];
+#endif /* UIP_UDP */
+
+/**
+ * The structure holding the TCP/IP statistics that are gathered if
+ * UIP_STATISTICS is set to 1.
+ *
+ */
+struct uip_stats {
+  struct {
+    uip_stats_t drop;     /**< Number of dropped packets at the IP
+			     layer. */
+    uip_stats_t recv;     /**< Number of received packets at the IP
+			     layer. */
+    uip_stats_t sent;     /**< Number of sent packets at the IP
+			     layer. */
+    uip_stats_t vhlerr;   /**< Number of packets dropped due to wrong
+			     IP version or header length. */
+    uip_stats_t hblenerr; /**< Number of packets dropped due to wrong
+			     IP length, high byte. */
+    uip_stats_t lblenerr; /**< Number of packets dropped due to wrong
+			     IP length, low byte. */
+    uip_stats_t fragerr;  /**< Number of packets dropped since they
+			     were IP fragments. */
+    uip_stats_t chkerr;   /**< Number of packets dropped due to IP
+			     checksum errors. */
+    uip_stats_t protoerr; /**< Number of packets dropped since they
+			     were neither ICMP, UDP nor TCP. */
+  } ip;                   /**< IP statistics. */
+  struct {
+    uip_stats_t drop;     /**< Number of dropped ICMP packets. */
+    uip_stats_t recv;     /**< Number of received ICMP packets. */
+    uip_stats_t sent;     /**< Number of sent ICMP packets. */
+    uip_stats_t typeerr;  /**< Number of ICMP packets with a wrong
+			     type. */
+  } icmp;                 /**< ICMP statistics. */
+  struct {
+    uip_stats_t drop;     /**< Number of dropped TCP segments. */
+    uip_stats_t recv;     /**< Number of recived TCP segments. */
+    uip_stats_t sent;     /**< Number of sent TCP segments. */
+    uip_stats_t chkerr;   /**< Number of TCP segments with a bad
+			     checksum. */
+    uip_stats_t ackerr;   /**< Number of TCP segments with a bad ACK
+			     number. */
+    uip_stats_t rst;      /**< Number of recevied TCP RST (reset) segments. */
+    uip_stats_t rexmit;   /**< Number of retransmitted TCP segments. */
+    uip_stats_t syndrop;  /**< Number of dropped SYNs due to too few
+			     connections was avaliable. */
+    uip_stats_t synrst;   /**< Number of SYNs for closed ports,
+			     triggering a RST. */
+  } tcp;                  /**< TCP statistics. */
+#if UIP_UDP
+  struct {
+    uip_stats_t drop;     /**< Number of dropped UDP segments. */
+    uip_stats_t recv;     /**< Number of recived UDP segments. */
+    uip_stats_t sent;     /**< Number of sent UDP segments. */
+    uip_stats_t chkerr;   /**< Number of UDP segments with a bad
+			     checksum. */
+  } udp;                  /**< UDP statistics. */
+#endif /* UIP_UDP */
+};
+
+/**
+ * The uIP TCP/IP statistics.
+ *
+ * This is the variable in which the uIP TCP/IP statistics are gathered.
+ */
+extern struct uip_stats uip_stat;
+
+
+/*---------------------------------------------------------------------------*/
+/* All the stuff below this point is internal to uIP and should not be
+ * used directly by an application or by a device driver.
+ */
+/*---------------------------------------------------------------------------*/
+/* u8_t uip_flags:
+ *
+ * When the application is called, uip_flags will contain the flags
+ * that are defined in this file. Please read below for more
+ * infomation.
+ */
+extern u32_t uip_flags;
+
+/* The following flags may be set in the global variable uip_flags
+   before calling the application callback. The UIP_ACKDATA,
+   UIP_NEWDATA, and UIP_CLOSE flags may both be set at the same time,
+   whereas the others are mutualy exclusive. Note that these flags
+   should *NOT* be accessed directly, but only through the uIP
+   functions/macros. */
+
+#define UIP_ACKDATA   1     /* Signifies that the outstanding data was
+			       acked and the application should send
+			       out new data instead of retransmitting
+			       the last data. */
+#define UIP_NEWDATA   2     /* Flags the fact that the peer has sent
+			       us new data. */
+#define UIP_REXMIT    4     /* Tells the application to retransmit the
+			       data that was last sent. */
+#define UIP_POLL      8     /* Used for polling the application, to
+			       check if the application has data that
+			       it wants to send. */
+#define UIP_CLOSE     16    /* The remote host has closed the
+			       connection, thus the connection has
+			       gone away. Or the application signals
+			       that it wants to close the
+			       connection. */
+#define UIP_ABORT     32    /* The remote host has aborted the
+			       connection, thus the connection has
+			       gone away. Or the application signals
+			       that it wants to abort the
+			       connection. */
+#define UIP_CONNECTED 64    /* We have got a connection from a remote
+                               host and have set up a new connection
+                               for it, or an active connection has
+                               been successfully established. */
+
+#define UIP_TIMEDOUT  128   /* The connection has been aborted due to
+			       too many retransmissions. */
+
+#define UIP_TCP_PUSH   256   /* Flags the fact that the other side set the
+                               TCP_PUSH flag. */
+
+/* uip_process(flag):
+ *
+ * The actual uIP function which does all the work.
+ */
+void uip_process(u8_t flag);
+
+/* The following flags are passed as an argument to the uip_process()
+   function. They are used to distinguish between the two cases where
+   uip_process() is called. It can be called either because we have
+   incoming data that should be processed, or because the periodic
+   timer has fired. These values are never used directly, but only in
+   the macrose defined in this file. */
+
+#define UIP_DATA          1     /* Tells uIP that there is incoming
+				   data in the uip_buf buffer. The
+				   length of the data is stored in the
+				   global variable uip_len. */
+#define UIP_TIMER         2     /* Tells uIP that the periodic timer
+				   has fired. */
+#define UIP_POLL_REQUEST  3     /* Tells uIP that a connection should
+				   be polled. */
+#define UIP_UDP_SEND_CONN 4     /* Tells uIP that a UDP datagram
+				   should be constructed in the
+				   uip_buf buffer. */
+#if UIP_UDP
+#define UIP_UDP_TIMER         5
+#define UIP_UDP_ARP_EVENT     6
+#define UIP_UDP_ACKDATA       7
+#endif /* UIP_UDP */
+
+/* The TCP states used in the uip_conn->tcpstateflags. */
+#define UIP_CLOSED      0
+#define UIP_SYN_RCVD    1
+#define UIP_SYN_SENT    2
+#define UIP_ESTABLISHED 3
+#define UIP_FIN_WAIT_1  4
+#define UIP_FIN_WAIT_2  5
+#define UIP_CLOSING     6
+#define UIP_TIME_WAIT   7
+#define UIP_LAST_ACK    8
+#define UIP_TS_MASK     15
+
+#define UIP_STOPPED      16
+
+/* The TCP and IP headers. */
+struct uip_tcpip_hdr {
+#if UIP_CONF_IPV6
+  /* IPv6 header. */
+  u8_t vtc,
+    tcflow;
+  u16_t flow;
+  u8_t len[2];
+  u8_t proto, ttl;
+  uip_ip6addr_t srcipaddr, destipaddr;
+#else /* UIP_CONF_IPV6 */
+  /* IPv4 header. */
+  u8_t vhl,
+    tos,
+    len[2],
+    ipid[2],
+    ipoffset[2],
+    ttl,
+    proto;
+  u16_t ipchksum;
+  u16_t srcipaddr[2],
+    destipaddr[2];
+#endif /* UIP_CONF_IPV6 */
+
+  /* TCP header. */
+  u16_t srcport,
+    destport;
+  u8_t seqno[4],
+    ackno[4],
+    tcpoffset,
+    flags,
+    wnd[2];
+  u16_t tcpchksum;
+  u8_t urgp[2];
+  u8_t optdata[4];
+};
+
+/* The ICMP and IP headers. */
+struct uip_icmpip_hdr {
+#if UIP_CONF_IPV6
+  /* IPv6 header. */
+  u8_t vtc,
+    tcf;
+  u16_t flow;
+  u8_t len[2];
+  u8_t proto, ttl;
+  uip_ip6addr_t srcipaddr, destipaddr;
+#else /* UIP_CONF_IPV6 */
+  /* IPv4 header. */
+  u8_t vhl,
+    tos,
+    len[2],
+    ipid[2],
+    ipoffset[2],
+    ttl,
+    proto;
+  u16_t ipchksum;
+  u16_t srcipaddr[2],
+    destipaddr[2];
+#endif /* UIP_CONF_IPV6 */
+
+  /* ICMP (echo) header. */
+  u8_t type, icode;
+  u16_t icmpchksum;
+#if !UIP_CONF_IPV6
+  u16_t id, seqno;
+#else /* !UIP_CONF_IPV6 */
+  u8_t flags, reserved1, reserved2, reserved3;
+  u8_t icmp6data[16];
+  u8_t options[1];
+#endif /* !UIP_CONF_IPV6 */
+};
+
+
+/* The UDP and IP headers. */
+struct uip_udpip_hdr {
+#if UIP_CONF_IPV6
+  /* IPv6 header. */
+  u8_t vtc,
+    tcf;
+  u16_t flow;
+  u8_t len[2];
+  u8_t proto, ttl;
+  uip_ip6addr_t srcipaddr, destipaddr;
+#else /* UIP_CONF_IPV6 */
+  /* IP header. */
+  u8_t vhl,
+    tos,
+    len[2],
+    ipid[2],
+    ipoffset[2],
+    ttl,
+    proto;
+  u16_t ipchksum;
+  u16_t srcipaddr[2],
+    destipaddr[2];
+#endif /* UIP_CONF_IPV6 */
+
+  /* UDP header. */
+  u16_t srcport,
+    destport;
+  u16_t udplen;
+  u16_t udpchksum;
+};
+
+
+
+/**
+ * The buffer size available for user data in the \ref uip_buf buffer.
+ *
+ * This macro holds the available size for user data in the \ref
+ * uip_buf buffer. The macro is intended to be used for checking
+ * bounds of available user data.
+ *
+ * Example:
+ \code
+ snprintf(uip_appdata, UIP_APPDATA_SIZE, "%u\n", i);
+ \endcode
+ *
+ * \hideinitializer
+ */
+#define UIP_APPDATA_SIZE (UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN)
+
+
+#define UIP_PROTO_ICMP  1
+#define UIP_PROTO_IGMP   6
+#define UIP_PROTO_TCP   6
+#define UIP_PROTO_UDP   17
+#define UIP_PROTO_ICMP6 58
+
+/* Header sizes. */
+#if UIP_CONF_IPV6
+#define UIP_IPH_LEN    40
+#else /* UIP_CONF_IPV6 */
+#define UIP_IPH_LEN    20    /* Size of IP header */
+#endif /* UIP_CONF_IPV6 */
+#define UIP_UDPH_LEN    8    /* Size of UDP header */
+#define UIP_TCPH_LEN   20    /* Size of TCP header */
+#define UIP_IPUDPH_LEN (UIP_UDPH_LEN + UIP_IPH_LEN)    /* Size of IP +
+							  UDP
+							  header */
+#define UIP_IPTCPH_LEN (UIP_TCPH_LEN + UIP_IPH_LEN)    /* Size of IP +
+							  TCP
+							  header */
+#define UIP_TCPIP_HLEN UIP_IPTCPH_LEN
+
+
+#if UIP_FIXEDADDR
+extern const uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
+#else /* UIP_FIXEDADDR */
+extern uip_ipaddr_t uip_hostaddr, uip_netmask, uip_draddr;
+#endif /* UIP_FIXEDADDR */
+
+
+
+/**
+ * Representation of a 48-bit Ethernet address.
+ */
+struct uip_eth_addr {
+  u8_t addr[6];
+};
+
+/**
+ * Calculate the Internet checksum over a buffer.
+ *
+ * The Internet checksum is the one's complement of the one's
+ * complement sum of all 16-bit words in the buffer.
+ *
+ * See RFC1071.
+ *
+ * \param buf A pointer to the buffer over which the checksum is to be
+ * computed.
+ *
+ * \param len The length of the buffer over which the checksum is to
+ * be computed.
+ *
+ * \return The Internet checksum of the buffer.
+ */
+u16_t uip_chksum(u16_t *buf, u16_t len);
+
+/**
+ * Calculate the IP header checksum of the packet header in uip_buf.
+ *
+ * The IP header checksum is the Internet checksum of the 20 bytes of
+ * the IP header.
+ *
+ * \return The IP header checksum of the IP header in the uip_buf
+ * buffer.
+ */
+u16_t uip_ipchksum(void);
+
+/**
+ * Calculate the TCP checksum of the packet in uip_buf and uip_appdata.
+ *
+ * The TCP checksum is the Internet checksum of data contents of the
+ * TCP segment, and a pseudo-header as defined in RFC793.
+ *
+ * \return The TCP checksum of the TCP segment in uip_buf and pointed
+ * to by uip_appdata.
+ */
+u16_t uip_tcpchksum(void);
+
+/**
+ * Calculate the UDP checksum of the packet in uip_buf and uip_appdata.
+ *
+ * The UDP checksum is the Internet checksum of data contents of the
+ * UDP segment, and a pseudo-header as defined in RFC768.
+ *
+ * \return The UDP checksum of the UDP segment in uip_buf and pointed
+ * to by uip_appdata.
+ */
+u16_t uip_udpchksum(void);
+
+
+#endif /* __UIP_H__ */
+
+
+/** @} */
diff --git a/module_xtcp/src/xtcp_uip/uip_server_support.c b/module_xtcp/src/xtcp_uip/uip_server_support.c
index 74a989d..fb5b7ab 100644
--- a/module_xtcp/src/xtcp_uip/uip_server_support.c
+++ b/module_xtcp/src/xtcp_uip/uip_server_support.c
@@ -1,304 +1,310 @@
-// Copyright (c) 2011, XMOS Ltd, All rights reserved
-// This software is freely distributable under a derivative of the
-// University of Illinois/NCSA Open Source License posted in
-// LICENSE.txt and at <http://github.xcore.com/>
-
-#include <print.h>
-#include <xccompat.h>
-#include <string.h>
-
-#include "uip.h"
-#include "uip_arp.h"
-#include "uip-split.h"
-#include "uip_xtcp.h"
-#include "autoip.h"
-
-// This is the buffer where TCP constructs its packets
-unsigned int uip_buf32[(UIP_BUFSIZE + 5) >> 2];
-u8_t *uip_buf = (u8_t *) &uip_buf32[0];
-
-#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
-#define TCPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
-
-#if UIP_LOGGING == 1
-void uip_log(char m[]) {
-	printstr("uIP log message: ");
-	printstr(m);
-	printstr("\n");
-}
-#endif
-
-#ifdef XTCP_VERBOSE_DEBUG
-__attribute__ ((noinline)) void uip_printip4(const uip_ipaddr_t ip4) {
-	printint(uip_ipaddr1(ip4));
-	printstr(".");
-	printint(uip_ipaddr2(ip4));
-	printstr(".");
-	printint(uip_ipaddr3(ip4));
-	printstr(".");
-	printint(uip_ipaddr4(ip4));
-}
-#endif
-
-int uip_static_ip = 0;
-xtcp_ipconfig_t uip_static_ipconfig;
-
-static int dhcp_done = 0;
-
-void xtcp_tx_buffer(chanend mac_tx) {
-	uip_split_output(mac_tx);
-	uip_len = 0;
-}
-
-void uip_server_init(chanend xtcp[], int num_xtcp, xtcp_ipconfig_t* ipconfig, unsigned char mac_address[6])
-{
-	if (ipconfig != NULL)
-		memcpy(&uip_static_ipconfig, ipconfig, sizeof(xtcp_ipconfig_t));
-
-	memcpy(&uip_ethaddr, mac_address, 6);
-
-	uip_init();
-
-#if UIP_IGMP
-	igmp_init();
-#endif
-
-	if (ipconfig != NULL && (*((int*)ipconfig->ipaddr) != 0)) {
-		uip_static_ip = 1;
-	}
-
-	if (ipconfig == NULL)
-	{
-		uip_ipaddr_t ipaddr;
-		uip_ipaddr(ipaddr, 0, 0, 0, 0);
-		uip_sethostaddr(ipaddr);
-		uip_setdraddr(ipaddr);
-		uip_setnetmask(ipaddr);
-	} else {
-
-		uip_sethostaddr(ipconfig->ipaddr);
-		uip_setdraddr(ipconfig->gateway);
-		uip_setnetmask(ipconfig->netmask);
-
-#ifdef XTCP_VERBOSE_DEBUG
-		printstr("Address: ");uip_printip4(uip_hostaddr);printstr("\n");
-		printstr("Gateway: ");uip_printip4(uip_draddr);printstr("\n");
-		printstr("Netmask: ");uip_printip4(uip_netmask);printstr("\n");
-#endif
-	}
-
-	{
-#if UIP_USE_AUTOIP
-		int hwsum = mac_address[0] + mac_address[1] + mac_address[2]
-				+ mac_address[3] + mac_address[4] + mac_address[5];
-		autoip_init(hwsum + (hwsum << 16) + (hwsum << 24));
-#endif
-#if UIP_USE_DHCP
-		dhcpc_init(uip_ethaddr.addr, 6);
-#endif
-		xtcpd_init(xtcp, num_xtcp);
-	}
-}
-
-static int needs_poll(xtcpd_state_t *s)
-{
-  return (s->s.connect_request | s->s.send_request | s->s.abort_request | s->s.close_request | s->s.ack_request);
-}
-
-static int uip_conn_needs_poll(struct uip_conn *uip_conn)
-{
-  xtcpd_state_t *s = (xtcpd_state_t *) &(uip_conn->appstate);
-  return needs_poll(s);
-}
-
-static int uip_udp_conn_needs_poll(struct uip_udp_conn *uip_udp_conn)
-{
-  xtcpd_state_t *s = (xtcpd_state_t *) &(uip_udp_conn->appstate);
-  return needs_poll(s);
-}
-
-void xtcpd_check_connection_poll(chanend mac_tx)
-{
-	for (int i = 0; i < UIP_CONNS; i++) {
-		if (uip_conn_needs_poll(&uip_conns[i])) {
-			uip_poll_conn(&uip_conns[i]);
-			if (uip_len > 0) {
-				uip_arp_out( NULL);
-				xtcp_tx_buffer(mac_tx);
-			}
-		}
-	}
-
-	for (int i = 0; i < UIP_UDP_CONNS; i++) {
-		if (uip_udp_conn_needs_poll(&uip_udp_conns[i])) {
-			uip_udp_periodic(i);
-			if (uip_len > 0) {
-				uip_arp_out(&uip_udp_conns[i]);
-				xtcp_tx_buffer(mac_tx);
-			}
-		}
-	}
-}
-
-void xtcp_process_incoming_packet(chanend mac_tx)
-{
-	if (BUF->type == htons(UIP_ETHTYPE_IP)) {
-		uip_arp_ipin();
-		uip_input();
-		if (uip_len > 0) {
-			if (uip_udpconnection()
-				&& (TCPBUF->proto != UIP_PROTO_ICMP)
-				&& (TCPBUF->proto != UIP_PROTO_IGMP))
-				uip_arp_out( uip_udp_conn);
-			else
-				uip_arp_out( NULL);
-			xtcp_tx_buffer(mac_tx);
-		}
-	} else if (BUF->type == htons(UIP_ETHTYPE_ARP)) {
-		uip_arp_arpin();
-
-		if (uip_len > 0) {
-			xtcp_tx_buffer(mac_tx);
-		}
-		for (int i = 0; i < UIP_UDP_CONNS; i++) {
-			uip_udp_arp_event(i);
-			if (uip_len > 0) {
-				uip_arp_out(&uip_udp_conns[i]);
-				xtcp_tx_buffer(mac_tx);
-			}
-		}
-	}
-}
-
-void xtcp_process_udp_acks(chanend mac_tx)
-{
-	for (int i = 0; i < UIP_UDP_CONNS; i++) {
-		if (uip_udp_conn_has_ack(&uip_udp_conns[i])) {
-			uip_udp_ackdata(i);
-			if (uip_len > 0) {
-				uip_arp_out(&uip_udp_conns[i]);
-				xtcp_tx_buffer(mac_tx);
-			}
-		}
-	}
-}
-
-void xtcp_process_periodic_timer(chanend mac_tx)
-{
-#if UIP_IGMP
-	igmp_periodic();
-	if(uip_len > 0) {
-		xtcp_tx_buffer(mac_tx);
-	}
-#endif
-	for (int i = 0; i < UIP_UDP_CONNS; i++) {
-		uip_udp_periodic(i);
-		if (uip_len > 0) {
-			uip_arp_out(&uip_udp_conns[i]);
-			xtcp_tx_buffer(mac_tx);
-		}
-	}
-
-	for (int i = 0; i < UIP_CONNS; i++) {
-		uip_periodic(i);
-		if (uip_len > 0) {
-			uip_arp_out( NULL);
-			xtcp_tx_buffer(mac_tx);
-		}
-	}
-}
-
-#if UIP_USE_DHCP
-void dhcpc_configured(const struct dhcpc_state *s) {
-#ifdef XTCP_VERBOSE_DEBUG
-	printstr("dhcp: ");uip_printip4(s->ipaddr);printstr("\n");
-#endif
-#if UIP_USE_AUTOIP
-	autoip_stop();
-#endif
-	uip_sethostaddr(s->ipaddr);
-	uip_setdraddr(s->default_router);
-	uip_setnetmask(s->netmask);
-	uip_xtcp_up();
-	dhcp_done = 1;
-}
-#endif
-
-#if UIP_USE_AUTOIP
-void autoip_configured(uip_ipaddr_t autoip_ipaddr) {
-	if (!dhcp_done) {
-		uip_ipaddr_t ipaddr;
-#ifdef XTCP_VERBOSE_DEBUG
-		printstr("ipv4ll: ");
-		uip_printip4(autoip_ipaddr);
-		printstr("\n");
-#endif
-		uip_sethostaddr(autoip_ipaddr);
-		uip_ipaddr(ipaddr, 255, 255, 0, 0);
-		uip_setnetmask(ipaddr);
-		uip_ipaddr(ipaddr, 0, 0, 0, 0);
-		uip_setdraddr(ipaddr);
-		uip_xtcp_up();
-	}
-}
-#endif
-
-void uip_linkup() {
-	if (get_uip_xtcp_ifstate())
-		uip_xtcp_down();
-
-	if (uip_static_ip) {
-#if UIP_CONF_IPV6
-		uip_ipaddr_t ipaddr;
-		uip_ipaddr(ipaddr,
-				uip_static_ipconfig.ipaddr[0],
-				uip_static_ipconfig.ipaddr[1],
-				uip_static_ipconfig.ipaddr[2],
-				uip_static_ipconfig.ipaddr[3]);
-		uip_sethostaddr(ipaddr);
-		uip_ipaddr(ipaddr,
-				uip_static_ipconfig.gateway[0],
-				uip_static_ipconfig.gateway[1],
-				uip_static_ipconfig.gateway[2],
-				uip_static_ipconfig.gateway[3]);
-		uip_setdraddr(ipaddr);
-		uip_ipaddr(ipaddr,
-				uip_static_ipconfig.netmask[0],
-				uip_static_ipconfig.netmask[1],
-				uip_static_ipconfig.netmask[2],
-				uip_static_ipconfig.netmask[3]);
-		uip_setnetmask(ipaddr);
-#else
-		uip_sethostaddr(uip_static_ipconfig.ipaddr);
-		uip_setdraddr(uip_static_ipconfig.gateway);
-		uip_setnetmask(uip_static_ipconfig.netmask);
-#endif
-		uip_xtcp_up();
-	} else {
-		dhcp_done = 0;
-#if UIP_USE_DHCP
-		dhcpc_stop();
-#endif
-#if UIP_USE_AUTOIP
-#if UIP_USE_DHCP
-		autoip_stop();
-#else
-		autoip_start();
-#endif
-#endif
-#if UIP_USE_DHCP
-		dhcpc_start();
-#endif
-	}
-}
-
-void uip_linkdown() {
-	dhcp_done = 0;
-#if UIP_USE_DHCP
-	dhcpc_stop();
-#endif
-#if UIP_USE_AUTOIP
-	autoip_stop();
-#endif
-	uip_xtcp_down();
-}
+// Copyright (c) 2011, XMOS Ltd, All rights reserved
+// This software is freely distributable under a derivative of the
+// University of Illinois/NCSA Open Source License posted in
+// LICENSE.txt and at <http://github.xcore.com/>
+
+#include <print.h>
+#include <xccompat.h>
+#include <string.h>
+
+#include "uip.h"
+#include "uip_arp.h"
+#include "uip-split.h"
+#include "uip_xtcp.h"
+#include "autoip.h"
+
+// This is the buffer where TCP constructs its packets
+unsigned int uip_buf32[(UIP_BUFSIZE + 5) >> 2];
+u8_t *uip_buf = (u8_t *) &uip_buf32[0];
+
+#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
+#define TCPBUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
+
+#if UIP_LOGGING == 1
+void uip_log(char m[]) {
+	printstr("uIP log message: ");
+	printstr(m);
+	printstr("\n");
+}
+#endif
+
+#ifdef XTCP_VERBOSE_DEBUG
+__attribute__ ((noinline)) void uip_printip4(const uip_ipaddr_t ip4) {
+	printint(uip_ipaddr1(ip4));
+	printstr(".");
+	printint(uip_ipaddr2(ip4));
+	printstr(".");
+	printint(uip_ipaddr3(ip4));
+	printstr(".");
+	printint(uip_ipaddr4(ip4));
+}
+#endif
+
+int uip_static_ip = 0;
+xtcp_ipconfig_t uip_static_ipconfig;
+
+static int dhcp_done = 0;
+
+void xtcp_tx_buffer(chanend mac_tx) {
+	uip_split_output(mac_tx);
+	uip_len = 0;
+}
+
+void uip_server_init(chanend xtcp[], int num_xtcp, xtcp_ipconfig_t* ipconfig, unsigned char mac_address[6])
+{
+	if (ipconfig != NULL)
+		memcpy(&uip_static_ipconfig, ipconfig, sizeof(xtcp_ipconfig_t));
+
+	memcpy(&uip_ethaddr, mac_address, 6);
+
+	uip_init();
+
+#if UIP_IGMP
+	igmp_init();
+#endif
+
+	if (ipconfig != NULL && (*((int*)ipconfig->ipaddr) != 0)) {
+		uip_static_ip = 1;
+	}
+
+	if (ipconfig == NULL)
+	{
+		uip_ipaddr_t ipaddr;
+		uip_ipaddr(ipaddr, 0, 0, 0, 0);
+		uip_sethostaddr(ipaddr);
+		uip_setdraddr(ipaddr);
+		uip_setnetmask(ipaddr);
+		uip_setsubnetaddr();
+	} else {
+
+		uip_sethostaddr(ipconfig->ipaddr);
+		uip_setdraddr(ipconfig->gateway);
+		uip_setnetmask(ipconfig->netmask);
+		uip_setsubnetaddr();
+
+#ifdef XTCP_VERBOSE_DEBUG
+		printstr("Address: ");uip_printip4(uip_hostaddr);printstr("\n");
+		printstr("Gateway: ");uip_printip4(uip_draddr);printstr("\n");
+		printstr("Netmask: ");uip_printip4(uip_netmask);printstr("\n");
+#endif
+	}
+
+	{
+#if UIP_USE_AUTOIP
+		int hwsum = mac_address[0] + mac_address[1] + mac_address[2]
+				+ mac_address[3] + mac_address[4] + mac_address[5];
+		autoip_init(hwsum + (hwsum << 16) + (hwsum << 24));
+#endif
+#if UIP_USE_DHCP
+		dhcpc_init(uip_ethaddr.addr, 6);
+#endif
+		xtcpd_init(xtcp, num_xtcp);
+	}
+}
+
+static int needs_poll(xtcpd_state_t *s)
+{
+  return (s->s.connect_request | s->s.send_request | s->s.abort_request | s->s.close_request | s->s.ack_request);
+}
+
+static int uip_conn_needs_poll(struct uip_conn *uip_conn)
+{
+  xtcpd_state_t *s = (xtcpd_state_t *) &(uip_conn->appstate);
+  return needs_poll(s);
+}
+
+static int uip_udp_conn_needs_poll(struct uip_udp_conn *uip_udp_conn)
+{
+  xtcpd_state_t *s = (xtcpd_state_t *) &(uip_udp_conn->appstate);
+  return needs_poll(s);
+}
+
+void xtcpd_check_connection_poll(chanend mac_tx)
+{
+	for (int i = 0; i < UIP_CONNS; i++) {
+		if (uip_conn_needs_poll(&uip_conns[i])) {
+			uip_poll_conn(&uip_conns[i]);
+			if (uip_len > 0) {
+				uip_arp_out( NULL);
+				xtcp_tx_buffer(mac_tx);
+			}
+		}
+	}
+
+	for (int i = 0; i < UIP_UDP_CONNS; i++) {
+		if (uip_udp_conn_needs_poll(&uip_udp_conns[i])) {
+			uip_udp_periodic(i);
+			if (uip_len > 0) {
+				uip_arp_out(&uip_udp_conns[i]);
+				xtcp_tx_buffer(mac_tx);
+			}
+		}
+	}
+}
+
+void xtcp_process_incoming_packet(chanend mac_tx)
+{
+	if (BUF->type == htons(UIP_ETHTYPE_IP)) {
+		uip_arp_ipin();
+		uip_input();
+		if (uip_len > 0) {
+			if (uip_udpconnection()
+				&& (TCPBUF->proto != UIP_PROTO_ICMP)
+				&& (TCPBUF->proto != UIP_PROTO_IGMP))
+				uip_arp_out( uip_udp_conn);
+			else
+				uip_arp_out( NULL);
+			xtcp_tx_buffer(mac_tx);
+		}
+	} else if (BUF->type == htons(UIP_ETHTYPE_ARP)) {
+		uip_arp_arpin();
+
+		if (uip_len > 0) {
+			xtcp_tx_buffer(mac_tx);
+		}
+		for (int i = 0; i < UIP_UDP_CONNS; i++) {
+			uip_udp_arp_event(i);
+			if (uip_len > 0) {
+				uip_arp_out(&uip_udp_conns[i]);
+				xtcp_tx_buffer(mac_tx);
+			}
+		}
+	}
+}
+
+void xtcp_process_udp_acks(chanend mac_tx)
+{
+	for (int i = 0; i < UIP_UDP_CONNS; i++) {
+		if (uip_udp_conn_has_ack(&uip_udp_conns[i])) {
+			uip_udp_ackdata(i);
+			if (uip_len > 0) {
+				uip_arp_out(&uip_udp_conns[i]);
+				xtcp_tx_buffer(mac_tx);
+			}
+		}
+	}
+}
+
+void xtcp_process_periodic_timer(chanend mac_tx)
+{
+#if UIP_IGMP
+	igmp_periodic();
+	if(uip_len > 0) {
+		xtcp_tx_buffer(mac_tx);
+	}
+#endif
+	for (int i = 0; i < UIP_UDP_CONNS; i++) {
+		uip_udp_periodic(i);
+		if (uip_len > 0) {
+			uip_arp_out(&uip_udp_conns[i]);
+			xtcp_tx_buffer(mac_tx);
+		}
+	}
+
+	for (int i = 0; i < UIP_CONNS; i++) {
+		uip_periodic(i);
+		if (uip_len > 0) {
+			uip_arp_out( NULL);
+			xtcp_tx_buffer(mac_tx);
+		}
+	}
+}
+
+#if UIP_USE_DHCP
+void dhcpc_configured(const struct dhcpc_state *s) {
+#ifdef XTCP_VERBOSE_DEBUG
+	printstr("dhcp: ");uip_printip4(s->ipaddr);printstr("\n");
+#endif
+#if UIP_USE_AUTOIP
+	autoip_stop();
+#endif
+	uip_sethostaddr(s->ipaddr);
+	uip_setdraddr(s->default_router);
+	uip_setnetmask(s->netmask);
+	uip_setsubnetaddr();
+	uip_xtcp_up();
+	dhcp_done = 1;
+}
+#endif
+
+#if UIP_USE_AUTOIP
+void autoip_configured(uip_ipaddr_t autoip_ipaddr) {
+	if (!dhcp_done) {
+		uip_ipaddr_t ipaddr;
+#ifdef XTCP_VERBOSE_DEBUG
+		printstr("ipv4ll: ");
+		uip_printip4(autoip_ipaddr);
+		printstr("\n");
+#endif
+		uip_sethostaddr(autoip_ipaddr);
+		uip_ipaddr(ipaddr, 255, 255, 0, 0);
+		uip_setnetmask(ipaddr);
+		uip_setsubnetaddr();
+		uip_ipaddr(ipaddr, 0, 0, 0, 0);
+		uip_setdraddr(ipaddr);
+		uip_xtcp_up();
+	}
+}
+#endif
+
+void uip_linkup() {
+	if (get_uip_xtcp_ifstate())
+		uip_xtcp_down();
+
+	if (uip_static_ip) {
+#if UIP_CONF_IPV6
+		uip_ipaddr_t ipaddr;
+		uip_ipaddr(ipaddr,
+				uip_static_ipconfig.ipaddr[0],
+				uip_static_ipconfig.ipaddr[1],
+				uip_static_ipconfig.ipaddr[2],
+				uip_static_ipconfig.ipaddr[3]);
+		uip_sethostaddr(ipaddr);
+		uip_ipaddr(ipaddr,
+				uip_static_ipconfig.gateway[0],
+				uip_static_ipconfig.gateway[1],
+				uip_static_ipconfig.gateway[2],
+				uip_static_ipconfig.gateway[3]);
+		uip_setdraddr(ipaddr);
+		uip_ipaddr(ipaddr,
+				uip_static_ipconfig.netmask[0],
+				uip_static_ipconfig.netmask[1],
+				uip_static_ipconfig.netmask[2],
+				uip_static_ipconfig.netmask[3]);
+		uip_setnetmask(ipaddr);
+		uip_setsubnetaddr();
+#else
+		uip_sethostaddr(uip_static_ipconfig.ipaddr);
+		uip_setdraddr(uip_static_ipconfig.gateway);
+		uip_setnetmask(uip_static_ipconfig.netmask);
+		uip_setsubnetaddr();
+#endif
+		uip_xtcp_up();
+	} else {
+		dhcp_done = 0;
+#if UIP_USE_DHCP
+		dhcpc_stop();
+#endif
+#if UIP_USE_AUTOIP
+#if UIP_USE_DHCP
+		autoip_stop();
+#else
+		autoip_start();
+#endif
+#endif
+#if UIP_USE_DHCP
+		dhcpc_start();
+#endif
+	}
+}
+
+void uip_linkdown() {
+	dhcp_done = 0;
+#if UIP_USE_DHCP
+	dhcpc_stop();
+#endif
+#if UIP_USE_AUTOIP
+	autoip_stop();
+#endif
+	uip_xtcp_down();
+}