X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/84e1241f8063dab6b82a580584fa11893a162b55..1167b6994363a65eeb035004d13f9b9512b214e2:/Projects/Webserver/Lib/uip/uipopt.h

diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h
index a8224d456..244ce1df1 100644
--- a/Projects/Webserver/Lib/uip/uipopt.h
+++ b/Projects/Webserver/Lib/uip/uipopt.h
@@ -12,9 +12,6 @@
  * should be tweaked to match each specific project. The uIP
  * distribution contains a documented example "uipopt.h" that can be
  * copied and modified for each project.
- *
- * \note Contiki does not use the uipopt.h file to configure uIP, but
- * uses a per-port uip-conf.h file that should be edited instead.
  */
 
 /**
@@ -349,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
@@ -364,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
@@ -373,7 +376,9 @@
  *
  * This should not need to be changed.
  */
+#if !defined(UIP_MAXSYNRTX)
 #define UIP_MAXSYNRTX      5
+#endif
 
 /**
  * The TCP maximum segment size.
@@ -621,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;
@@ -657,8 +664,8 @@ typedef uint32_t uip_stats_t;
  typedef struct httpd_state uip_tcp_appstate_t
  \endcode
 */
-	#define UIP_UDP_APPCALL DHCPApp_Callback
-	void UIP_UDP_APPCALL(void);
+#define UIP_UDP_APPCALL uIPManagement_UDPCallback
+void UIP_UDP_APPCALL(void);
 
 /**
  * \var #define UIP_APPCALL
@@ -667,8 +674,8 @@ typedef uint32_t uip_stats_t;
  * response to TCP/IP events.
  *
  */
-	#define UIP_APPCALL     WebserverApp_Callback
-	void UIP_APPCALL(void);
+#define UIP_APPCALL     uIPManagement_TCPCallback
+void UIP_APPCALL(void);
 
 /**
  * \var typedef uip_tcp_appstate_t
@@ -677,17 +684,28 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-	typedef struct
+typedef union
+{
+	struct
 	{
 		uint8_t  CurrentState;
 		uint8_t  NextState;
 		
-		char     FileName[30];
+		char     FileName[MAX_URI_LENGTH];
 		FIL      FileHandle;
 		bool     FileOpen;
 		uint32_t ACKedFilePos;
 		uint16_t SentChunkSize;
-	} uip_tcp_appstate_t;
+	} HTTPServer;
+	
+	struct
+	{
+		uint8_t  CurrentState;
+		uint8_t  NextState;
+		
+		uint8_t  IssuedCommand;
+	} TELNETServer;
+} uip_tcp_appstate_t;
 
 /**
  * \var typedef uip_udp_appstate_t
@@ -696,10 +714,12 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-	typedef struct
+typedef union
+{
+	struct
 	{
-		uint8_t CurrentState;
-		struct  uip_udp_conn* Connection;
+		uint8_t      CurrentState;
+		struct timer Timeout;
 		
 		struct
 		{
@@ -708,7 +728,8 @@ typedef uint32_t uip_stats_t;
 			uint8_t GatewayIP[4];
 			uint8_t ServerIP[4];
 		} DHCPOffer_Data;
-	} uip_udp_appstate_t;
+	} DHCPClient;
+} uip_udp_appstate_t;
 /** @} */
 
 #endif /* __UIPOPT_H__ */