From 03ee87b35abdb8b92e8b55ec040fa943f9a6786c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 21 Jan 2010 13:45:44 +0000 Subject: Fix up the incomplete Webserver project so that it integrates with the uIP stack correctly. Add simple HTTP webserver as a placeholder until FatFS can be integrated. Begin to look into the RNDIS Host Class Driver, which seems to crash on test hardware after many packets have been received. --- Projects/Incomplete/Webserver/Lib/WebserverApp.c | 131 +++++++++++++++++++++ Projects/Incomplete/Webserver/Lib/WebserverApp.h | 50 ++++++++ .../Incomplete/Webserver/Lib/uip/conf/apps-conf.h | 25 ++-- .../Incomplete/Webserver/Lib/uip/conf/uip-conf.h | 11 +- 4 files changed, 197 insertions(+), 20 deletions(-) create mode 100644 Projects/Incomplete/Webserver/Lib/WebserverApp.c create mode 100644 Projects/Incomplete/Webserver/Lib/WebserverApp.h (limited to 'Projects/Incomplete/Webserver/Lib') diff --git a/Projects/Incomplete/Webserver/Lib/WebserverApp.c b/Projects/Incomplete/Webserver/Lib/WebserverApp.c new file mode 100644 index 000000000..97218b2be --- /dev/null +++ b/Projects/Incomplete/Webserver/Lib/WebserverApp.c @@ -0,0 +1,131 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2010. + + dean [at] fourwalledcubicle [dot] com + www.fourwalledcubicle.com +*/ + +/* + Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaim all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * + * Simple HTTP Webserver Application. When connected to the uIP stack, + * this will serve out files to HTTP clients. + */ + +#include "WebserverApp.h" + +/** HTTP server response header, for transmission before the page contents. This indicates to the host that a page exists at the + * given location, and gives extra connection information. + */ +char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" + "Server: LUFA RNDIS\r\n" + "Content-type: text/html\r\n" + "Connection: close\r\n\r\n"; + +/** HTTP server response header, for transmission before a resource not found error. This indicates to the host that the given + * given URL is invalid, and gives extra error information. + */ +char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" + "Server: LUFA RNDIS\r\n" + "Connection: close\r\n\r\n"; + +/****************************************************************************************/ +/** HTTP page to serve to the host when a HTTP request is made. This page is too long for a single response, thus it is automatically + * broken up into smaller blocks and sent as a series of packets each time the webserver application callback is run. + */ +char PROGMEM HTTPPage[] = + "" + " " + " " + " LUFA Webserver Demo" + " " + " " + " " + "

Hello from your USB AVR!

" + "

" + " Hello! Welcome to the LUFA RNDIS Demo Webserver test page, running on your USB AVR via the LUFA library. This demonstrates the HTTP webserver, TCP/IP stack and RNDIS demo all running atop the LUFA USB stack." + "

" + " Project Information: http://www.fourwalledcubicle.com/LUFA.php." + "

" + " LUFA Version: " LUFA_VERSION_STRING + "

