--- a/network/PPP.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1426 +0,0 @@
-/*
-    LUFA Powered Wireless 3G Modem Host
-	
-    Copyright (C) Mike Alexander, 2010.
-     Copyright (C) Dean Camera, 2010.
-*/
-
-/*
-  Copyright 2010  Mike Alexander (mike [at] mikealex [dot] com)
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#define  INCLUDE_FROM_PPP_C
-#include "PPP.h"
-
-static uint8_t  			OutgoingPacketID;								// Unique packet ID
-static PPP_Phases_t			PPP_Phase;										// PPP negotiation phases
-static PPP_States_t			LCP_State;										// Each phase has a number of states
-static PPP_States_t			PAP_State;
-static PPP_States_t			IPCP_State;
-static PPP_Packet_t*  		OutgoingPacket;									// Pointer to the outgoing packet
-static PPP_Packet_t*  		IncomingPacket;									// Pointer to the incoming packet
-static uint16_t     		CurrentProtocol;								// Type of the last received packet
-static uint8_t 				RestartCount;
-static uint16_t				LinkTimer;
-static bool					TimerOn;
-static bool 				MarkForNAK;
-static bool					MarkForREJ;
-static uint8_t				OutgoingPacketBuffer[OUTGOING_PACKET_BUFFER_SIZE];	// Buffer to store the outgoing packet in
-
-PPP_Packet_t* dummy;	
-
-
-void PPP_InitPPP(void)
-{
-	PPP_Phase = PPP_PHASE_Dead;
-	TimerOn = false;
-}
-
-void PPP_StartLink(void)
-{
-	OutgoingPacket = NULL;
-	CurrentProtocol = NONE;
-	TimerOn = false;
-	LinkTimer = 0;
-	uip_len = 0;
-	RestartCount = MAX_RESTARTS;
-	MarkForNAK = MarkForREJ = false;
-	OutgoingPacketID = -1;
-	OutgoingPacket = IncomingPacket = NULL;	
-	LCP_State  = PPP_STATE_Initial;
-	PAP_State  = PPP_STATE_Initial;
-	IPCP_State = PPP_STATE_Initial;
-	PPP_Phase = PPP_PHASE_Establish;
-	PPP_ManageState(PPP_EVENT_Open, &LCP_State, PPP_LAYER_Physical);
-	PPP_ManageState(PPP_EVENT_Up, &LCP_State, PPP_LAYER_Physical);
-}
-
-// Called every 10ms. Send events to the state machine every 3 seconds if the timer is currently running
-void PPP_LinkTimer(void)
-{
-	if (!TimerOn || LinkTimer++ < 300)
-		return;
-
-	if (RestartCount > 0)
-	{
-		Debug_Print("Timer+\r\n");
-
-		switch(PPP_Phase)
-		{
-			case PPP_PHASE_Establish:
-				PPP_ManageState(PPP_EVENT_TOPlus, &LCP_State, PPP_LAYER_Physical);
-			break;
-
-			case PPP_PHASE_Authenticate:
-				PPP_ManageState(PPP_EVENT_TOPlus, &PAP_State, PPP_LAYER_Authentication);
-			break;
-
-			case PPP_PHASE_Network:
-				PPP_ManageState(PPP_EVENT_TOPlus, &IPCP_State, PPP_LAYER_Network);
-			break;
-
-			default:
-			break;
-		}
-	}
-	else
-	{
-		Debug_Print("Timer-\r\n");
-		
-		switch(PPP_Phase)
-		{
-			case PPP_PHASE_Establish:
-				PPP_ManageState(PPP_EVENT_TOMinus, &LCP_State, PPP_LAYER_Physical);
-			break;
-
-			case PPP_PHASE_Authenticate:
-				PPP_ManageState(PPP_EVENT_TOMinus, &PAP_State, PPP_LAYER_Authentication);
-			break;
-
-			case PPP_PHASE_Network:
-				PPP_ManageState(PPP_EVENT_TOMinus, &IPCP_State, PPP_LAYER_Network);
-			break;
-
-			default:
-			break;
-		}
-	}
-
-	LinkTimer = 0;																										// Reset Timer
-}
-
-void PPP_ManageLink(void)
-{	
-	if (PPP_Phase == PPP_PHASE_Dead)
-		return;
-	
-	uint16_t ReadProtocol = network_read();																				// Don't mess with CurrentProtocol in case we get 0 (No data) back
-
-	if (ReadProtocol == 0)
-		return;
-	
-	CurrentProtocol = ReadProtocol;
-	IncomingPacket = (PPP_Packet_t*)uip_buf;																			// Map the incoming data to a packet
-	
-	Debug_Print("Got ");
-
-	switch (CurrentProtocol)
-	{
-		case LCP:
-			Debug_Print("LCP ");
-
-			switch(IncomingPacket->Code)
-			{
-				case REQ:
-					Debug_Print("REQ\r\n");
-
-					MarkForNAK = MarkForREJ = false;
-
-					// List of options that we can support. If any other options come in, we have to REJ them
-					const uint8_t SupportedOptions[] = {LCP_OPTION_Maximum_Receive_Unit,
-														LCP_OPTION_Magic_Number,
-														LCP_OPTION_Async_Control_Character_Map,
-					                                    LCP_OPTION_Authentication_Protocol,
-					                                    LCP_OPTION_Protocol_Field_Compression,
-					                                    LCP_OPTION_Address_and_Control_Field_Compression};
-
-					if ((MarkForREJ = PPP_TestForREJ(SupportedOptions, sizeof(SupportedOptions))))						// Check that we can support all the options the other end wants to use
-					{
-						PPP_ManageState(PPP_EVENT_RCRMinus, &LCP_State, PPP_LAYER_Physical);
-						break;
-					}
-					
-					static PPP_Option_t Option3 = {.Type  = 0x03, .Length = 4, .Data = {0xc0, 0x23}};				
-
-					if ((MarkForNAK = PPP_TestForNAK(&Option3)))														// Check that the authentication protocol = PAP (0xc023)
-					{
-						PPP_ManageState(PPP_EVENT_RCRMinus, &LCP_State, PPP_LAYER_Physical);
-						break;
-					}
-
-					PPP_ManageState(PPP_EVENT_RCRPlus, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case ACK:
-					Debug_Print("ACK\r\n");
-					
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					PPP_ManageState(PPP_EVENT_RCA, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case NAK:
-					Debug_Print("NAK\r\n");
-
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					PPP_ProcessNAK();
-					PPP_ManageState(PPP_EVENT_RCN, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case REJ:
-					Debug_Print("REJ\r\n");
-
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					PPP_ProcessREJ();
-					PPP_ManageState(PPP_EVENT_RCN, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case DISC:
-				case ECHOREQ:
-				case ECHOREPLY:
-					Debug_Print("DISC\r\n");
-					PPP_ManageState(PPP_EVENT_RXR, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case TERMREQ:
-					Debug_Print("TERM\r\n");
-					PPP_ManageState(PPP_EVENT_RTR, &LCP_State, PPP_LAYER_Physical);
-				break;
-
-				case CODEREJ:
-				case PROTREJ:
-					Debug_Print("CODE/PROTREJ\r\n");
-					PPP_ManageState(PPP_EVENT_RXJMinus, &LCP_State, PPP_LAYER_Physical);
-				break;
-				
-				default:
-					Debug_Print("unknown\r\n");
-					PPP_ManageState(PPP_EVENT_RUC, &LCP_State, PPP_LAYER_Physical);
-				break;
-			}
-		break;
-
-		case PAP:
-			Debug_Print("PAP ");
-			
-			switch(IncomingPacket->Code)
-			{
-				case REQ:
-					Debug_Print("REQ\r\n");
-					PPP_ManageState(PPP_EVENT_RCRPlus, &PAP_State, PPP_LAYER_Authentication);
-				break;
-
-				case ACK:
-					Debug_Print("ACK\r\n");
-					PPP_ManageState(PPP_EVENT_RCRPlus, &PAP_State, PPP_LAYER_Authentication);						// The host never sends a Configure request for PAP, but we need it to move the state machine to completion. So, fake it.
-					PPP_ManageState(PPP_EVENT_RCA, &PAP_State, PPP_LAYER_Authentication);
-				break;
-			}
-		break;
-
-		case IPCP:
-			Debug_Print("IPCP ");
-
-			switch(IncomingPacket->Code)
-			{
-				case REQ:
-					Debug_Print("REQ\r\n");
-	
-					MarkForNAK = MarkForREJ = false;
-					
-					// List of options that we can support. If any other options come in, we have to REJ them
-					uint8_t SupportedOptions[] = {IPCP_OPTION_IP_address, IPCP_OPTION_Primary_DNS, IPCP_OPTION_Secondary_DNS};
-					
-					if ((MarkForREJ = PPP_TestForREJ(SupportedOptions, sizeof(SupportedOptions))))
-					{
-						PPP_ManageState(PPP_EVENT_RCRMinus, &IPCP_State, PPP_LAYER_Network);
-						break;
-					}
-
-					PPP_ManageState(PPP_EVENT_RCRPlus, &IPCP_State, PPP_LAYER_Network);
-				break;
-
-				case ACK:
-					Debug_Print("ACK\r\n");
-
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					IPAddr1 = IncomingPacket->Options[0].Data[0]; 						// Store address for use in IP packets.
-					IPAddr2 = IncomingPacket->Options[0].Data[1];    				 	// Assumption is that Option 3 is the first option, which it
-					IPAddr3 = IncomingPacket->Options[0].Data[2];						// should be as the PPP spec states that implementations should
-					IPAddr4 = IncomingPacket->Options[0].Data[3];						// not reorder packets, and we sent out a REQ with option 3 first
-
-					PPP_ManageState(PPP_EVENT_RCA, &IPCP_State, PPP_LAYER_Network);
-				break;
-
-				case NAK:
-					Debug_Print("NAK\r\n");
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					PPP_ProcessNAK();
-					PPP_ManageState(PPP_EVENT_RCN, &IPCP_State, PPP_LAYER_Network);
-				break;
-
-				case REJ:
-					Debug_Print("REJ\r\n");
-
-					if (IncomingPacket->PacketID != OutgoingPacketID)
-					{
-						Debug_Print("Out of sync\r\n");
-						break;
-					}
-
-					PPP_ProcessREJ();
-					PPP_ManageState(PPP_EVENT_RCN, &IPCP_State, PPP_LAYER_Network);
-				break;
-			}
-		break;
-
-		case IP:
-			TCPIP_GotNewPacket();
-		break;
-
-		default:
-			Debug_Print("unknown protocol: 0x");
-			Debug_PrintHex(CurrentProtocol / 256); Debug_PrintHex(CurrentProtocol & 255);
-			Debug_Print("\r\n");
-		break;
-	}
-}
-
-
-// Either create a new OutgoingPacket, or if we've just received a NAK or REJ we will have already changed the OutgoingPacket so just send that
-static void Send_Configure_Request(void)
-{
-	Debug_Print("Send Configure Request\r\n");
-	
-	switch(PPP_Phase)
-	{
-		case PPP_PHASE_Establish:
-			if (OutgoingPacket == NULL)																			// Create a new packet
-			{
-				// When we send a REQ, we want to make sure that the other end supports these options
-//				static PPP_Option_t Option1 = {.Type = LCP_OPTION_Maximum_Receive_Unit,					 .Length = 4,	.Data = {0x5, 0xa0}};
-				static PPP_Option_t Option2 = {.Type = LCP_OPTION_Async_Control_Character_Map,			 .Length = 6,	.Data = {0x0, 0x0, 0x0, 0x0}};
-				static PPP_Option_t Option5 = {.Type = LCP_OPTION_Magic_Number,							 .Length = 6,	.Data = {0x27, 0xf5, 0x46, 0xa1}};
-				static PPP_Option_t Option7 = {.Type = LCP_OPTION_Protocol_Field_Compression,			 .Length = 2};
-				static PPP_Option_t Option8 = {.Type = LCP_OPTION_Address_and_Control_Field_Compression, .Length = 2};
-				static PPP_Option_t OptionD = {.Type = LCP_OPTION_Callback,								 .Length = 3,	.Data = {0x6}};
-				
-				//PPP_AddOption(OutgoingPacket, &Option1);
-				PPP_AddOption(&Option2);
-				PPP_AddOption(&Option5);
-				PPP_AddOption(&Option7);
-				PPP_AddOption(&Option8);
-				PPP_AddOption(&OptionD);
-				OutgoingPacket->Code = REQ;
-				CurrentProtocol = LCP;
-			}
-		break;
-
-		case PPP_PHASE_Authenticate:
-			if (OutgoingPacket == NULL)																			// Create a new packet
-			{
-				static PPP_Option_t Option0 = {.Type = 0x00, .Length = 2};
-			
-				PPP_AddOption(&Option0);
-				OutgoingPacket->Options[0].Type = 0x00;															// No User Name 
-                OutgoingPacket->Options[0].Length = 0x00;														// No Password
-				OutgoingPacket->Code = REQ;
-				CurrentProtocol = PAP;
-			}
-		break;
-
-		case PPP_PHASE_Network:
-			if (OutgoingPacket == NULL)																			// Create a new packet
-			{
-				// When we send a REQ, we want to make sure that the other end supports these options
-				static PPP_Option_t Option3  = {.Type = IPCP_OPTION_IP_address,    .Length = 6, .Data = {0, 0, 0, 0}};		
-				static PPP_Option_t Option81 = {.Type = IPCP_OPTION_Primary_DNS,   .Length = 6, .Data = {0, 0, 0, 0}};
-				static PPP_Option_t Option83 = {.Type = IPCP_OPTION_Secondary_DNS, .Length = 6, .Data = {0, 0, 0, 0}};
-				
-				PPP_AddOption(&Option3);																		// Make sure Option3 is first
-				PPP_AddOption(&Option81);
-				PPP_AddOption(&Option83);
-				OutgoingPacket->Code = REQ;
-				CurrentProtocol = IPCP;
-			}
-		break;
-
-		default:
-		break;
-	}
-
-	OutgoingPacket->PacketID = ++OutgoingPacketID;																// Every new REQ Packet going out gets a new ID
-	RestartCount--;																								// Decrement the count before we restart the layer
-	uip_len = uip_ntohs(OutgoingPacket->Length);
-	memcpy(uip_buf, OutgoingPacket, uip_len);																	// Copy the outgoing packet to the buffer for sending
-
-	network_send(CurrentProtocol);																				// Send either the new packet or the modified packet
-}
-
-
-// We change the incoming packet code to send an ACK to the remote end, and re-use all the data from the incoming packet
-static void Send_Configure_Ack(void)
-{
-	Debug_Print("Send Configure ACK\r\n");
-
-	IncomingPacket->Code = ACK;
-	network_send(CurrentProtocol);
-}
-
-// We change the incoming packet code to send a NAK or REJ to the remote end. The incoming packet has already been altered to show which options to NAK/REJ
-static void Send_Configure_Nak_Rej(void)
-{
-	if (MarkForNAK)
-	{
-		Debug_Print("Send Configure NAK\r\n");
-		IncomingPacket->Code = NAK;
-	}
-	else if (MarkForREJ)
-	{
-		Debug_Print("Send Configure REJ\r\n");
-		IncomingPacket->Code = REJ;
-	}
-	else
-	{
-		return;
-	}
-
-	uip_len = uip_ntohs(IncomingPacket->Length);
-	network_send(CurrentProtocol);
-}
-
-// Send a TERM to the remote end.
-static void Send_Terminate_Request(void)
-{
-	Debug_Print("Send Terminate Request\r\n");
-	
-	OutgoingPacket = (PPP_Packet_t*)uip_buf;																	// Build the outgoing packet in uip_buf
-	CurrentProtocol = LCP;
-	OutgoingPacket->Code = TERMREQ;
-	OutgoingPacket->Length = UIP_HTONS(sizeof(PPP_Packet_t));
-	OutgoingPacket->PacketID = ++OutgoingPacketID;																// Every new REQ Packet going out gets a new ID
-
-	RestartCount--;
-
-	uip_len = uip_ntohs(OutgoingPacket->Length);
-	network_send(CurrentProtocol);																				// Send the packet
-}
-
-// Send a TERM ACK to the remote end.
-static void Send_Terminate_Ack(void)
-{
-	Debug_Print("Send Terminate ACK\r\n");
-
-	IncomingPacket->Code = TERMREPLY;
-	network_send(CurrentProtocol);
-}
-
-// Send a REJ to the remote end.
-static void Send_Code_Reject(void)
-{
-	Debug_Print("Send Code Reject\r\n");
-
-	IncomingPacket->Code = CODEREJ;
-	network_send(CurrentProtocol);
-}
-
-// Send an ECHO to the remote end.
-static void Send_Echo_Reply(void)
-{
-	Debug_Print("Send Echo Reply\r\n");
-
-	IncomingPacket->Code = ECHOREPLY;
-	network_send(CurrentProtocol);
-}
-
-// Called by the state machine when the current layer comes up. Use this to start the next layer up.
-static void This_Layer_Up(PPP_Layers_t Layer)
-{
-	CurrentProtocol = NONE;
-	OutgoingPacket = NULL;																						// Clear the outgoing packet
-
-	switch(Layer)
-	{
-		case PPP_LAYER_Physical:
-			Debug_Print("**LCP Up**\r\n");
-			PPP_Phase = PPP_PHASE_Authenticate;
-			OutgoingPacketID = -1;
-			PPP_ManageState(PPP_EVENT_Open, &PAP_State, PPP_LAYER_Authentication);
-			PPP_ManageState(PPP_EVENT_Up, &PAP_State, PPP_LAYER_Authentication);
-		break;
-
-		case PPP_LAYER_Authentication:
-			Debug_Print("**PAP Up**\r\n");
-			PPP_Phase = PPP_PHASE_Network;
-			OutgoingPacketID = -1;
-			PPP_ManageState(PPP_EVENT_Open, &IPCP_State, PPP_LAYER_Network);
-			PPP_ManageState(PPP_EVENT_Up, &IPCP_State, PPP_LAYER_Network);
-		break;
-
-		case PPP_LAYER_Network:
-			Debug_Print("**IPCP Up**\r\n");
-			ConnectedState = LINKMANAGEMENT_STATE_InitializeTCPStack;
-		break;
-
-		default:
-		break;
-	}
-}
-
-// Called by the state machine when a layer goes down. Use this to stop the next layer up
-static void This_Layer_Down(PPP_Layers_t Layer)
-{
-	OutgoingPacket = NULL;																						// Clear the outgoing packet
-
-	switch(Layer)
-	{
-		case PPP_LAYER_Physical:
-			Debug_Print("**LCP Down**\r\n");
-			PPP_ManageState(PPP_EVENT_Down, &PAP_State, PPP_LAYER_Authentication);
-			PPP_Phase = PPP_PHASE_Establish;
-		break;
-
-		case PPP_LAYER_Authentication:
-			Debug_Print("**PAP Down**\r\n");
-			PPP_ManageState(PPP_EVENT_Down, &IPCP_State, PPP_LAYER_Network);
-		break;
-
-		case PPP_LAYER_Network:
-			Debug_Print("**IPCP Down**\r\n");
-		break;
-
-		default:
-		break;
-	}
-}
-
-// Called by the state machine when the current layer starts
-static void This_Layer_Started(PPP_Layers_t Layer)
-{
-	switch(Layer)
-	{
-		case PPP_LAYER_Physical:
-			Debug_Print("**LCP Started**\r\n");
-		break;
-
-		case PPP_LAYER_Authentication:
-			Debug_Print("**PAP Started**\r\n");
-		break;
-
-		case PPP_LAYER_Network:
-			Debug_Print("**IPCP Started**\r\n");
-		break;
-
-		default:
-		break;
-	}
-}
-
-// Called by the state machine when the current layer finishes
-static void This_Layer_Finished(PPP_Layers_t Layer)
-{
-	switch(Layer)
-	{
-		case PPP_LAYER_Physical:
-			Debug_Print("**LCP Finished**\r\n");
-		break;
-
-		case PPP_LAYER_Authentication:
-			Debug_Print("**PAP Finished**\r\n");
-		break;
-
-		case PPP_LAYER_Network:
-			Debug_Print("**IPCP Finished**\r\n");
-		break;
-
-		default:
-		break;
-	}
-
-	Debug_Print("**Rebooting**\r\n");
-	Reboot();
-}
-
-
-// We get a NAK if our outbound Configure Request contains valid options, but the values are wrong. So we adjust our values for when the next Configure Request is sent
-static void PPP_ProcessNAK(void)
-{
-	PPP_Option_t* CurrentOption = NULL;
-
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)		// Scan options in NAK packet
-	{
-		if (PPP_CheckForOption(CurrentOption))
-			PPP_ChangeOption(OutgoingPacket, CurrentOption);								// If the NAK'd option is already in the outgoing packet then change the existing option
-		else
-			PPP_AddOption(CurrentOption);													// Otherwise add it
-	}
-}
-
-// We get a REJ if our outbound Configure Request contains any options not acceptable to the remote end. So we remove those options.
-static void PPP_ProcessREJ(void)
-{
-	PPP_Option_t* CurrentOption = NULL;
-
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)		// Scan options in REJ packet
-	  PPP_RemoveOption(OutgoingPacket, CurrentOption->Type);								// Remove the options(s) we don't want
-}
-
-// Test to see if the incoming packet contains any options we can't support If so, take out all good options and leave the bad ones to be sent out in the REJ
-static bool PPP_TestForREJ(const uint8_t Options[],
-                           const uint8_t NumOptions)
-{
-	PPP_Option_t* CurrentOption = NULL;
-	bool FoundBadOption = false;
-	bool ThisOptionOK;
-
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)		// Scan incoming options
-	{
-		ThisOptionOK = false;
-
-		for (uint8_t i = 0; i < NumOptions; i++)
-		{
-			if (CurrentOption->Type == Options[i])
-			{
-				ThisOptionOK = true;
-				break;
-			}
-		}
-
-		if (!ThisOptionOK)
-		  FoundBadOption = true;
-	}
-	
-	if (!FoundBadOption)																	// No bad options. Return, leaving the packet untouched
-	  return false;
-
-	// We found some bad options, so now we need to go through the packet and remove all others, leaving the bad options to be sent out in the REJ
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)
-	{
-		for (uint8_t i = 0; i < NumOptions; i++)
-		{
-			if (CurrentOption->Type == Options[i])
-			{
-				PPP_RemoveOption(IncomingPacket, CurrentOption->Type);
-				CurrentOption = NULL;														// Start again. Easier than moving back (as next option has now moved into place of current option)
-				break;
-			}
-		}
-	}
-
-	return true;
-}
-
-// Test to see if the incoming packet contains an option with values that we can't accept
-static bool PPP_TestForNAK(const PPP_Option_t* const Option)
-{
-	PPP_Option_t* CurrentOption = NULL;
-	bool FoundBadOption = false;
-	
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)		// Scan options in receiver buffer
-	{
-		if (CurrentOption->Type == Option->Type)
-		{	
-			for (uint8_t i = 0; i < Option->Length - 2; i++)
-			{
-				if (CurrentOption->Data[i] != Option->Data[i])
-				  FoundBadOption = true;
-			}
-		}
-	}
-	
-	if (!FoundBadOption)																	// No bad option. Return, leaving the packet untouched
-	  return false;
-
-	// We found a bad option, so now we need to go through the packet and remove all others, leaving the bad option to be sent out in the NAK
-	// and change the bad option to have a value that we can support
-	while ((CurrentOption = PPP_GetNextOption(IncomingPacket, CurrentOption)) != NULL)
-	{
-		if (CurrentOption->Type == Option->Type)
-		{
-			PPP_ChangeOption(IncomingPacket, Option);
-		}
-		else
-		{
-			PPP_RemoveOption(IncomingPacket, CurrentOption->Type);
-			CurrentOption = NULL;															// Start again. Easier than moving back (as next option has now moved into place of current option)
-		}
-	}
-
-	return true;
-}
-
-
-/////////////////////////////
-// Packet Helper functions //
-/////////////////////////////
-
-// Check if the given option is in the outgoing packet
-static bool PPP_CheckForOption(const PPP_Option_t* const Option)
-{
-	PPP_Option_t* CurrentOption = NULL;
-
-	while ((CurrentOption = PPP_GetNextOption(OutgoingPacket, CurrentOption)) != NULL)		// Scan options in the packet
-	{
-		if (CurrentOption->Type == Option->Type)
-		  return true;
-	}
-
-	return false;
-}
-
-// Add the given option to the end of the outgoing packet and adjust the size of the packet
-static void PPP_AddOption(const PPP_Option_t* const Option)
-{
-	uint16_t OldPacketLength, NewPacketLength;
-	
-	if (OutgoingPacket == NULL)
-	{
-		OutgoingPacket = (PPP_Packet_t*)&OutgoingPacketBuffer;
-		OldPacketLength = sizeof(PPP_Packet_t);												// If we're creating a new empty packet
-	}
-	else
-		OldPacketLength = uip_ntohs(OutgoingPacket->Length);									// If the packet already exists
-	
-	NewPacketLength = OldPacketLength + Option->Length;
-	
-	if (NewPacketLength > OUTGOING_PACKET_BUFFER_SIZE)
-	{
-		Debug_Print("*** Packet overflow ***\r\n");
-		return;
-	}
-	
-	memcpy((void*)OutgoingPacket + OldPacketLength, Option, Option->Length);				// Add the new option
-	
-	OutgoingPacket->Length = uip_htons(NewPacketLength);
-}
-
-// Try and find the option in the packet, and if it exists, change its value to that in the passed-in option (assumes the option lengths are the same)
-static void PPP_ChangeOption(PPP_Packet_t* const ThisPacket,
-                             const PPP_Option_t* const Option)
-{
-	PPP_Option_t* CurrentOption = NULL;
-
-	while ((CurrentOption = PPP_GetNextOption(ThisPacket, CurrentOption)) != NULL)			// Scan options in the packet
-	{
-		if (CurrentOption->Type == Option->Type)
-		  memcpy(CurrentOption->Data, Option->Data, Option->Length - 2);					// Copy the data portion of the option (not Type or Length)
-	}
-}
-
-// Try and find the option in the packet, and if it exists remove it and adjust the size of the packet
-static void PPP_RemoveOption(PPP_Packet_t* const ThisPacket,
-                             const uint8_t Type)
-{
-	PPP_Option_t* CurrentOption = NULL;
-	PPP_Option_t* NextOption = NULL;
-
-	while ((CurrentOption = PPP_GetNextOption(ThisPacket, CurrentOption)) != NULL)					// Scan the options in the packet
-	{
-		if (CurrentOption->Type == Type)															// Is it the packet we want to remove?
-		{
-			NextOption = PPP_GetNextOption(ThisPacket, CurrentOption);								// Find the next option in the packet
-			uint8_t OptionLength = CurrentOption->Length;											// Save the Option Length as the memcpy will change CurrentOption->Length
-
-			if (NextOption != NULL)																	// If it's not the last option in the packet ...
-			{
-				uint16_t LenToCopy = uip_ntohs(ThisPacket->Length) - ((void*)CurrentOption - (void*)ThisPacket) - OptionLength;
-			    memcpy(CurrentOption, NextOption, LenToCopy);										// ... move all further options forward
-			}
-
-			ThisPacket->Length = uip_htons(uip_ntohs(ThisPacket->Length) - OptionLength);					// Adjust the length
-		}
-	}
-}
-
-// Get the next option in the packet from the option that is passed in. Return NULL if last packet
-static PPP_Option_t* PPP_GetNextOption(const PPP_Packet_t* const ThisPacket,
-                                       const PPP_Option_t* const CurrentOption)
-{
-	PPP_Option_t* NextOption;
-	
-	if (CurrentOption == NULL)
-		NextOption = (PPP_Option_t*)ThisPacket->Options;											// First option
-	else
-		NextOption = (PPP_Option_t*)((uint8_t*)CurrentOption + CurrentOption->Length);
-
-	// Check that we haven't overrun the end of the packet
-	if (((void*)NextOption - (void*)ThisPacket->Options) < (uip_ntohs(ThisPacket->Length) - 4))
-		return NextOption;
-	else 
-		return NULL;
-}
-
-
-
-/////////////////////////////////////////////////////////////////////////////////////////
-// The main PPP state machine - following RFC1661 - http://tools.ietf.org/html/rfc1661 //
-/////////////////////////////////////////////////////////////////////////////////////////
-
-static void PPP_ManageState(const PPP_Events_t Event,
-                     PPP_States_t* const State,
-					 PPP_Layers_t const Layer)
-{
-	switch (*State)
-	{
-		case PPP_STATE_Initial:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Up:
-					*State = PPP_STATE_Closed;
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Starting;
-					This_Layer_Started(Layer);
-				break;
-
-				case PPP_EVENT_Close:
-					*State = PPP_STATE_Initial;
-				break;
-
-				case PPP_EVENT_TOPlus:
-				case PPP_EVENT_TOMinus:
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Starting:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Up:
-					*State = PPP_STATE_Req_Sent;
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Configure_Request();
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Starting;
-				break;
-
-				case PPP_EVENT_Close:
-					*State = PPP_STATE_Initial;
-					This_Layer_Finished(Layer);
-				break;
-
-				case PPP_EVENT_TOPlus:
-				case PPP_EVENT_TOMinus:
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Closed:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Initial;
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Req_Sent;
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Configure_Request();
-				break;
-
-				case PPP_EVENT_Close:
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Closed;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-				case PPP_EVENT_RCRMinus:
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-					*State = PPP_STATE_Closed;
-					Send_Terminate_Ack();
-				break;
-
-				case PPP_EVENT_TOPlus:
-				case PPP_EVENT_TOMinus:
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Stopped:
-			
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Starting;
-					This_Layer_Started(Layer);
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_Close:
-					*State = PPP_STATE_Closed;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-					*State = PPP_STATE_Ack_Sent;
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Configure_Request();
-					Send_Configure_Ack();
-				break;
-
-				case PPP_EVENT_RCRMinus:
-					*State = PPP_STATE_Req_Sent;
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Configure_Request();
-					Send_Configure_Nak_Rej();
-				break;
-
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-				case PPP_EVENT_RTR:
-					*State = PPP_STATE_Stopped;
-					Send_Terminate_Ack();
-				break;
-
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RUC:
-					*State = PPP_STATE_Stopped;
-					Send_Code_Reject();
-				break;
-				
-				case PPP_EVENT_RXJMinus:
-					*State = PPP_STATE_Stopped;
-					This_Layer_Finished(Layer);
-				break;
-
-				case PPP_EVENT_TOPlus:
-				case PPP_EVENT_TOMinus:
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Closing:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					TimerOn = false;
-					*State = PPP_STATE_Initial;
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Stopping;
-				break;
-
-				case PPP_EVENT_Close:
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_TOPlus:
-					Send_Terminate_Request();
-					*State = PPP_STATE_Closing;
-				break;
-				
-				case PPP_EVENT_TOMinus:
-					*State = PPP_STATE_Closed;
-					TimerOn = false;
-					This_Layer_Finished(Layer);
-				break;
-
-				case PPP_EVENT_RCRPlus:
-				case PPP_EVENT_RCRMinus:
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_RTR:
-					*State = PPP_STATE_Closing;
-					Send_Terminate_Ack();
-				break;
-
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJMinus:
-					*State = PPP_STATE_Closed;
-					TimerOn = false;
-					This_Layer_Finished(Layer);
-				break;
-
-				case PPP_EVENT_RUC:
-					*State = PPP_STATE_Closing;
-					Send_Code_Reject();
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Stopping:
-			
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Starting;
-					TimerOn = false;
-				break;
-
-				case PPP_EVENT_Open:
-					*State = PPP_STATE_Stopping;
-				break;
-
-				case PPP_EVENT_Close:
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_TOPlus:
-					Send_Terminate_Request();
-					*State = PPP_STATE_Stopping;
-				break;
-				
-				case PPP_EVENT_TOMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-				case PPP_EVENT_RCRMinus:
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Stopping;
-				break;
-				
-				case PPP_EVENT_RTR:
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Stopping;
-				break;
-
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RUC:
-					Send_Code_Reject();
-					*State = PPP_STATE_Stopping;
-				break;
-
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Req_Sent:
-			
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Starting;
-					TimerOn = false;
-				break;
-
-				case PPP_EVENT_Open:
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_Close:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					Send_Terminate_Request();
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_TOPlus:
-					Send_Configure_Request();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_TOMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-					if (Layer != PPP_LAYER_Authentication)											// We faked a Configure request for PAP. So no need to answer it if we're in the authentication phase
-						Send_Configure_Ack();															
-
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_RCRMinus:
-					Send_Configure_Nak_Rej();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RCA:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					*State = PPP_STATE_Ack_Rcvd;
-				break;
-
-				case PPP_EVENT_RCN:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					Send_Configure_Request();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RTR:
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RUC:
-					Send_Code_Reject();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RXJMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-				
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Ack_Rcvd:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Starting;
-					TimerOn = false;
-				break;
-
-				case PPP_EVENT_Open:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Ack_Rcvd;
-				break;
-
-				case PPP_EVENT_Close:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					Send_Terminate_Request();
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_TOPlus:
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-					Send_Configure_Request();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_TOMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-					Send_Configure_Ack();
-					This_Layer_Up(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Opened;
-				break;
-
-				case PPP_EVENT_RCRMinus:
-					Send_Configure_Nak_Rej();
-					*State = PPP_STATE_Ack_Rcvd;
-				break;
-
-				case PPP_EVENT_RTR:
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJPlus:
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RUC:
-					Send_Code_Reject();
-					*State = PPP_STATE_Ack_Rcvd;
-				break;
-
-				case PPP_EVENT_RXJMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-				
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Ack_Sent:
-			
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					*State = PPP_STATE_Starting;
-					TimerOn = false;
-				break;
-
-				case PPP_EVENT_Open:
-				case PPP_EVENT_RTA:
-				case PPP_EVENT_RXJPlus:
-				case PPP_EVENT_RXR:
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_Close:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					Send_Terminate_Request();
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_TOPlus:
-					Send_Configure_Request();
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_TOMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-					Send_Configure_Ack();
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_RCRMinus:
-					Send_Configure_Nak_Rej();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RCA:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = false;
-					This_Layer_Up(Layer);
-					*State = PPP_STATE_Opened;
-				break;
-
-				case PPP_EVENT_RCN:
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					Send_Configure_Request();
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_RTR:
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RUC:
-					Send_Code_Reject();
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_RXJMinus:
-					This_Layer_Finished(Layer);
-					TimerOn = false;
-					*State = PPP_STATE_Stopped;
-				break;
-				
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		case PPP_STATE_Opened:
-
-			switch (Event)
-			{
-				case PPP_EVENT_Down:
-					This_Layer_Down(Layer);
-					*State = PPP_STATE_Starting;
-				break;
-
-				case PPP_EVENT_Open:
-				case PPP_EVENT_RXJPlus:
-					*State = PPP_STATE_Opened;
-				break;
-
-				case PPP_EVENT_Close:
-					This_Layer_Down(Layer);
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Terminate_Request();
-					*State = PPP_STATE_Closing;
-				break;
-
-				case PPP_EVENT_RCRPlus:
-					This_Layer_Down(Layer);
-					TimerOn = true;
-					Send_Configure_Request();
-					Send_Configure_Ack();
-					*State = PPP_STATE_Ack_Sent;
-				break;
-
-				case PPP_EVENT_RCRMinus:
-					This_Layer_Down(Layer);
-					TimerOn = true;
-					Send_Configure_Request();
-					Send_Configure_Nak_Rej();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RCA:
-				case PPP_EVENT_RCN:
-				case PPP_EVENT_RTA:
-					This_Layer_Down(Layer);
-					TimerOn = true;
-					Send_Configure_Request();
-					*State = PPP_STATE_Req_Sent;
-				break;
-
-				case PPP_EVENT_RTR:
-					This_Layer_Down(Layer);
-					RestartCount = 0;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Terminate_Ack();
-					*State = PPP_STATE_Stopping;
-				break;
-
-				case PPP_EVENT_RUC:
-					Send_Code_Reject();
-					*State = PPP_STATE_Opened;
-				break;
-
-				case PPP_EVENT_RXJMinus:
-					This_Layer_Down(Layer);
-					RestartCount = MAX_RESTARTS;
-					LinkTimer = 0;
-					TimerOn = true;
-					Send_Terminate_Request();
-					*State = PPP_STATE_Stopping;
-				break;
-				
-				case PPP_EVENT_RXR:
-					Send_Echo_Reply();
-					*State = PPP_STATE_Opened;
-				break;
-				
-				default:
-					Debug_Print("Illegal Event\r\n");
-				break;
-			}
-		break;
-
-		default:
-		break;
-	}
-}

--- a/network/PPP.h	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/*
-    LUFA Powered Wireless 3G Modem Host
-	
-    Copyright (C) Mike Alexander, 2010.
-     Copyright (C) Dean Camera, 2010.
-*/
-
-/*
-  Copyright 2010  Mike Alexander (mike [at] mikealex [dot] com)
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#ifndef _PPP_H_
-#define _PPP_H_
-
-	/* Includes: */
-		#include <util/crc16.h>
-		#include <stdbool.h>
-		#include <stdint.h>
-
-		#include "LinkManagement.h"
-		#include "Lib/RingBuff.h"
-		#include "Lib/Debug.h"
-	
-	/* Enums: */
-
-		typedef enum
-		{
-			PPP_LAYER_Physical,
-			PPP_LAYER_Authentication,
-			PPP_LAYER_Network,
-		} PPP_Layers_t;
-
-		typedef enum
-		{
-			PPP_PHASE_Dead,
-			PPP_PHASE_Establish,
-			PPP_PHASE_Authenticate,
-			PPP_PHASE_Network,
-			PPP_PHASE_Terminate
-		} PPP_Phases_t;
-
-		typedef enum
-		{
-			PPP_STATE_Initial,
-			PPP_STATE_Starting,
-			PPP_STATE_Closed,
-			PPP_STATE_Stopped,
-			PPP_STATE_Closing,
-			PPP_STATE_Stopping,
-			PPP_STATE_Req_Sent,
-			PPP_STATE_Ack_Rcvd,
-			PPP_STATE_Ack_Sent,
-			PPP_STATE_Opened
-		} PPP_States_t;
-
-		typedef enum
-		{
-			PPP_EVENT_Up,
-			PPP_EVENT_Down,
-			PPP_EVENT_Open,
-			PPP_EVENT_Close,
-			PPP_EVENT_TOPlus,
-			PPP_EVENT_TOMinus,
-			PPP_EVENT_RCRPlus,
-			PPP_EVENT_RCRMinus,
-			PPP_EVENT_RCA,
-			PPP_EVENT_RCN,
-			PPP_EVENT_RTR,
-			PPP_EVENT_RTA,
-			PPP_EVENT_RUC,
-			PPP_EVENT_RXJPlus,
-			PPP_EVENT_RXJMinus,
-			PPP_EVENT_RXR
-		} PPP_Events_t;
-
-	/* Type Defines: */
-		typedef struct
-		{
-			uint8_t Type;
-			uint8_t Length;
-			uint8_t Data[];
-		} PPP_Option_t;		
-
-		typedef struct
-		{
-			uint8_t Code;
-			uint8_t PacketID;
-			uint16_t Length;
-			PPP_Option_t Options[];
-		} PPP_Packet_t;
-
-	/* Macros: */
-		#define CALC_CRC16(crcvalue, c)    _crc_ccitt_update(crcvalue, c);
-
-		// Defines for LCP Negotiation Codes
-		#define	REQ						1							// Request options list for PPP negotiations
-		#define	ACK						2							// Acknowledge options list for PPP negotiations
-		#define	NAK						3							// Not acknowledged options list for PPP negotiations
-		#define	REJ						4							// Reject options list for PPP negotiations
-		#define	TERMREQ					5							// Termination request for LCP to close connection
-		#define	TERMREPLY				6							// Termination reply
-		#define CODEREJ					7							// Code reject
-		#define PROTREJ					8							// Protocol reject
-		#define ECHOREQ					9							// Echo Request
-		#define ECHOREPLY				10							// Echo Reply
-		#define DISC 					11							// Discard request
-
-		// Packet Types (Protocols)
-		#define	IP 						0x0021						// Internet Protocol packet
-		#define	IPCP 					0x8021						// Internet Protocol Configure Protocol packet
-		#define	LCP						0xC021						// Link Configure Protocol packet
-		#define	PAP						0xC023						// Password Authentication Protocol packet
-		#define CHAP 					0xC223						// Challenge Handshake Authentication Protocol packet
-		#define NONE 					0x0000
-
-		#define LCP_OPTION_Maximum_Receive_Unit 					0x1		// LCP Option 1
-		#define LCP_OPTION_Async_Control_Character_Map 				0x2		// LCP Option 2
-		#define LCP_OPTION_Authentication_Protocol 					0x3		// LCP Option 3
-		#define LCP_OPTION_Quality_Protocol 						0x4		// LCP Option 4
-		#define LCP_OPTION_Magic_Number 							0x5		// LCP Option 5
-		#define LCP_OPTION_Reserved			 						0x6		// LCP Option 6
-		#define LCP_OPTION_Protocol_Field_Compression 				0x7		// LCP Option 7
-		#define LCP_OPTION_Address_and_Control_Field_Compression 	0x8		// LCP Option 8
-		#define LCP_OPTION_Callback								 	0xd		// LCP Option D
-
-		#define IPCP_OPTION_IP_Compression_Protocol					0x2		// IPCP Option 2
-		#define IPCP_OPTION_IP_address								0x3		// IPCP Option 3
-		#define IPCP_OPTION_Primary_DNS								0x81	// IPCP Option 81
-		#define IPCP_OPTION_Secondary_DNS							0x83	// IPCP Option 83
-
-		#define MAX_RESTARTS										5
-		#define OUTGOING_PACKET_BUFFER_SIZE							48
-
-	/* External Variables: */
-		extern uint8_t ConnectedState;
-
-	/* Function Prototypes: */
-		void PPP_ManageLink(void);
-		void PPP_InitPPP(void);
-		void PPP_LinkTimer(void);
-		void PPP_LinkUp(void);
-		void PPP_LinkOpen(void);
-		void PPP_StartLink(void);
-
-		#if defined(INCLUDE_FROM_PPP_C)
-			static PPP_Option_t* PPP_GetNextOption(const PPP_Packet_t* const ThisPacket,
-			                                       const PPP_Option_t* const CurrentOption);
-			static void PPP_RemoveOption(PPP_Packet_t* const ThisPacket,
-			                             const uint8_t Type);
-			static void PPP_AddOption(const PPP_Option_t*);
-			static bool PPP_CheckForOption(const PPP_Option_t*);
-			static void PPP_ChangeOption(PPP_Packet_t* const ThisPacket,
-			                             const PPP_Option_t* const Option);
-			static void PPP_ProcessNAK(void);
-			static void PPP_ProcessREJ(void);
-			static bool PPP_TestForNAK(const PPP_Option_t* const Option);
-			static bool PPP_TestForREJ(const uint8_t Options[],
-			                           const uint8_t NumOptions);
-			static void PPP_ManageState(const PPP_Events_t Event,
-										PPP_States_t* const State,
-										PPP_Layers_t const Layer);
-			static void Send_Configure_Request(void);
-			static void Send_Configure_Ack(void);
-			static void Send_Configure_Nak_Rej(void);
-			static void Send_Terminate_Request(void);
-			static void Send_Terminate_Ack(void);
-			static void Send_Code_Reject(void);
-			static void Send_Echo_Reply(void);
-			static void This_Layer_Up(PPP_Layers_t Layer);
-			static void This_Layer_Down(PPP_Layers_t Layer);
-			static void This_Layer_Started(PPP_Layers_t Layer);
-			static void This_Layer_Finished(PPP_Layers_t Layer);
-		#endif
-		
-#endif
-
-

