Minor documentation improvements.

[pub/USBasp.git] / Projects / Webserver / Lib / uip / uipopt.h

diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h
index a8224d4..520c03f 100644 (file)
--- 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.
  * 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.

  */
 
 /**
  */
 
 /**


@@ -65,6 +62,8 @@
 #ifndef __UIPOPT_H__
 #define __UIPOPT_H__
 
 #ifndef __UIPOPT_H__
 #define __UIPOPT_H__
 

+#include "Config/AppConfig.h"
+

 #ifndef UIP_LITTLE_ENDIAN
 #define UIP_LITTLE_ENDIAN  3412
 #endif /* UIP_LITTLE_ENDIAN */
 #ifndef UIP_LITTLE_ENDIAN
 #define UIP_LITTLE_ENDIAN  3412
 #endif /* UIP_LITTLE_ENDIAN */


@@ -192,12 +191,12 @@
 #define UIP_CONF_IPV6_QUEUE_PKT       0
 #endif
 
 #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
 
 /** 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
 /** Do we do IPv6 fragmentation (default: no) */
 #define UIP_CONF_IPV6_REASSEMBLY      0
 #endif


@@ -207,14 +206,14 @@
 #define UIP_CONF_NETIF_MAX_ADDRESSES  3
 #endif
 
 #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
 
 /** 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 */
 /** 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
 #endif
 
 #ifndef UIP_CONF_ND6_MAX_DEFROUTERS


@@ -285,15 +284,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
  *
  * \hideinitializer
  */
 #ifdef UIP_CONF_TCP
 #define UIP_TCP UIP_CONF_TCP

-#else /* UIP_CONF_UDP */
+#else /* UIP_CONF_TCP */

 #define UIP_TCP           1
 #define UIP_TCP           1

-#endif /* UIP_CONF_UDP */
+#endif /* UIP_CONF_TCP */

 
 /**
  * Determines if support for opening connections from uIP should be
 
 /**
  * Determines if support for opening connections from uIP should be


@@ -349,14 +348,18 @@
  *
  * \hideinitializer
  */
  *
  * \hideinitializer
  */

+#if !defined(UIP_URGDATA)

 #define UIP_URGDATA      0
 #define UIP_URGDATA      0

+#endif

 
 /**
  * The initial retransmission timeout counted in timer pulses.
  *
  * This should not be changed.
  */
 
 /**
  * The initial retransmission timeout counted in timer pulses.
  *
  * This should not be changed.
  */

+#if !defined(UIP_RTO)

 #define UIP_RTO         3
 #define UIP_RTO         3

+#endif

 
 /**
  * The maximum number of times a segment should be retransmitted
 
 /**
  * The maximum number of times a segment should be retransmitted


@@ -364,7 +367,9 @@
  *
  * This should not be changed.
  */
  *
  * This should not be changed.
  */

+#if !defined(UIP_MAXRTX)

 #define UIP_MAXRTX      8
 #define UIP_MAXRTX      8

+#endif

 
 /**
  * The maximum number of times a SYN segment should be retransmitted
 
 /**
  * The maximum number of times a SYN segment should be retransmitted


@@ -373,7 +378,9 @@
  *
  * This should not need to be changed.
  */
  *
  * This should not need to be changed.
  */

+#if !defined(UIP_MAXSYNRTX)

 #define UIP_MAXSYNRTX      5
 #define UIP_MAXSYNRTX      5

+#endif

 
 /**
  * The TCP maximum segment size.
 
 /**
  * The TCP maximum segment size.


@@ -480,14 +487,14 @@
 /**
  * If we use IPHC compression, how many address contexts do we support
  */
 /**
  * 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
  */
 #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
 
 #define SICSLOWPAN_CONF_FRAG  0
 #endif
 


@@ -621,6 +628,8 @@ void uip_log(char *msg);
 #include <stdbool.h>
 #include <stdint.h>
 
 #include <stdbool.h>
 #include <stdint.h>
 

+#include "timer.h"
+

 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;
 typedef uint8_t u8_t;
 typedef uint16_t u16_t;
 typedef uint32_t u32_t;


@@ -657,8 +666,8 @@ typedef uint32_t uip_stats_t;
  typedef struct httpd_state uip_tcp_appstate_t
  \endcode
 */
  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
 
 /**
  * \var #define UIP_APPCALL


@@ -667,8 +676,8 @@ typedef uint32_t uip_stats_t;
  * response to TCP/IP events.
  *
  */
  * 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
 
 /**
  * \var typedef uip_tcp_appstate_t


@@ -677,17 +686,28 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
  * 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;
        {
                uint8_t  CurrentState;
                uint8_t  NextState;

-               
-               char     FileName[30];
+
+               char     FileName[MAX_URI_LENGTH];

                FIL      FileHandle;
                bool     FileOpen;
                uint32_t ACKedFilePos;
                uint16_t SentChunkSize;
                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
 
 /**
  * \var typedef uip_udp_appstate_t


@@ -696,11 +716,13 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
  * 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
                {
                        uint8_t AllocatedIP[4];
                struct
                {
                        uint8_t AllocatedIP[4];


@@ -708,9 +730,11 @@ typedef uint32_t uip_stats_t;
                        uint8_t GatewayIP[4];
                        uint8_t ServerIP[4];
                } DHCPOffer_Data;
                        uint8_t GatewayIP[4];
                        uint8_t ServerIP[4];
                } DHCPOffer_Data;

-       } uip_udp_appstate_t;
+       } DHCPClient;
+} uip_udp_appstate_t;

 /** @} */
 
 #endif /* __UIPOPT_H__ */
 /** @} */
 /** @} */
 /** @} */
 
 #endif /* __UIPOPT_H__ */
 /** @} */
 /** @} */

+