X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/3b6987bca3ef746fd9a5d4baec6d40b65c9b4101..c58c53dba90fdc19d38f5e5d6957f2ede2a740f3:/Projects/Webserver/Lib/HTTPServerApp.c?ds=inline

diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c
index 4f8490e96..08d849433 100644
--- a/Projects/Webserver/Lib/HTTPServerApp.c
+++ b/Projects/Webserver/Lib/HTTPServerApp.c
@@ -56,12 +56,12 @@ const char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n"
                                      "Content-Type: text/plain\r\n\r\n"
                                      "Error 404: File Not Found: /";
 
-/** Default MIME type sent if no other MIME type can be determined. */
-const char PROGMEM DefaultMIMEType[] = "text/plain";
-
 /** Default filename to fetch when a directory is requested */
 const char PROGMEM DefaultDirFileName[] = "index.htm";
 
+/** Default MIME type sent if no other MIME type can be determined. */
+const char PROGMEM DefaultMIMEType[] = "text/plain";
+
 /** List of MIME types for each supported file extension. */
 const MIME_Type_t MIMETypes[] =
 	{
@@ -77,7 +77,7 @@ const MIME_Type_t MIMETypes[] =
 		{.Extension = "pdf", .MIMEType = "application/pdf"},
 	};
 
-/** FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */
+/** FATFs structure to hold the internal state of the FAT driver for the dataflash contents. */
 FATFS DiskFATState;
 
 
@@ -100,13 +100,9 @@ void HTTPServerApp_Callback(void)
 
 	if (uip_aborted() || uip_timedout() || uip_closed())
 	{
-		/* Connection is being terminated for some reason - close file handle */
-		f_close(&AppState->HTTPServer.FileHandle);
-		AppState->HTTPServer.FileOpen = false;
-		
 		/* Lock to the closed state so that no further processing will occur on the connection */
-		AppState->HTTPServer.CurrentState  = WEBSERVER_STATE_Closed;
-		AppState->HTTPServer.NextState     = WEBSERVER_STATE_Closed;
+		AppState->HTTPServer.CurrentState  = WEBSERVER_STATE_Closing;
+		AppState->HTTPServer.NextState     = WEBSERVER_STATE_Closing;
 	}
 
 	if (uip_connected())
@@ -148,9 +144,15 @@ void HTTPServerApp_Callback(void)
 				HTTPServerApp_SendData();
 				break;
 			case WEBSERVER_STATE_Closing:
+				/* Connection is being terminated for some reason - close file handle */
+				f_close(&AppState->HTTPServer.FileHandle);
+				AppState->HTTPServer.FileOpen = false;
+		
+				/* If connection is not already closed, close it */
 				uip_close();
 				
-				AppState->HTTPServer.NextState = WEBSERVER_STATE_Closed;
+				AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
+				AppState->HTTPServer.NextState    = WEBSERVER_STATE_Closed;
 				break;
 		}		  
 	}		
@@ -168,11 +170,11 @@ static void HTTPServerApp_OpenRequestedFile(void)
 	if (!(uip_newdata()))
 	  return;
 	  
-	char* RequestToken = strtok(AppData, " ");
+	char* RequestToken      = strtok(AppData, " ");
 	char* RequestedFileName = strtok(NULL, " ");
 			
 	/* Must be a GET request, abort otherwise */
-	if (strcmp(RequestToken, "GET") != 0)
+	if (strcmp_P(RequestToken, PSTR("GET")) != 0)
 	{
 		uip_abort();
 		return;
@@ -182,16 +184,19 @@ static void HTTPServerApp_OpenRequestedFile(void)
 	strncpy(AppState->HTTPServer.FileName, &RequestedFileName[1], (sizeof(AppState->HTTPServer.FileName) - 1));
 	
 	/* Ensure filename is null-terminated */
-	AppState->HTTPServer.FileName[(sizeof(AppState->HTTPServer.FileName) - 1)] = 0x00;
+	AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00;
+	
+	/* Determine the length of the URI so that it can be checked to see if it is a directory */
+	uint8_t FileNameLen = strlen(AppState->HTTPServer.FileName);
 
 	/* If the URI is a directory, append the default filename */
-	if (AppState->HTTPServer.FileName[strlen(AppState->HTTPServer.FileName) - 1] == '/')
+	if (AppState->HTTPServer.FileName[FileNameLen - 1] == '/')
 	{
-		strncpy_P(&AppState->HTTPServer.FileName[strlen(AppState->HTTPServer.FileName)], DefaultDirFileName,
-		          (sizeof(AppState->HTTPServer.FileName) - (strlen(AppState->HTTPServer.FileName) + 1)));
+		strncpy_P(&AppState->HTTPServer.FileName[FileNameLen], DefaultDirFileName,
+		          (sizeof(AppState->HTTPServer.FileName) - FileNameLen));
 
 		/* Ensure altered filename is still null-terminated */
-		AppState->HTTPServer.FileName[(sizeof(AppState->HTTPServer.FileName) - 1)] = 0x00;
+		AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00;
 	}
 	
 	/* Try to open the file from the Dataflash disk */
@@ -233,7 +238,7 @@ static void HTTPServerApp_SendResponseHeader(void)
 	if (Extension != NULL)
 	{
 		/* Look through the MIME type list, copy over the required MIME type if found */
-		for (int i = 0; i < (sizeof(MIMETypes) / sizeof(MIMETypes[0])); i++)
+		for (uint8_t i = 0; i < (sizeof(MIMETypes) / sizeof(MIMETypes[0])); i++)
 		{
 			if (strcmp(&Extension[1], MIMETypes[i].Extension) == 0)
 			{
@@ -251,8 +256,8 @@ static void HTTPServerApp_SendResponseHeader(void)
 		strcpy_P(&AppData[strlen(AppData)], DefaultMIMEType);
 	}
 	
-	/* Add the end-of line terminator and end-of-headers terminator after the MIME type */
-	strcpy(&AppData[strlen(AppData)], "\r\n\r\n");
+	/* Add the end-of-line terminator and end-of-headers terminator after the MIME type */
+	strcpy_P(&AppData[strlen(AppData)], PSTR("\r\n\r\n"));
 	
 	/* Send the MIME header to the receiving client */
 	uip_send(AppData, strlen(AppData));