--- a/network/TCPIP.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
-    LUFA Powered Wireless 3G Modem Host
-	
-    Copyright (C) Mike Alexander, 2010.
-     Copyright (C) Dean Camera, 2010.
-*/
-
-/*
-  Copyright 2010  Mike Alexander (mike [at] mikealex [dot] com)
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-#define  INCLUDE_FROM_TCPIP_C
-#include "TCPIP.h"
-
-uint8_t						IPAddr1, IPAddr2, IPAddr3, IPAddr4;
-static uip_ipaddr_t			RemoteIPAddress;
-static struct uip_conn*		TCPConnection;
-static struct timer			Periodic_Timer;
-
-bool TCPIP_Connect(void)
-{
-	// Connect to the remote machine (www.example.com)
-	uip_ipaddr(&RemoteIPAddress, 192, 0, 32, 10);	
-	TCPConnection = uip_connect(&RemoteIPAddress, UIP_HTONS(80));
-
-	if (TCPConnection != NULL)
-	{
-		Debug_Print("Connecting to host\r\n");
-		return true;
-	}
-	else
-	{
-		Debug_Print("Failed to Connect\r\n");
-		return false;
-	}
-}
-
-void TCPIP_TCPCallback(void)
-{
-	if (uip_acked())
-		Debug_Print("[ACK] ");
-
-	if (uip_newdata())
-	{
-		Debug_Print("New Data:\r\n");
-		TCPIP_QueueData(uip_appdata, uip_datalen());
-		
-		if (TCPIP_IsDataQueueFull())
-		  uip_stop();
-	}
-
-	if (uip_connected())
-	{
-		Debug_Print("Connected - Maximum Segment Size: 0x"); Debug_PrintHex(uip_mss() / 256); Debug_PrintHex(uip_mss() & 255); 
-		Debug_Print("\r\n");
-	}
-
-	if (uip_closed())
-	{
-		Debug_Print("Closed - Reconnecting...");
-		_delay_ms(1000);
-		ConnectedState = LINKMANAGEMENT_STATE_ConnectToRemoteHost;
-	}
-
-	if (uip_aborted())
-	{
-		Debug_Print("Aborted - Reconnecting... ");
-		_delay_ms(1000);
-		ConnectedState = LINKMANAGEMENT_STATE_ConnectToRemoteHost;
-	}
-
-	if (uip_timedout())
-	{
-		Debug_Print("Timeout - Reconnecting...");
-		uip_abort();
-		_delay_ms(1000);
-		ConnectedState = LINKMANAGEMENT_STATE_ConnectToRemoteHost;
-	}
-
-	if (uip_poll() && (SystemTicks > 3000))
-	{
-		SystemTicks = 0;
-		
-		Debug_Print("\r\nSending GET\r\n");
-		TCPIP_SendGET();
-	}
-	
-	if (uip_rexmit())
-	{
-		Debug_Print("\r\nRetransmit GET\r\n");
-		TCPIP_SendGET();
-	}
-
-	if (uip_poll() && uip_stopped(TCPConnection))
-	{
-		if (!(TCPIP_IsDataQueueFull()))
-		  uip_restart();
-	}
-}
-
-static void TCPIP_SendGET(void)
-{
-	const char GETRequest[] = "GET / HTTP/1.1\r\n"
-	                          "Host: www.example.com\r\n"
-	                          "Connection: Keep-Alive\r\n\r\n";
-
-	uip_send(GETRequest, strlen(GETRequest));
-}
-
-static void TCPIP_QueueData(const char* Data,
-                            const uint16_t Length)
-{
-	if (Length > 0)
-		WatchdogTicks = 0;							// Reset the timeout counter
-	
-	for (uint16_t i = 0; i < Length; i++)
-		putchar(Data[i]);
-	
-	Debug_Print("\r\n");
-}
-
-static bool TCPIP_IsDataQueueFull(void)
-{
-	return false;
-}
-
-void TCPIP_InitializeTCPStack(void)
-{
-	Debug_Print("Init TCP Stack\r\n");
-	
-	// Periodic Connection Timer Initialization
-	timer_set(&Periodic_Timer, CLOCK_SECOND / 2);
-	
-	// uIP Initialization
-	network_init();
-	clock_init();
-	uip_init();
-
-	// Set this machine's IP address
-	uip_ipaddr_t LocalIPAddress;
-	uip_ipaddr(&LocalIPAddress, IPAddr1, IPAddr2, IPAddr3, IPAddr4);
-	uip_sethostaddr(&LocalIPAddress);
-
-	ConnectedState = LINKMANAGEMENT_STATE_ConnectToRemoteHost;
-	SystemTicks = 2000;			// Make the first CONNECT happen straight away
-}
-
-void TCPIP_ConnectToRemoteHost(void)
-{
-	if (SystemTicks > 1000)		// Try to connect every 1 second
-	{
-		SystemTicks = 0;
-		
-		if (TCPIP_Connect())
-		{
-			SystemTicks = 3001;	// Make the first GET happen straight away
-			uip_len = 0;
-			ConnectedState = LINKMANAGEMENT_STATE_ManageTCPConnection;
-		}
-	}
-}
-
-void TCPIP_GotNewPacket(void)
-{
-	uip_input();																// Call the TCP/IP stack with the new packet
-																					
-	if (uip_len > 0)															// If the above function invocation resulted in data that should be sent out
-	  network_send(IP);														// on the network, the global variable uip_len is set to a value > 0.
-}
-
-void TCPIP_TCPIPTask(void)
-{
-	if (timer_expired(&Periodic_Timer))
-	{
-		timer_reset(&Periodic_Timer);
-		
-		Debug_PrintChar('*');
-		
-		for (uint8_t i = 0; i < UIP_CONNS; i++)
-		{
-	 		uip_periodic(i);
-	 		 
-	 		if (uip_len > 0)													// If the above function invocation resulted in data that should be sent out on the network,
-			  network_send(IP);												//the global variable uip_len is set to a value > 0.
-		}
-	}
-}

--- a/network/TCPIP.h	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-    LUFA Powered Wireless 3G Modem Host
-	
-    Copyright (C) Mike Alexander, 2010.
-     Copyright (C) Dean Camera, 2010.
-*/
-
-/*
-  Copyright 2010  Mike Alexander (mike [at] mikealex [dot] com)
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this 
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in 
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
-  software without specific, written prior permission.
-
-  The author disclaim all warranties with regard to this
-  software, including all implied warranties of merchantability
-  and fitness.  In no event shall the author be liable for any
-  special, indirect or consequential damages or any damages
-  whatsoever resulting from loss of use, data or profits, whether
-  in an action of contract, negligence or other tortious action,
-  arising out of or in connection with the use or performance of
-  this software.
-*/
-
-/** \file
- *
- *  Header file for TCPIP.c.
- */
-
-#ifndef _TCPIP_H_
-#define _TCPIP_H_
-
-	/* Includes: */
-		#include <stdbool.h>
-		#include <uIP-Contiki/uip.h>
-		#include "Lib/Debug.h"
-	
-	/* External Variables: */
-		extern uint8_t ConnectedState;
-		extern uint8_t  WatchdogTicks;
-		extern uint16_t SystemTicks;
-
-	/* Function Prototypes: */
-		void TCPIP_TCPIPTask(void);
-		void TCPIP_InitializeTCPStack(void);
-		void TCPIP_ConnectToRemoteHost(void);
-		void TCPIP_GotNewPacket(void);
-		void TCPIP_TCPCallback(void);
-
-		#if defined(INCLUDE_FROM_TCPIP_C)
-			static void TCPIP_SendGET(void);
-			static void TCPIP_QueueData(const char* Data,
-			                            const uint16_t Length);
-			static bool TCPIP_IsDataQueueFull(void);
-			static bool TCPIP_Connect(void);
-		#endif
-		
-#endif

