X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/08e8d6393edeaf775b5c3fc3bf2a76e62698d129..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Projects/Webserver/Lib/uip/uipopt.h

diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h
index 23bce28a3..17f703312 100644
--- a/Projects/Webserver/Lib/uip/uipopt.h
+++ b/Projects/Webserver/Lib/uip/uipopt.h
@@ -189,12 +189,12 @@
 #define UIP_CONF_IPV6_QUEUE_PKT       0
 #endif
 
-#ifndef UIP_CONF_IPV6_CHECKS 
+#ifndef UIP_CONF_IPV6_CHECKS
 /** Do we do IPv6 consistency checks (highly recommended, default: yes) */
 #define UIP_CONF_IPV6_CHECKS          1
 #endif
 
-#ifndef UIP_CONF_IPV6_REASSEMBLY 
+#ifndef UIP_CONF_IPV6_REASSEMBLY
 /** Do we do IPv6 fragmentation (default: no) */
 #define UIP_CONF_IPV6_REASSEMBLY      0
 #endif
@@ -204,14 +204,14 @@
 #define UIP_CONF_NETIF_MAX_ADDRESSES  3
 #endif
 
-#ifndef UIP_CONF_ND6_MAX_PREFIXES 
+#ifndef UIP_CONF_ND6_MAX_PREFIXES
 /** Default number of IPv6 prefixes associated to the node's interface */
 #define UIP_CONF_ND6_MAX_PREFIXES     3
 #endif
 
-#ifndef UIP_CONF_ND6_MAX_NEIGHBORS 
+#ifndef UIP_CONF_ND6_MAX_NEIGHBORS
 /** Default number of neighbors that can be stored in the %neighbor cache */
-#define UIP_CONF_ND6_MAX_NEIGHBORS    4  
+#define UIP_CONF_ND6_MAX_NEIGHBORS    4
 #endif
 
 #ifndef UIP_CONF_ND6_MAX_DEFROUTERS
@@ -282,15 +282,15 @@
  */
 
 /**
- * Toggles whether UDP support should be compiled in or not.
+ * Toggles whether TCP support should be compiled in or not.
  *
  * \hideinitializer
  */
 #ifdef UIP_CONF_TCP
 #define UIP_TCP UIP_CONF_TCP
-#else /* UIP_CONF_UDP */
+#else /* UIP_CONF_TCP */
 #define UIP_TCP           1
-#endif /* UIP_CONF_UDP */
+#endif /* UIP_CONF_TCP */
 
 /**
  * Determines if support for opening connections from uIP should be
@@ -346,14 +346,18 @@
  *
  * \hideinitializer
  */
+#if !defined(UIP_URGDATA)
 #define UIP_URGDATA      0
+#endif
 
 /**
  * The initial retransmission timeout counted in timer pulses.
  *
  * This should not be changed.
  */
+#if !defined(UIP_RTO)
 #define UIP_RTO         3
+#endif
 
 /**
  * The maximum number of times a segment should be retransmitted
@@ -361,7 +365,9 @@
  *
  * This should not be changed.
  */
+#if !defined(UIP_MAXRTX)
 #define UIP_MAXRTX      8
+#endif
 
 /**
  * The maximum number of times a SYN segment should be retransmitted
@@ -370,7 +376,9 @@
  *
  * This should not need to be changed.
  */
+#if !defined(UIP_MAXSYNRTX)
 #define UIP_MAXSYNRTX      5
+#endif
 
 /**
  * The TCP maximum segment size.
@@ -477,14 +485,14 @@
 /**
  * If we use IPHC compression, how many address contexts do we support
  */
-#ifndef SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 
+#ifndef SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS
 #define SICSLOWPAN_CONF_MAX_ADDR_CONTEXTS 1
 #endif
 
 /**
  * Do we support 6lowpan fragmentation
  */
-#ifndef SICSLOWPAN_CONF_FRAG  
+#ifndef SICSLOWPAN_CONF_FRAG
 #define SICSLOWPAN_CONF_FRAG  0
 #endif
 
@@ -618,6 +626,8 @@ void uip_log(char *msg);
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "timer.h"
+
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;
@@ -654,7 +664,7 @@ typedef uint32_t uip_stats_t;
  typedef struct httpd_state uip_tcp_appstate_t
  \endcode
 */
-#define UIP_UDP_APPCALL DHCPApp_Callback
+#define UIP_UDP_APPCALL uIPManagement_UDPCallback
 void UIP_UDP_APPCALL(void);
 
 /**
@@ -664,7 +674,7 @@ void UIP_UDP_APPCALL(void);
  * response to TCP/IP events.
  *
  */
-#define UIP_APPCALL     HTTPServerApp_Callback
+#define UIP_APPCALL     uIPManagement_TCPCallback
 void UIP_APPCALL(void);
 
 /**
@@ -674,16 +684,27 @@ void UIP_APPCALL(void);
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-typedef struct
+typedef union
 {
-	uint8_t  CurrentState;
-	uint8_t  NextState;
-	
-	char     FileName[30];
-	FIL      FileHandle;
-	bool     FileOpen;
-	uint32_t ACKedFilePos;
-	uint16_t SentChunkSize;
+	struct
+	{
+		uint8_t  CurrentState;
+		uint8_t  NextState;
+
+		char     FileName[MAX_URI_LENGTH];
+		FIL      FileHandle;
+		bool     FileOpen;
+		uint32_t ACKedFilePos;
+		uint16_t SentChunkSize;
+	} HTTPServer;
+
+	struct
+	{
+		uint8_t  CurrentState;
+		uint8_t  NextState;
+
+		uint8_t  IssuedCommand;
+	} TELNETServer;
 } uip_tcp_appstate_t;
 
 /**
@@ -693,21 +714,25 @@ typedef struct
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-typedef struct
+typedef union
 {
-	uint8_t CurrentState;
-	struct  uip_udp_conn* Connection;
-	
 	struct
 	{
-		uint8_t AllocatedIP[4];
-		uint8_t Netmask[4];
-		uint8_t GatewayIP[4];
-		uint8_t ServerIP[4];
-	} DHCPOffer_Data;
+		uint8_t      CurrentState;
+		struct timer Timeout;
+
+		struct
+		{
+			uint8_t AllocatedIP[4];
+			uint8_t Netmask[4];
+			uint8_t GatewayIP[4];
+			uint8_t ServerIP[4];
+		} DHCPOffer_Data;
+	} DHCPClient;
 } uip_udp_appstate_t;
 /** @} */
 
 #endif /* __UIPOPT_H__ */
 /** @} */
 /** @} */
+