diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-03 11:31:59 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-03 11:31:59 +0000 |
| commit | b9cf4815e5445db2d805117c90adaa1755c853cf (patch) | |
| tree | 536170467a2ad8129ff0cbb24faabd76bbf83f4f | |
| parent | 16ea5aa7a2e5f326f8ff129e740a19bb3fb7829f (diff) | |
| download | lufa-b9cf4815e5445db2d805117c90adaa1755c853cf.tar.gz lufa-b9cf4815e5445db2d805117c90adaa1755c853cf.tar.bz2 lufa-b9cf4815e5445db2d805117c90adaa1755c853cf.zip | |
Disable uIP connection polling for now - this seems to corrupt the buffers.
| -rw-r--r-- | Projects/Webserver/Lib/HTTPServerApp.c | 6 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/TELNETServerApp.c | 8 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/uIPManagement.c | 3 | ||||
| -rw-r--r-- | Projects/Webserver/makefile | 9 |
4 files changed, 12 insertions, 14 deletions
diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c index 9a70dade1..635a3076c 100644 --- 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;
char* HeaderToSend;
- uint16_t HeaderLength;
/* Determine which HTTP header should be sent to the client */
if (AppState->HTTPServer.FileOpen)
@@ -214,9 +213,8 @@ static void HTTPServerApp_SendResponseHeader(void) }
/* Copy over the HTTP response header and send it to the receiving client */
- HeaderLength = strlen_P(HeaderToSend);
- strncpy_P(AppData, HeaderToSend, HeaderLength);
- uip_send(AppData, HeaderLength);
+ strcpy_P(AppData, HeaderToSend);
+ uip_send(AppData, strlen(AppData));
}
/** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file
diff --git a/Projects/Webserver/Lib/TELNETServerApp.c b/Projects/Webserver/Lib/TELNETServerApp.c index cabf52756..720f7d14c 100644 --- a/Projects/Webserver/Lib/TELNETServerApp.c +++ b/Projects/Webserver/Lib/TELNETServerApp.c @@ -79,15 +79,15 @@ void TELNETServerApp_Callback(void) {
case TELNET_STATE_SendHeader:
/* Copy over and send the TELNET welcome message upon first connection */
- strncpy_P(AppData, WelcomeHeader, strlen_P(WelcomeHeader));
- uip_send(AppData, strlen_P(WelcomeHeader));
+ strcpy_P(AppData, WelcomeHeader);
+ uip_send(AppData, strlen(AppData));
AppState->TELNETServer.NextState = TELNET_STATE_SendMenu;
break;
case TELNET_STATE_SendMenu:
/* Copy over and send the TELNET menu to the client */
- strncpy_P(AppData, TELNETMenu, strlen_P(TELNETMenu));
- uip_send(AppData, strlen_P(TELNETMenu));
+ strcpy_P(AppData, TELNETMenu);
+ uip_send(AppData, strlen(AppData));
AppState->TELNETServer.NextState = TELNET_STATE_GetCommand;
break;
diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index a2cadd674..1b94e8afa 100644 --- 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. */
static void uIPManagement_ManageConnections(void)
{
+#if 0
/* Poll TCP connections for more data to send back to the host */
for (uint8_t i = 0; i < UIP_CONNS; i++)
{
@@ -189,7 +190,7 @@ static void uIPManagement_ManageConnections(void) RNDIS_Host_SendPacket(&Ethernet_RNDIS_Interface, uip_buf, uip_len);
}
}
-
+#endif
/* Manage open connections for timeouts */
if (timer_expired(&ConnectionTimer))
{
diff --git a/Projects/Webserver/makefile b/Projects/Webserver/makefile index 949283383..daec03d0b 100644 --- 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)
CDEFS += -DENABLE_DHCP=1
-CDEFS += -DUIP_CONF_UDP_CONNS=1 -DUIP_CONF_TCP=1 -DUIP_CONF_MAX_CONNECTIONS=5
-CDEFS += -DUIP_CONF_MAX_LISTENPORTS=5 -DUIP_CONF_BUFFER_SIZE=1514
-CDEFS += -DUIP_CONF_LL_802154=0 -DUIP_CONF_LL_80211=0 -DUIP_CONF_ROUTER=0 -DUIP_CONF_ICMP6=0 -DUIP_CONF_LL_802154=0
-CDEFS += -DUIP_ARCH_ADD32=0 -DUIP_ARCH_CHKSUM=0 -DUIP_CONF_ICMP_DEST_UNREACH=1 -DUIP_NEIGHBOR_CONF_ADDRTYPE=0
-CDEFS += -DUIP_URGDATA=0 -DUIP_CONF_UDP=ENABLE_DHCP
+CDEFS += -DUIP_CONF_UDP=ENABLE_DHCP -DUIP_CONF_TCP=1 -DUIP_CONF_UDP_CONNS=1 -DUIP_CONF_MAX_CONNECTIONS=5
+CDEFS += -DUIP_CONF_MAX_LISTENPORTS=5 -DUIP_URGDATA=0 -DUIP_CONF_BUFFER_SIZE=1514 -DUIP_ARCH_CHKSUM=0
+CDEFS += -DUIP_CONF_LL_802154=0 -DUIP_CONF_LL_80211=0 -DUIP_CONF_ROUTER=0 -DUIP_CONF_ICMP6=0
+CDEFS += -DUIP_ARCH_ADD32=0 -DUIP_CONF_ICMP_DEST_UNREACH=1 -DUIP_NEIGHBOR_CONF_ADDRTYPE=0
# Place -D or -U options here for ASM sources
|