--- a/network/clock.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <avr/sfr_defs.h>
-
-#include "clock.h"
-
-//Counted time
-volatile clock_time_t clock_datetime = 0;
-
-//Overflow interrupt
-ISR(TIMER0_COMPA_vect)
-{
-	clock_datetime += 1;
-}
-
-//Initialise the clock
-void clock_init()
-{
-	// 10ms tick interval
-	OCR0A  = ((F_CPU / 1024) / 100);
-	TCCR0A = (1 << WGM01);
-	TCCR0B = ((1 << CS02) | (1 << CS00));
-	TIMSK0 = (1 << OCIE0A);
-}
-
-//Return time
-clock_time_t clock_time()
-{
-	clock_time_t time;
-
-	ATOMIC_BLOCK(ATOMIC_FORCEON)
-	{
-		time = clock_datetime;
-	}
-
-	return time;
-}

--- a/network/clock.h	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#ifndef __CLOCK_ARCH_H__
-#define __CLOCK_ARCH_H__
-
-#include <stdint.h>
-
-typedef uint16_t clock_time_t;
-#define CLOCK_SECOND 100
-void clock_init(void);
-clock_time_t clock_time(void);
-
-#endif /* __CLOCK_ARCH_H__ */

--- a/network/network.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-#define  INCLUDE_FROM_NETWORK_C
-#include "network.h"
-
-static bool Escape = false;
-static uint8_t PacketState = PACKET_STATE_NULL;
-static uint16_t PacketProtocol = 0;
-static uint16_t PacketLength = 0;
-static uint16_t CurrentChecksum, OneBackChecksum, TwoBackChecksum;
-
-
-// Framed packet looks like:
-// Framing:     0x7e
-// Address:     0xff
-// Control:     0x03
-// Protocol:    0xnn 0xnn
-// Information: 0xnn 0xnn 0xnn 0xnn ...
-// Checksum:    0xnn 0xnn
-// Framing:     0x7e
-//
-// If Address-and-Control-Field-Compression is switched on then the remote end is allowed to leave out the 0xff 0x03 in the header
-// If Protocol-Field-Compression is switched on and the protocol < 0x00ff then the remote end is allowed to leave out the initial 0x00 in the protocol field. 
-// We can check for Protocol-Field-Compression by seeing if the first byte of the protocol is odd (the first byte of a full two-byte protocol value must be even).
-
-uint16_t network_read(void)
-{
-	RingBuff_Elements_t c;
-	
-	while (Modem_ReceiveBuffer.Elements)
-	{
-		c = Buffer_GetElement(&Modem_ReceiveBuffer);
-
-		switch (PacketState)
-		{
-			case PACKET_STATE_NULL:
-				if (c == 0x7e)												// New Packet
-				{
-					PacketState = PACKET_STATE_INHEADER;					// We're now in the header
-					PacketLength = 0;
-					CurrentChecksum = 0xffff;								// Start new checksum
-				}
-			break;
-
-			case PACKET_STATE_INHEADER:
-				if (c == 0x7d)												// Escaped character. Set flag and process next time around
-				{
-					Escape = true;
-					continue;
-				}
-				else if (Escape)											// Escaped character. Process now.
-				{
-					Escape = false;
-					c = (c ^ 0x20);
-				}
-				
-				if (PacketLength == 1 && c != 0xff)							// Should be 0xff. If not then Address-and-Control-Field-Compression is switched on
-				{
-					PacketLength += 2;										// Adjust the length as if the 0xff 0x03 was there
-				}		
-
-				if (PacketLength == 3)
-				{
-					if (c & 1)												// Should be even. If it's odd then Protocol-Field-Compression is switched on
-					{
-						PacketProtocol = 0x00;								// Add in the initial 0x00
-						PacketLength++;										// Adjust the length as if the 0x00 was there
-					}
-					else
-						PacketProtocol = c * 256;							// Store the MSB of the protocol
-				}
-
-				if (PacketLength == 4)										// End of header
-				{														
-					PacketProtocol |= c;									// Store the LSB of the protocol
-					PacketLength = -1;										// This will be incremented to 0 at the end of this loop
-					Escape = false;
-					PacketState = PACKET_STATE_INBODY;						// We're now in the body
-				}
-
-				CurrentChecksum = CALC_CRC16(CurrentChecksum, c);			// Calculate checksum
-			break;
-
-			case PACKET_STATE_INBODY:
-				if (c == 0x7e)												// End of packet
-				{
-					uip_len = PacketLength - 2;								// Strip off the checksum and framing
-					Escape = false;
-					PacketState = PACKET_STATE_NULL;						// Back to waiting for a header
-
-					Debug_Print("\r\nReceive ");
-					DumpPacket();
-
-					if (~TwoBackChecksum == (*(uip_buf + PacketLength - 1) * 256 + *(uip_buf + PacketLength - 2)))
-						return PacketProtocol;
-					else
-						Debug_Print("Bad CRC\r\n");
-				}
-				else
-				{	
-					if (c == 0x7d)											// Escaped character. Set flag and process next time around
-					{
-						Escape = true;
-						continue;
-					}
-					else if (Escape)										// Escaped character. Process now.
-					{
-						Escape = false;
-						c = (c ^ 0x20);
-					}
-					
-					*(uip_buf + PacketLength) = c;							// Store the character in the buffer
-
-					TwoBackChecksum = OneBackChecksum;						// Keep a rolling count of the last 3 checksums
-					OneBackChecksum = CurrentChecksum;						// Eventually we need to see if the checksum is valid
-					CurrentChecksum = CALC_CRC16(CurrentChecksum, c);		// and we need the one two back (as the current one includes the checksum itself)
-				}
-			break;
-		}
-		
-		PacketLength++;														// Increment the length of the received packet
-	}
-
-	return 0;																// No data or packet not complete yet 
-}
-
-void network_send(uint16_t protocol)
-{
-	unsigned int checksum = 0xffff;
-	
-	PacketProtocol = protocol;
-	PacketState = PACKET_STATE_NULL;
-	
-	Debug_Print("\r\nSend ");
-	DumpPacket();
-	
-	// Send out the packet with HDLC-like framing  - see http://tools.ietf.org/html/rfc1662
-	
-	// Start with the framing flag
-	Buffer_StoreElement(&Modem_SendBuffer, 0x7e);
-
-	// Address	
-	Buffer_StoreElement(&Modem_SendBuffer, 0xff);
-	checksum = CALC_CRC16(checksum, 0xff);
-
-	// Control
-	Buffer_StoreElement(&Modem_SendBuffer, 0x03);
-	checksum = CALC_CRC16(checksum, 0x03);
-
-	// Protocol
-	Buffer_StoreElement(&Modem_SendBuffer, protocol / 256);
-	checksum = CALC_CRC16(checksum, protocol / 256);
-
-	Buffer_StoreElement(&Modem_SendBuffer, protocol & 255);
-	checksum = CALC_CRC16(checksum, protocol & 255);
-
-	// Add the information, escaping it as necessary
-	for (uint16_t i = 0; i < uip_len; i++)
-	{
-		if (*(uip_buf + i) < 0x20 || *(uip_buf + i) == 0x7d || *(uip_buf + i) == 0x7e)
-		{
-			Buffer_StoreElement(&Modem_SendBuffer, 0x7d);
-			Buffer_StoreElement(&Modem_SendBuffer, *(uip_buf + i) ^ 0x20);
-		}
-		else
-		{
-			Buffer_StoreElement(&Modem_SendBuffer, *(uip_buf + i));
-		}
-
-		checksum = CALC_CRC16(checksum, *(uip_buf + i));
-	
-		if (Modem_SendBuffer.Elements == BUFF_STATICSIZE)    			// Periodically flush the buffer to the modem
-			USBManagement_SendReceivePipes();
-	}
-
-	// Add the checksum to the end of the packet, escaping it as necessary
-	checksum = ~checksum;
-
-	if ((checksum & 255) < 0x20 || (checksum & 255) == 0x7d || (checksum & 255) == 0x7e)
-	{
-		Buffer_StoreElement(&Modem_SendBuffer, 0x7d);
-		Buffer_StoreElement(&Modem_SendBuffer, (checksum & 255) ^ 0x20);
-	}
-   	else
-	{
-		Buffer_StoreElement(&Modem_SendBuffer, checksum & 255);			// Insert checksum MSB
-	}
-	
-	if ((checksum / 256) < 0x20 || (checksum / 256) == 0x7d || (checksum / 256) == 0x7e)
-	{
-		Buffer_StoreElement(&Modem_SendBuffer, 0x7d);
-		Buffer_StoreElement(&Modem_SendBuffer, (checksum / 256) ^ 0x20);
-	}
-	else
-	{
-		Buffer_StoreElement(&Modem_SendBuffer, checksum / 256);			// Insert checksum LSB
-	}
-   
-	Buffer_StoreElement(&Modem_SendBuffer, 0x7e);						// Framing
-
-	uip_len = 0;
-
-	USBManagement_SendReceivePipes();									// Flush the rest of the buffer
-}
-
-void network_init(void)
-{
-	//Initialise the device
-	PacketState = PACKET_STATE_NULL;
-	Escape = false;
-	uip_len = 0;
-}
-
-void DumpPacket(void)
-{
-	int i, j;
-
-	if (!DebugModeEnabled)
-		return;
-
-	Debug_Print("(Protocol = 0x");
-	Debug_PrintHex(PacketProtocol  / 256); Debug_PrintHex(PacketProtocol  & 255);
-	Debug_Print("):\r\n");
-	
-	for (i = 0; i < uip_len; i += 16)
-	{	
-		Debug_PrintHex(i / 256); Debug_PrintHex(i & 255); Debug_Print(": ");
-
-		for (j = 0; j < 16; j++)
-		{
-			if ((i + j) >= uip_len)
-				break;
-
-			Debug_PrintHex(*(uip_buf + i + j));
-			Debug_PrintChar(' ');
-		}
-		
-		Debug_Print("\r\n      ");
-		
-		for (j = 0; j < 16; j++)
-		{
-			if ((i + j) >= uip_len)
-				break;
-
-			if (*(uip_buf + i + j) >= 0x20 && *(uip_buf + i + j) <= 0x7e)
-			{
-				Debug_PrintChar(' ');
-				Debug_PrintChar(*(uip_buf + i + j));
-				Debug_PrintChar(' ');
-			}
-			else
-				Debug_Print(" . ");
-
-		}
-
-		Debug_Print("\r\n");
-	}
-}