" + " " + ""; + +void WebserverAppCallback(void) +{ + char* AppDataPtr = (char*)uip_appdata; + uint16_t AppDataSize = 0; + + if (uip_closed() || uip_aborted() || uip_timedout()) + { + /* Terminated or completed connection - don't send any new data */ + return; + } + else if (uip_connected()) + { + /* New connection - initialize connection state and data pointer to the appropriate HTTP header */ + uip_conn->appstate.SendPos = HTTP200Header; + uip_conn->appstate.CurrentState = WEBSERVER_STATE_SendHeaders; + } + + /* Calculate the maximum segment size and remaining data size */ + uint16_t BytesRemaining = strlen_P(uip_conn->appstate.SendPos); + uint16_t MaxSegSize = uip_mss(); + + /* No more bytes remaining in the current data being sent - progress to next data chunk or + * terminate the connection once all chunks are sent */ + if (!(BytesRemaining)) + { + /* Check which data chunk we are currently sending (header or data) */ + if (uip_conn->appstate.CurrentState == WEBSERVER_STATE_SendHeaders) + { + uip_conn->appstate.SendPos = HTTPPage; + uip_conn->appstate.CurrentState = WEBSERVER_STATE_SendData; + } + else if (uip_conn->appstate.CurrentState == WEBSERVER_STATE_SendData) + { + uip_close(); + uip_conn->appstate.CurrentState = WEBSERVER_STATE_Closed; + } + + return; + } + else if (BytesRemaining > MaxSegSize) + { + AppDataSize = MaxSegSize; + } + else + { + AppDataSize = BytesRemaining; + } + + /* Copy over the next data segment to the application buffer, advance send position pointer */ + strncpy_P(uip_appdata, uip_conn->appstate.SendPos, AppDataSize); + uip_conn->appstate.SendPos += AppDataSize; + + /* Send the data to the requesting host */ + uip_send(AppDataPtr, AppDataSize); +} diff --git a/Projects/Incomplete/Webserver/Lib/WebserverApp.h b/Projects/Incomplete/Webserver/Lib/WebserverApp.h new file mode 100644 index 000000000..b2696b28f --- /dev/null +++ b/Projects/Incomplete/Webserver/Lib/WebserverApp.h @@ -0,0 +1,50 @@ +/* + LUFA Library + Copyright (C) Dean Camera, 2010. + + dean [at] fourwalledcubicle [dot] com + www.fourwalledcubicle.com +*/ + +/* + Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the + software without specific, written prior permission. + + The author disclaim all warranties with regard to this + software, including all implied warranties of merchantability + and fitness. In no event shall the author be liable for any + special, indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, whether + in an action of contract, negligence or other tortious action, + arising out of or in connection with the use or performance of + this software. +*/ + +/** \file + * + * Header file for WebserverApp.c. + */ + +#ifndef _WEBSERVER_APP_H_ +#define _WEBSERVER_APP_H_ + + /* Includes: */ + #include + #include + + #include + + #include + + /* Function Prototypes: */ + void WebserverAppCallback(void); + +#endif diff --git a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h index 60a7c9eb0..00919f221 100644 --- a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h +++ b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h @@ -1,15 +1,20 @@ #ifndef __APPS_CONF_H__ #define __APPS_CONF_H__ -//Here we include the header file for the application(s) we use in our project. - -//#include "smtp.h" -//#include "hello-world.h" -//#include "simple-httpd.h" -//#include "telnetd.h" -//#include "webserver.h" -//#include "dhcpc.h" -//#include "resolv.h" -//#include "webclient.h" + enum Webserver_States_t + { + WEBSERVER_STATE_SendHeaders, + WEBSERVER_STATE_SendData, + WEBSERVER_STATE_Closed, + }; + + typedef struct + { + uint8_t CurrentState; + char* SendPos; + } uip_tcp_appstate_t; + + #define UIP_APPCALL WebserverAppCallback + void UIP_APPCALL(void); #endif /*__APPS_CONF_H__*/ diff --git a/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h b/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h index d46fa265c..d3d9bc453 100644 --- a/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h +++ b/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h @@ -6,15 +6,6 @@ #include #include -typedef int uip_tcp_appstate_t; -typedef int uip_udp_appstate_t; - -#define UIP_APPCALL TCPCallback -#define UIP_UDP_APPCALL TCPCallback - -void UIP_APPCALL(void); -void UIP_UDP_APPCALL(void); - #define UIP_CONF_LLH_LEN 14 /** @@ -68,7 +59,7 @@ typedef unsigned short uip_stats_t; * * \hideinitializer */ -#define UIP_CONF_BUFFER_SIZE 1100 +#define UIP_CONF_BUFFER_SIZE 1500 /** * CPU byte order. * -- cgit v1.2.3