X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/16ea5aa7a2e5f326f8ff129e740a19bb3fb7829f..ec537fd84d6ad3fd0dfa1b55efa2c2d554c1db48:/Projects/Webserver/Lib/uip/uipopt.h diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h index c8b3ad59e..b61a7b4a8 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 @@ -485,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 @@ -626,6 +626,8 @@ void uip_log(char *msg); #include #include +#include "timer.h" + typedef uint8_t u8_t; typedef uint16_t u16_t; typedef uint32_t u32_t; @@ -688,19 +690,19 @@ typedef union { uint8_t CurrentState; uint8_t NextState; - - char FileName[30]; + + 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; @@ -716,9 +718,9 @@ typedef union { struct { - uint8_t CurrentState; - struct uip_udp_conn* Connection; - + uint8_t CurrentState; + struct timer Timeout; + struct { uint8_t AllocatedIP[4]; @@ -733,3 +735,4 @@ typedef union #endif /* __UIPOPT_H__ */ /** @} */ /** @} */ +