--- a/network/network.h	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Simple common network interface that all network drivers should implement.
- */
-
-#ifndef __NETWORK_H__
-#define __NETWORK_H__
-
-	#include <avr/io.h>
-	#include <util/delay.h>
-
-	#include <uIP-Contiki/uip.h>
-
-	#include "USBModem.h"
-	#include "Lib/RingBuff.h"
-	
-	/* External Variables: */
-		extern RingBuff_t Modem_SendBuffer;
-		extern RingBuff_t Modem_ReceiveBuffer;
-		extern bool DebugModeEnabled;
-
-	/* Enums: */
-		enum Packet_States_t
-		{
-			PACKET_STATE_NULL     = 0,
-			PACKET_STATE_INHEADER = 1,
-			PACKET_STATE_INBODY   = 2,
-		};
-
-	/* Function Prototypes: */
-		void network_init(void);
-		uint16_t network_read(void);
-		void network_send(uint16_t protocol);
-				
-		#if defined(INCLUDE_FROM_NETWORK_C)
-			static void DumpPacket(void);
-		#endif
-
-	/*Sets the MAC address of the device*/
-	//void network_set_MAC(uint8_t* mac);
-
-	/*Gets the MAC address of the device*/
-	//void network_get_MAC(uint8_t* mac);
-
-#endif /* __NETWORK_H__ */

