Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

[pub/USBasp.git] / Projects / Webserver / Lib / HTTPServerApp.c

diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c
index 6378ebe..8548045 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.c
+++ b/Projects/Webserver/Lib/HTTPServerApp.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   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 
+  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 without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -33,7 +33,7 @@
  *  Simple HTTP Webserver Application. When connected to the uIP stack,
  *  this will serve out files to HTTP clients on port 80.
  */
  *  Simple HTTP Webserver Application. When connected to the uIP stack,
  *  this will serve out files to HTTP clients on port 80.
  */

- 
+

 #define  INCLUDE_FROM_HTTPSERVERAPP_C
 #include "HTTPServerApp.h"
 
 #define  INCLUDE_FROM_HTTPSERVERAPP_C
 #include "HTTPServerApp.h"
 


@@ -86,7 +86,7 @@ void HTTPServerApp_Init(void)
 {
        /* Listen on port 80 for HTTP connections from hosts */
        uip_listen(HTONS(HTTP_SERVER_PORT));
 {
        /* Listen on port 80 for HTTP connections from hosts */
        uip_listen(HTONS(HTTP_SERVER_PORT));

-       
+

        /* Mount the Dataflash disk via FatFS */
        f_mount(0, &DiskFATState);
 }
        /* Mount the Dataflash disk via FatFS */
        f_mount(0, &DiskFATState);
 }


@@ -127,7 +127,7 @@ void HTTPServerApp_Callback(void)
        if (uip_rexmit())
        {
                /* Return file pointer to the last ACKed position */
        if (uip_rexmit())
        {
                /* Return file pointer to the last ACKed position */

-               f_lseek(&AppState->HTTPServer.FileHandle, AppState->HTTPServer.ACKedFilePos);   
+               f_lseek(&AppState->HTTPServer.FileHandle, AppState->HTTPServer.ACKedFilePos);

        }
 
        if (uip_rexmit() || uip_acked() || uip_newdata() || uip_connected() || uip_poll())
        }
 
        if (uip_rexmit() || uip_acked() || uip_newdata() || uip_connected() || uip_poll())


@@ -147,15 +147,15 @@ void HTTPServerApp_Callback(void)
                                /* Connection is being terminated for some reason - close file handle */
                                f_close(&AppState->HTTPServer.FileHandle);
                                AppState->HTTPServer.FileOpen = false;
                                /* 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();
                                /* If connection is not already closed, close it */
                                uip_close();

-                               
+

                                AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
                                AppState->HTTPServer.NextState    = WEBSERVER_STATE_Closed;
                                break;
                                AppState->HTTPServer.CurrentState = WEBSERVER_STATE_Closed;
                                AppState->HTTPServer.NextState    = WEBSERVER_STATE_Closed;
                                break;

-               }                 
-       }               
+               }
+       }

 }
 
 /** HTTP Server State handler for the Request Process state. This state manages the processing of incoming HTTP
 }
 
 /** HTTP Server State handler for the Request Process state. This state manages the processing of incoming HTTP


@@ -165,27 +165,27 @@ static void HTTPServerApp_OpenRequestedFile(void)
 {
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;
        char*               const AppData     = (char*)uip_appdata;
 {
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;
        char*               const AppData     = (char*)uip_appdata;

-       
+

        /* No HTTP header received from the client, abort processing */
        if (!(uip_newdata()))
          return;
        /* No HTTP header received from the client, abort processing */
        if (!(uip_newdata()))
          return;

-         
+

        char* RequestToken      = strtok(AppData, " ");
        char* RequestedFileName = strtok(NULL, " ");
        char* RequestToken      = strtok(AppData, " ");
        char* RequestedFileName = strtok(NULL, " ");

-                       
+

        /* Must be a GET request, abort otherwise */
        if (strcmp_P(RequestToken, PSTR("GET")) != 0)
        {
                uip_abort();
                return;
        }
        /* Must be a GET request, abort otherwise */
        if (strcmp_P(RequestToken, PSTR("GET")) != 0)
        {
                uip_abort();
                return;
        }

-       
+

        /* Copy over the requested filename */
        strncpy(AppState->HTTPServer.FileName, &RequestedFileName[1], (sizeof(AppState->HTTPServer.FileName) - 1));
        /* Copy over the requested filename */
        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;
        /* Ensure filename is null-terminated */
        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);
 
        /* 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);
 


@@ -198,7 +198,7 @@ static void HTTPServerApp_OpenRequestedFile(void)
                /* Ensure altered filename is still null-terminated */
                AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00;
        }
                /* Ensure altered filename is still null-terminated */
                AppState->HTTPServer.FileName[sizeof(AppState->HTTPServer.FileName) - 1] = 0x00;
        }

