Diff: HTTPConnection.cpp

Revision:

13:93ff322420b0

Parent:

11:3943841e1798

--- a/HTTPConnection.cpp	Wed Jun 05 23:39:24 2013 +0000
+++ b/HTTPConnection.cpp	Wed Jun 26 21:12:42 2013 +0000
@@ -3,24 +3,15 @@
 #include "mbed.h"
 #include "HTTPConnection.h"
 
-#define _DEBUG 0
+#define DEBUG
+
+#include "debug.h"
 
 #include <vector>
 using std::vector;
 
 using std::string;
 
-#if (_DEBUG && !defined(TARGET_LPC11U24))
-#define INFO(x, ...) std::printf("[HttpConnection : INFO]"x"\r\n", ##__VA_ARGS__);
-#define WARN(x, ...) std::printf("[HttpConnection : WARN]"x"\r\n", ##__VA_ARGS__);
-#define ERR(x, ...) std::printf("[HttpConnection : ERR]"x"\r\n", ##__VA_ARGS__);
-#else
-#define INFO(x, ...)
-#define WARN(x, ...)
-#define ERR(x, ...)
-#endif
-
-
 
 const struct HTTPRequestConfig {
     const char* request_string;
@@ -52,104 +43,6 @@
     m_Msg.headers.clear();
 }
 
-int HTTPConnection::poll()
-{
-    static char buffer[256] = {};
-
-    
-    int rcvd= 0;
-    INFO("Waiting for new data in connection");
-    //  Try receiving request line
-    rcvd = receiveLine(buffer, 255, 3000); 
-    if (rcvd == -1) {
-        //  there was an error, probably the connection was closed, so close this connection as well
-        INFO("No more data available. Will close this connection now.");
-        close();
-        return -1;
-    }
-
-    //  The Request has not yet been received so try it
-    rcvd = parse(buffer);
-    if (rcvd == -1) {
-        //  Invalid content received, so close the connection
-        INFO("Invalid message received, so sending negative response and closing connection !");
-        sprintf(buffer,"HTTP/1.1 400 BadRequest\n\rContent-Length: %d\n\rContent-Type: text\n\r\n\r\n\r",0);
-        m_Tcp.set_blocking(true, 1500);
-        m_Tcp.send(buffer,strlen(buffer));
-        close();
-        rcvd = -1;
-        return -1;
-    }
-    //  The request has been received, try receive the body
-    while(rcvd > 0) {
-        rcvd = receiveLine((char*)buffer, 255, 3000); 
-        //  First check if we received an empty line. This would indicate the end of the message or message body.
-        if (rcvd < 0) {
-            //  there was an empty line, so we can start with performing the request
-            INFO("Request Header was received completely. Performing request.");
-            rcvd = 0;
-            break;
-        }
-        else {
-            //  add message body
-            if (parseHeader(buffer) == 0) {
-            }
-            else {
-                WARN("Invalid message header received !");
-            }
-        }
-    }             
-    INFO("Leaving poll function!");
-    return rcvd;
-}
-
-int HTTPConnection::receiveLine(char* szLine, int nMaxLen, int nTimeout, char cLineTerm)
-{
-    if ((szLine == NULL) || (nMaxLen == 0))
-        return -1;
-    
-    m_Tcp.set_blocking(false);
-    
-    Timer tm;
-    int i;
-    
-    //  Try to receive up to the max number of characters
-    for (i = 0 ; i < nMaxLen-1 ; i++) {
-        int c;
-        c = m_Tcp.receive( szLine + i, 1 );
-        //  Check that - if no character was currently received - the timeout period is reached.
-        if ((c == 0) || (c==-1)) {
-            //  no character was read, so check if operation timed out
-            if (tm.read_ms() > nTimeout) {
-                //  Operation timed out
-                INFO("Timeout occured in function 'receiveLine'.");
-                return -1;
-            }
-        }
-        
-        //  Check if line terminating character was received
-        if (szLine[i] == cLineTerm)
-            break;
-    }
-    //  Terminate with \0
-    szLine[i] = 0;
-
-    //  Trim for '\r' linefeed at the end
-    if( (i >0) && (szLine[i-1] == '\r')) {
-        i--;
-        szLine[i] = 0;
-    }
-    INFO("receiveLine : \"%s\".", szLine);
-    
-    //  return number of characters received in the line or return -2 if an empty line was received
-    if ((i == 0) || ((i==1) &&(szLine[0] == '\r')))
-    {
-        //  empty line received, so return -2
-        return -2;
-    }
-    return i;    
-}
-
 int HTTPConnection::parse(char* buffer)
 {
     //  Check if buffer is invalid or its content not long enough.
@@ -195,32 +88,6 @@
     return 1;
 }
 
-
-int HTTPConnection::parseHeader(char *buffer)
-{
-    //  Check if the buffer is invalid or if the content is too short to be meaningful
-    if ((strlen(buffer) <3) || (buffer == NULL))
-        return -1;
-        
-    //  decompose string into a touple of <field name> : <field value>
-    int value_start = 0;
-    int buflen = strlen(buffer)+1;
-    for (int i = 0 ; i < buflen ; i++) {
-        if (buffer[i] == ':') {
-            //  touple found
-            buffer[i] = 0;
-            value_start = i+1;    
-            m_Msg.headers[buffer] = &buffer[value_start];
-            
-            INFO("Header name=\"%s\" : value=\"%s\".", buffer, &buffer[value_start]);            
-            return 0;
-        }
-    }
-    
-    ERR("Did not recieve a valid header : \"%s\".", buffer);
-    return -1;
-}
-
 int HTTPConnection::parseUriArgs(char *buffer, map<string,string>&args)
 {
     // Check if the buffer is invalid or if the content is too short to be meaningful