--- a/network/test.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-#include <sys/time.h>
-#include "uip.h"
-#include "clock.h"
-
-// clock.c
-clock_time_t 
-clock_time(void)
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    
-    return tv.tv_sec % 65536;
-}
-
-int main(int argc, char ** argv)
-{
-    return 0;
-}

--- a/network/timer.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-/**
- * \addtogroup timer
- * @{
- */
-
-/**
- * \file
- * Timer library implementation.
- * \author
- * Adam Dunkels <[email protected]>
- */
-
-/*
- * Copyright (c) 2004, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the uIP TCP/IP stack
- *
- * Author: Adam Dunkels <[email protected]>
- *
- * $Id: timer.c,v 1.2 2006/06/12 08:00:30 adam Exp $
- */
-
-#include "clock.h"
-#include "timer.h"
-
-/*---------------------------------------------------------------------------*/
-/**
- * Set a timer.
- *
- * This function is used to set a timer for a time sometime in the
- * future. The function timer_expired() will evaluate to true after
- * the timer has expired.
- *
- * \param t A pointer to the timer
- * \param interval The interval before the timer expires.
- *
- */
-void
-timer_set(struct timer *t, clock_time_t interval)
-{
-  t->interval = interval;
-  t->start = clock_time();
-}
-/*---------------------------------------------------------------------------*/
-/**
- * Reset the timer with the same interval.
- *
- * This function resets the timer with the same interval that was
- * given to the timer_set() function. The start point of the interval
- * is the exact time that the timer last expired. Therefore, this
- * function will cause the timer to be stable over time, unlike the
- * timer_rester() function.
- *
- * \param t A pointer to the timer.
- *
- * \sa timer_restart()
- */
-void
-timer_reset(struct timer *t)
-{
-  t->start += t->interval;
-}
-/*---------------------------------------------------------------------------*/
-/**
- * Restart the timer from the current point in time
- *
- * This function restarts a timer with the same interval that was
- * given to the timer_set() function. The timer will start at the
- * current time.
- *
- * \note A periodic timer will drift if this function is used to reset
- * it. For preioric timers, use the timer_reset() function instead.
- *
- * \param t A pointer to the timer.
- *
- * \sa timer_reset()
- */
-void
-timer_restart(struct timer *t)
-{
-  t->start = clock_time();
-}
-/*---------------------------------------------------------------------------*/
-/**
- * Check if a timer has expired.
- *
- * This function tests if a timer has expired and returns true or
- * false depending on its status.
- *
- * \param t A pointer to the timer
- *
- * \return Non-zero if the timer has expired, zero otherwise.
- *
- */
-int
-timer_expired(struct timer *t)
-{
-  return (clock_time_t)(clock_time() - t->start) >= (clock_time_t)t->interval;
-}
-/*---------------------------------------------------------------------------*/
-
-/** @} */

