Disable uIP connection polling for now - this seems to corrupt the buffers.

diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c
index 9a70dad..635a307 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.c
+++ b/Projects/Webserver/Lib/HTTPServerApp.c
@@ -199,7 +199,6 @@ static void HTTPServerApp_SendResponseHeader(void)
        char*               const AppData     = (char*)uip_appdata;\r
 \r
        char*    HeaderToSend;\r
        char*               const AppData     = (char*)uip_appdata;\r
 \r
        char*    HeaderToSend;\r

-       uint16_t HeaderLength;\r

 \r
        /* Determine which HTTP header should be sent to the client */\r
        if (AppState->HTTPServer.FileOpen)\r
 \r
        /* Determine which HTTP header should be sent to the client */\r
        if (AppState->HTTPServer.FileOpen)\r


@@ -214,9 +213,8 @@ static void HTTPServerApp_SendResponseHeader(void)
        }\r
 \r
        /* Copy over the HTTP response header and send it to the receiving client */\r
        }\r
 \r
        /* Copy over the HTTP response header and send it to the receiving client */\r

-       HeaderLength = strlen_P(HeaderToSend);\r
-       strncpy_P(AppData, HeaderToSend, HeaderLength);\r
-       uip_send(AppData, HeaderLength);\r
+       strcpy_P(AppData, HeaderToSend);\r
+       uip_send(AppData, strlen(AppData));\r

 }\r
 \r
 /** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file\r
 }\r
 \r
 /** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file\r

diff --git a/Projects/Webserver/Lib/TELNETServerApp.c b/Projects/Webserver/Lib/TELNETServerApp.c
index cabf527..720f7d1 100644 (file)
--- a/Projects/Webserver/Lib/TELNETServerApp.c
+++ b/Projects/Webserver/Lib/TELNETServerApp.c
@@ -79,15 +79,15 @@ void TELNETServerApp_Callback(void)
                {\r
                        case TELNET_STATE_SendHeader:\r
                                /* Copy over and send the TELNET welcome message upon first connection */\r
                {\r
                        case TELNET_STATE_SendHeader:\r
                                /* Copy over and send the TELNET welcome message upon first connection */\r

-                               strncpy_P(AppData, WelcomeHeader, strlen_P(WelcomeHeader));\r
-                               uip_send(AppData, strlen_P(WelcomeHeader));\r
+                               strcpy_P(AppData, WelcomeHeader);\r
+                               uip_send(AppData, strlen(AppData));\r

                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_SendMenu;\r
                                break;\r
                        case TELNET_STATE_SendMenu:\r
                                /* Copy over and send the TELNET menu to the client */\r
                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_SendMenu;\r
                                break;\r
                        case TELNET_STATE_SendMenu:\r
                                /* Copy over and send the TELNET menu to the client */\r

-                               strncpy_P(AppData, TELNETMenu, strlen_P(TELNETMenu));\r
-                               uip_send(AppData, strlen_P(TELNETMenu));\r
+                               strcpy_P(AppData, TELNETMenu);\r
+                               uip_send(AppData, strlen(AppData));\r

                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_GetCommand;\r
                                break;\r
                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_GetCommand;\r
                                break;\r

diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c
index a2cadd6..1b94e8a 100644 (file)
--- a/Projects/Webserver/Lib/uIPManagement.c
+++ b/Projects/Webserver/Lib/uIPManagement.c
@@ -175,6 +175,7 @@ static void uIPManagement_ProcessIncommingPacket(void)
 /** Manages the currently open network connections, including TCP and (if enabled) UDP. */\r
 static void uIPManagement_ManageConnections(void)\r
 {\r
 /** Manages the currently open network connections, including TCP and (if enabled) UDP. */\r
 static void uIPManagement_ManageConnections(void)\r
 {\r

+#if 0\r

        /* Poll TCP connections for more data to send back to the host */\r
        for (uint8_t i = 0; i < UIP_CONNS; i++)\r
        {\r
        /* Poll TCP connections for more data to send back to the host */\r
        for (uint8_t i = 0; i < UIP_CONNS; i++)\r
        {\r


@@ -189,7 +190,7 @@ static void uIPManagement_ManageConnections(void)
                        RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);\r
                }\r
        }\r
                        RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);\r
                }\r
        }\r

-\r
+#endif\r

        /* Manage open connections for timeouts */\r
        if (timer_expired(&ConnectionTimer))\r
        {\r
        /* Manage open connections for timeouts */\r
        if (timer_expired(&ConnectionTimer))\r
        {\r

diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile
index 9492833..daec03d 100644 (file)
--- a/Projects/Webserver/makefile
+++ b/Projects/Webserver/makefile
@@ -200,11 +200,10 @@ CSTANDARD = -std=gnu99
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 CDEFS += -DENABLE_DHCP=1\r
 \r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 CDEFS += -DENABLE_DHCP=1\r
 \r

-CDEFS += -DUIP_CONF_UDP_CONNS=1 -DUIP_CONF_TCP=1 -DUIP_CONF_MAX_CONNECTIONS=5\r
-CDEFS += -DUIP_CONF_MAX_LISTENPORTS=5 -DUIP_CONF_BUFFER_SIZE=1514 \r
-CDEFS += -DUIP_CONF_LL_802154=0 -DUIP_CONF_LL_80211=0 -DUIP_CONF_ROUTER=0 -DUIP_CONF_ICMP6=0 -DUIP_CONF_LL_802154=0\r
-CDEFS += -DUIP_ARCH_ADD32=0 -DUIP_ARCH_CHKSUM=0 -DUIP_CONF_ICMP_DEST_UNREACH=1 -DUIP_NEIGHBOR_CONF_ADDRTYPE=0\r
-CDEFS += -DUIP_URGDATA=0 -DUIP_CONF_UDP=ENABLE_DHCP\r
+CDEFS += -DUIP_CONF_UDP=ENABLE_DHCP -DUIP_CONF_TCP=1 -DUIP_CONF_UDP_CONNS=1 -DUIP_CONF_MAX_CONNECTIONS=5\r
+CDEFS += -DUIP_CONF_MAX_LISTENPORTS=5 -DUIP_URGDATA=0 -DUIP_CONF_BUFFER_SIZE=1514 -DUIP_ARCH_CHKSUM=0 \r
+CDEFS += -DUIP_CONF_LL_802154=0 -DUIP_CONF_LL_80211=0 -DUIP_CONF_ROUTER=0 -DUIP_CONF_ICMP6=0\r
+CDEFS += -DUIP_ARCH_ADD32=0 -DUIP_CONF_ICMP_DEST_UNREACH=1 -DUIP_NEIGHBOR_CONF_ADDRTYPE=0\r

 \r
 \r
 # Place -D or -U options here for ASM sources\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r