-       
+

        /* Try to open the file from the Dataflash disk */
        AppState->HTTPServer.FileOpen     = (f_open(&AppState->HTTPServer.FileHandle, AppState->HTTPServer.FileName,
                                                    (FA_OPEN_EXISTING | FA_READ)) == FR_OK);
        /* Try to open the file from the Dataflash disk */
        AppState->HTTPServer.FileOpen     = (f_open(&AppState->HTTPServer.FileHandle, AppState->HTTPServer.FileName,
                                                    (FA_OPEN_EXISTING | FA_READ)) == FR_OK);


@@ -224,13 +224,13 @@ static void HTTPServerApp_SendResponseHeader(void)
        {
                /* Copy over the HTTP 404 response header and send it to the receiving client */
                strcpy_P(AppData, HTTP404Header);
        {
                /* Copy over the HTTP 404 response header and send it to the receiving client */
                strcpy_P(AppData, HTTP404Header);

-               strcpy(&AppData[strlen(AppData)], AppState->HTTPServer.FileName);               
+               strcpy(&AppData[strlen(AppData)], AppState->HTTPServer.FileName);

                uip_send(AppData, strlen(AppData));
                uip_send(AppData, strlen(AppData));

-               
+

                AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
                return;
        }
                AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
                return;
        }

-       
+

        /* Copy over the HTTP 200 response header and send it to the receiving client */
        strcpy_P(AppData, HTTP200Header);
 
        /* Copy over the HTTP 200 response header and send it to the receiving client */
        strcpy_P(AppData, HTTP200Header);
 


@@ -242,11 +242,11 @@ static void HTTPServerApp_SendResponseHeader(void)
                {
                        if (strcmp(&Extension[1], MIMETypes[i].Extension) == 0)
                        {
                {
                        if (strcmp(&Extension[1], MIMETypes[i].Extension) == 0)
                        {

-                               strcpy(&AppData[strlen(AppData)], MIMETypes[i].MIMEType);                                               
+                               strcpy(&AppData[strlen(AppData)], MIMETypes[i].MIMEType);

                                FoundMIMEType = true;
                                break;
                        }
                                FoundMIMEType = true;
                                break;
                        }

-               } 
+               }

        }
 
        /* Check if a MIME type was found and copied to the output buffer */
        }
 
        /* Check if a MIME type was found and copied to the output buffer */


@@ -255,13 +255,13 @@ static void HTTPServerApp_SendResponseHeader(void)
                /* MIME type not found - copy over the default MIME type */
                strcpy_P(&AppData[strlen(AppData)], DefaultMIMEType);
        }
                /* MIME type not found - copy over the default MIME type */
                strcpy_P(&AppData[strlen(AppData)], DefaultMIMEType);
        }

-       
+

        /* 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"));
        /* 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));
        /* Send the MIME header to the receiving client */
        uip_send(AppData, strlen(AppData));

-       
+

        /* When the MIME header is ACKed, progress to the data send stage */
        AppState->HTTPServer.NextState = WEBSERVER_STATE_SendData;
 }
        /* When the MIME header is ACKed, progress to the data send stage */
        AppState->HTTPServer.NextState = WEBSERVER_STATE_SendData;
 }


@@ -279,11 +279,12 @@ static void HTTPServerApp_SendData(void)
 
        /* Read the next chunk of data from the open file */
        f_read(&AppState->HTTPServer.FileHandle, AppData, MaxChunkSize, &AppState->HTTPServer.SentChunkSize);
 
        /* Read the next chunk of data from the open file */
        f_read(&AppState->HTTPServer.FileHandle, AppData, MaxChunkSize, &AppState->HTTPServer.SentChunkSize);

-       
+

        /* Send the next file chunk to the receiving client */
        uip_send(AppData, AppState->HTTPServer.SentChunkSize);
        /* Send the next file chunk to the receiving client */
        uip_send(AppData, AppState->HTTPServer.SentChunkSize);

-                       
+

        /* Check if we are at the last chunk of the file, if so next ACK should close the connection */
        if (MaxChunkSize != AppState->HTTPServer.SentChunkSize)
          AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
 }
        /* Check if we are at the last chunk of the file, if so next ACK should close the connection */
        if (MaxChunkSize != AppState->HTTPServer.SentChunkSize)
          AppState->HTTPServer.NextState = WEBSERVER_STATE_Closing;
 }

+