--- a/network/timer.h	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/**
- * \defgroup timer Timer library
- *
- * The timer library provides functions for setting, resetting and
- * restarting timers, and for checking if a timer has expired. An
- * application must "manually" check if its timers have expired; this
- * is not done automatically.
- *
- * A timer is declared as a \c struct \c timer and all access to the
- * timer is made by a pointer to the declared timer.
- *
- * \note The timer library uses the \ref clock "Clock library" to
- * measure time. Intervals should be specified in the format used by
- * the clock library.
- *
- * @{
- */
-
-
-/**
- * \file
- * Timer library header file.
- * \author
- * Adam Dunkels <[email protected]>
- */
-
-/*
- * Copyright (c) 2004, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the uIP TCP/IP stack
- *
- * Author: Adam Dunkels <[email protected]>
- *
- * $Id: timer.h,v 1.3 2006/06/11 21:46:39 adam Exp $
- */
-#ifndef __TIMER_H__
-#define __TIMER_H__
-
-#include "clock.h"
-
-/**
- * A timer.
- *
- * This structure is used for declaring a timer. The timer must be set
- * with timer_set() before it can be used.
- *
- * \hideinitializer
- */
-struct timer {
-  clock_time_t start;
-  clock_time_t interval;
-};
-
-void timer_set(struct timer *t, clock_time_t interval);
-void timer_reset(struct timer *t);
-void timer_restart(struct timer *t);
-int timer_expired(struct timer *t);
-
-#endif /* __TIMER_H__ */
-
-/** @} */

--- a/network/uip.c	Sat Sep 15 21:43:15 2012 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1969 +0,0 @@
-#define DEBUG_PRINTF(...) /*printf(__VA_ARGS__)*/
-
-/**
- * \addtogroup uip
- * @{
- */
-
-/**
- * \file
- * The uIP TCP/IP stack code.
- * \author Adam Dunkels <[email protected]>
- */
-
-/*
- * 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.30 2010/10/19 18:29:04 adamdunkels 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 "net/uip_arp.h"
-//#include "net/uip_arch.h"
-
-#if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the
-		      uip6.c file instead of this one. Therefore
-		      this #ifndef removes the entire compilation
-		      output of the uip.c file */
-
-
-#if UIP_CONF_IPV6
-#include "net/uip-neighbor.h"
-#endif /* UIP_CONF_IPV6 */
-
-#include <string.h>
-
-/*---------------------------------------------------------------------------*/
-/* 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 =
-  { UIP_IPADDR0, UIP_IPADDR1, UIP_IPADDR2, UIP_IPADDR3 };
-const uip_ipaddr_t uip_draddr =
-  { UIP_DRIPADDR0, UIP_DRIPADDR1, UIP_DRIPADDR2, UIP_DRIPADDR3 };
-const uip_ipaddr_t uip_netmask =
-  { UIP_NETMASK0, UIP_NETMASK1, UIP_NETMASK2, UIP_NETMASK3 };
-#else
-uip_ipaddr_t uip_hostaddr, uip_draddr, uip_netmask;
-#endif /* UIP_FIXEDADDR */
-
-const uip_ipaddr_t uip_broadcast_addr =
-#if UIP_CONF_IPV6
-  { { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-      0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
-#else /* UIP_CONF_IPV6 */
-  { { 0xff, 0xff, 0xff, 0xff } };
-#endif /* UIP_CONF_IPV6 */
-const uip_ipaddr_t uip_all_zeroes_addr = { { 0x0, /* rest is 0 */ } };
-
-#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
-
-/* The packet buffer that contains incoming packets. */
-uip_buf_t uip_aligned_buf;
-
-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. */
-
-u8_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. */
-#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 || UIP_UDP
-static u16_t lastport;       /* Keeps track of the last port used for
-				a new connection. */
-#endif /* UIP_ACTIVE_OPEN || UIP_UDP */
-
-/* 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 ICMP_DEST_UNREACHABLE        3
-#define ICMP_PORT_UNREACHABLE        3
-
-#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 */
-
-#if ! UIP_ARCH_ADD32
-void
-uip_add32(u8_t *op32, u16_t op16)
-{
-  uip_acc32[3] = op32[3] + (op16 & 0xff);
-  uip_acc32[2] = op32[2] + (op16 >> 8);
-  uip_acc32[1] = op32[1];
-  uip_acc32[0] = op32[0];
-  
-  if(uip_acc32[2] < (op16 >> 8)) {
-    ++uip_acc32[1];
-    if(uip_acc32[1] == 0) {
-      ++uip_acc32[0];
-    }
-  }
-  
-  
-  if(uip_acc32[3] < (op16 & 0xff)) {
-    ++uip_acc32[2];
-    if(uip_acc32[2] == 0) {
-      ++uip_acc32[1];
-      if(uip_acc32[1] == 0) {
-	++uip_acc32[0];
-      }
-    }
-  }
-}
-
-#endif /* UIP_ARCH_ADD32 */
-
-#if ! UIP_ARCH_CHKSUM
-/*---------------------------------------------------------------------------*/
-static u16_t
-chksum(u16_t sum, const u8_t *data, u16_t len)
-{
-  u16_t t;
-  const u8_t *dataptr;
-  const u8_t *last_byte;
-
-  dataptr = data;
-  last_byte = data + len - 1;
-  
-  while(dataptr < last_byte) {	/* At least two more bytes */
-    t = (dataptr[0] << 8) + dataptr[1];
-    sum += t;
-    if(sum < t) {
-      sum++;		/* carry */
-    }
-    dataptr += 2;
-  }
-  
-  if(dataptr == last_byte) {
-    t = (dataptr[0] << 8) + 0;
-    sum += t;
-    if(sum < t) {
-      sum++;		/* carry */
-    }
-  }
-
-  /* Return sum in host byte order. */
-  return sum;
-}
-/*---------------------------------------------------------------------------*/
-u16_t
-uip_chksum(u16_t *data, u16_t len)
-{
-  return uip_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 : uip_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, 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 : uip_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 */
-#endif /* UIP_ARCH_CHKSUM */
-/*---------------------------------------------------------------------------*/
-void
-uip_init(void)
-{
-  for(c = 0; c < UIP_LISTENPORTS; ++c) {
-    uip_listenports[c] = 0;
-  }
-  for(c = 0; c < UIP_CONNS; ++c) {
-    uip_conns[c].tcpstateflags = UIP_CLOSED;
-  }
-#if UIP_ACTIVE_OPEN || UIP_UDP
-  lastport = 1024;
-#endif /* UIP_ACTIVE_OPEN || UIP_UDP */
-
-#if UIP_UDP
-  for(c = 0; c < UIP_UDP_CONNS; ++c) {
-    uip_udp_conns[c].lport = 0;
-  }
-#endif /* UIP_UDP */
-  
-
-  /* IPv4 initialization. */
-#if UIP_FIXEDADDR == 0
-  /*  uip_hostaddr[0] = uip_hostaddr[1] = 0;*/
-#endif /* UIP_FIXEDADDR */
-
-}
-/*---------------------------------------------------------------------------*/
-#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 == uip_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) {
-    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 = uip_htons(lastport);
-  conn->rport = rport;
-  uip_ipaddr_copy(&conn->ripaddr, ripaddr);
-  
-  return conn;
-}
-#endif /* UIP_ACTIVE_OPEN */
-/*---------------------------------------------------------------------------*/
-#if UIP_UDP
-struct uip_udp_conn *
-uip_udp_new(const 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 == uip_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 = UIP_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;
-  
-  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_listen(u16_t port)
-{
-  for(c = 0; c < UIP_LISTENPORTS; ++c) {
-    if(uip_listenports[c] == 0) {
-      uip_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);
-  uip_conn->rcv_nxt[0] = uip_acc32[0];
-  uip_conn->rcv_nxt[1] = uip_acc32[1];
-  uip_conn->rcv_nxt[2] = uip_acc32[2];
-  uip_conn->rcv_nxt[3] = uip_acc32[3];
-}
-/*---------------------------------------------------------------------------*/
-void
-uip_process(u8_t flag)
-{
-  register struct uip_conn *uip_connr = uip_conn;
-
-#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 &&
-       !uip_outstanding(uip_connr)) {
-	uip_flags = UIP_POLL;
-	UIP_APPCALL();
-	goto appsend;
-#if UIP_ACTIVE_OPEN
-    } else if((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_SYN_SENT) {
-      /* In the SYN_SENT state, we retransmit out SYN. */
-      BUF->flags = 0;
-      goto tcp_send_syn;
-#endif /* UIP_ACTIVE_OPEN */
-    }
-    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. */
-    if(++iss[3] == 0) {
-      if(++iss[2] == 0) {
-	if(++iss[1] == 0) {
-	  ++iss[0];
-	}
-      }
-    }
-
-    /* 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) {
-    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;
-      uip_flags = UIP_POLL;
-      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.");
-    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, &uip_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, &uip_broadcast_addr) ||
-	(BUF->destipaddr.u8[0] & 224) == 224)) {  /* XXX this is a
-						     hack to be able
-						     to receive UDP
-						     multicast
-						     packets. We check
-						     for the bit
-						     pattern of the
-						     multicast
-						     prefix. */
-      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)) {
-      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.u16[0] != UIP_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
-  /* 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_ipaddr_cmp(&uip_hostaddr, &uip_all_zeroes_addr)) {
-    uip_hostaddr = BUF->destipaddr;
-  }
-#endif /* UIP_PINGADDRCONF */
-
-  ICMPBUF->type = ICMP_ECHO_REPLY;
-
-  if(ICMPBUF->icmpchksum >= UIP_HTONS(0xffff - (ICMP_ECHO << 8))) {
-    ICMPBUF->icmpchksum += UIP_HTONS(ICMP_ECHO << 8) + 1;
-  } else {
-    ICMPBUF->icmpchksum += UIP_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);
-  BUF->ttl = UIP_TTL;
-  goto ip_send_nolen;
-
-  /* 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 */
-
-  /* Make sure that the UDP destination port number is not zero. */
-  if(UDPBUF->destport == 0) {
-    UIP_LOG("udp: zero port.");
-    goto drop;
-  }
-
-  /* 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(uip_udp_conn->lport != 0 &&
-       UDPBUF->destport == uip_udp_conn->lport &&
-       (uip_udp_conn->rport == 0 ||
-        UDPBUF->srcport == uip_udp_conn->rport) &&
-       (uip_ipaddr_cmp(&uip_udp_conn->ripaddr, &uip_all_zeroes_addr) ||
-	uip_ipaddr_cmp(&uip_udp_conn->ripaddr, &uip_broadcast_addr) ||
-	uip_ipaddr_cmp(&BUF->srcipaddr, &uip_udp_conn->ripaddr))) {
-      goto udp_found;
-    }
-  }
-  UIP_LOG("udp: no matching connection found");
-#if UIP_CONF_ICMP_DEST_UNREACH && !UIP_CONF_IPV6
-  /* Copy fields from packet header into payload of this ICMP packet. */
-  memcpy(&(ICMPBUF->payload[0]), ICMPBUF, UIP_IPH_LEN + 8);
-
-  /* Set the ICMP type and code. */
-  ICMPBUF->type = ICMP_DEST_UNREACHABLE;
-  ICMPBUF->icode = ICMP_PORT_UNREACHABLE;
-
-  /* Calculate the ICMP checksum. */
-  ICMPBUF->icmpchksum = 0;
-  ICMPBUF->icmpchksum = ~uip_chksum((u16_t *)&(ICMPBUF->type), 36);
-
-  /* Set the IP destination address to be the source address of the
-     original packet. */
-  uip_ipaddr_copy(&BUF->destipaddr, &BUF->srcipaddr);
-
-  /* Set our IP address as the source address. */
-  uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
-
-  /* The size of the ICMP destination unreachable packet is 36 + the
-     size of the IP header (20) = 56. */
-  uip_len = 36 + UIP_IPH_LEN;
-  ICMPBUF->len[0] = 0;
-  ICMPBUF->len[1] = (u8_t)uip_len;
-  ICMPBUF->ttl = UIP_TTL;
-  ICMPBUF->proto = UIP_PROTO_ICMP;
-
-  goto ip_send_nolen;
-#else /* UIP_CONF_ICMP_DEST_UNREACH */
-  goto drop;
-#endif /* UIP_CONF_ICMP_DEST_UNREACH */
-  
- udp_found:
-  uip_conn = NULL;
-  uip_flags = UIP_NEWDATA;
-  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 = UIP_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;
-  }
-
-  /* Make sure that the TCP port number is not zero. */
-  if(BUF->destport == 0 || BUF->srcport == 0) {
-    UIP_LOG("tcp: zero port.");
-    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. */
-  c = BUF->seqno[3];
-  BUF->seqno[3] = BUF->ackno[3];
-  BUF->ackno[3] = c;
-  
-  c = BUF->seqno[2];
-  BUF->seqno[2] = BUF->ackno[2];
-  BUF->ackno[2] = c;
-  
-  c = BUF->seqno[1];
-  BUF->seqno[1] = BUF->ackno[1];
-  BUF->ackno[1] = c;
-  
-  c = BUF->seqno[0];
-  BUF->seqno[0] = BUF->ackno[0];
-  BUF->ackno[0] = c;
-
-  /* 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. */
-  if(++BUF->ackno[3] == 0) {
-    if(++BUF->ackno[2] == 0) {
-      if(++BUF->ackno[1] == 0) {
-	++BUF->ackno[0];
-      }
-    }
-  }
- 
-  /* 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;
-
-  uip_connr->snd_nxt[0] = iss[0];
-  uip_connr->snd_nxt[1] = iss[1];
-  uip_connr->snd_nxt[2] = iss[2];
-  uip_connr->snd_nxt[3] = iss[3];
-  uip_connr->len = 1;
-
-  /* rcv_nxt should be the seqno from the incoming packet + 1. */
-  uip_connr->rcv_nxt[3] = BUF->seqno[3];
-  uip_connr->rcv_nxt[2] = BUF->seqno[2];
-  uip_connr->rcv_nxt[1] = BUF->seqno[1];
-  uip_connr->rcv_nxt[0] = BUF->seqno[0];
-  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;
-  }
-  /* Calculate 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, unless we are in the SYN_RCVD state and
-     receive a SYN, in which case we should retransmit our SYNACK
-     (which is done futher down). */
-  if(!((((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_SYN_SENT) &&
-	((BUF->flags & TCP_CTL) == (TCP_SYN | TCP_ACK))) ||
-       (((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_SYN_RCVD) &&
-	((BUF->flags & TCP_CTL) == TCP_SYN)))) {
-    if((uip_len > 0 || ((BUF->flags & (TCP_SYN | TCP_FIN)) != 0)) &&
-       (BUF->seqno[0] != uip_connr->rcv_nxt[0] ||
-	BUF->seqno[1] != uip_connr->rcv_nxt[1] ||
-	BUF->seqno[2] != uip_connr->rcv_nxt[2] ||
-	BUF->seqno[3] != uip_connr->rcv_nxt[3])) {
-      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(BUF->ackno[0] == uip_acc32[0] &&
-       BUF->ackno[1] == uip_acc32[1] &&
-       BUF->ackno[2] == uip_acc32[2] &&
-       BUF->ackno[3] == uip_acc32[3]) {
-      /* Update sequence number. */
-      uip_connr->snd_nxt[0] = uip_acc32[0];
-      uip_connr->snd_nxt[1] = uip_acc32[1];
-      uip_connr->snd_nxt[2] = uip_acc32[2];
-      uip_connr->snd_nxt[3] = uip_acc32[3];
-	
-      /* 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. */
-      uip_connr->len = 0;
-    }
-    
-  }
-
-  /* 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;
-    }
-    /* We need to retransmit the SYNACK */
-    if((BUF->flags & TCP_CTL) == TCP_SYN) {
-      goto tcp_send_synack;
-    }
-    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;
-      uip_connr->rcv_nxt[0] = BUF->seqno[0];
-      uip_connr->rcv_nxt[1] = BUF->seqno[1];
-      uip_connr->rcv_nxt[2] = BUF->seqno[2];
-      uip_connr->rcv_nxt[3] = BUF->seqno[3];
-      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 && !(uip_connr->tcpstateflags & UIP_STOPPED)) {
-      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;
-      }
-
-      /* If uip_slen > 0, the application has data to be sent. */
-      if(uip_slen > 0) {
-
-	/* 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;
-	}
-      }
-      uip_connr->nrtx = 0;
-    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;
-
-  /* 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. */
- tcp_send:
-  BUF->ackno[0] = uip_connr->rcv_nxt[0];
-  BUF->ackno[1] = uip_connr->rcv_nxt[1];
-  BUF->ackno[2] = uip_connr->rcv_nxt[2];
-  BUF->ackno[3] = uip_connr->rcv_nxt[3];
-  
-  BUF->seqno[0] = uip_connr->snd_nxt[0];
-  BUF->seqno[1] = uip_connr->snd_nxt[1];
-  BUF->seqno[2] = uip_connr->snd_nxt[2];
-  BUF->seqno[3] = uip_connr->snd_nxt[3];
-
-  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;
-  
-  /* Calculate TCP checksum. */
-  BUF->tcpchksum = 0;
-  BUF->tcpchksum = ~(uip_tcpchksum());
-
- 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);
-#if UIP_CONF_IPV6
- send:
-#endif /* UIP_CONF_IPV6 */
-  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
-uip_htons(u16_t val)
-{
-  return UIP_HTONS(val);
-}
-
-u32_t
-uip_htonl(u32_t val)
-{
-  return UIP_HTONL(val);
-}
-/*---------------------------------------------------------------------------*/
-void
-uip_send(const void *data, int len)
-{
-  int copylen;
-#define MIN(a,b) ((a) < (b)? (a): (b))
-  copylen = MIN(len, UIP_BUFSIZE - UIP_LLH_LEN - UIP_TCPIP_HLEN -
-		(int)((char *)uip_sappdata - (char *)&uip_buf[UIP_LLH_LEN + UIP_TCPIP_HLEN]));
-  if(copylen > 0) {
-    uip_slen = copylen;
-    if(data != uip_sappdata) {
-      memcpy(uip_sappdata, (data), uip_slen);
-    }
-  }
-}
-/*---------------------------------------------------------------------------*/
-/** @} */
-#endif /* UIP_CONF_IPV6 */