First step: AutoIP compiled in and working

Dependencies:   mbed

Committer:
darran
Date:
Fri Jun 18 09:11:35 2010 +0000
Revision:
0:55a05330f8cc
Child:
1:4218cacaf696

        

Who changed what in which revision?

UserRevisionLine numberNew contents of line
darran 0:55a05330f8cc 1
darran 0:55a05330f8cc 2 /*
darran 0:55a05330f8cc 3 Copyright (c) 2010 Donatien Garnier (donatiengar [at] gmail [dot] com)
darran 0:55a05330f8cc 4
darran 0:55a05330f8cc 5 Permission is hereby granted, free of charge, to any person obtaining a copy
darran 0:55a05330f8cc 6 of this software and associated documentation files (the "Software"), to deal
darran 0:55a05330f8cc 7 in the Software without restriction, including without limitation the rights
darran 0:55a05330f8cc 8 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
darran 0:55a05330f8cc 9 copies of the Software, and to permit persons to whom the Software is
darran 0:55a05330f8cc 10 furnished to do so, subject to the following conditions:
darran 0:55a05330f8cc 11
darran 0:55a05330f8cc 12 The above copyright notice and this permission notice shall be included in
darran 0:55a05330f8cc 13 all copies or substantial portions of the Software.
darran 0:55a05330f8cc 14
darran 0:55a05330f8cc 15 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
darran 0:55a05330f8cc 16 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
darran 0:55a05330f8cc 17 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
darran 0:55a05330f8cc 18 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
darran 0:55a05330f8cc 19 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
darran 0:55a05330f8cc 20 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
darran 0:55a05330f8cc 21 THE SOFTWARE.
darran 0:55a05330f8cc 22 */
darran 0:55a05330f8cc 23
darran 0:55a05330f8cc 24 #include "HTTPClient.h"
darran 0:55a05330f8cc 25 #include "../util/base64.h"
darran 0:55a05330f8cc 26 #include "../util/url.h"
darran 0:55a05330f8cc 27
darran 0:55a05330f8cc 28 //#define __DEBUG
darran 0:55a05330f8cc 29 #include "dbg/dbg.h"
darran 0:55a05330f8cc 30
darran 0:55a05330f8cc 31 #define HTTP_REQUEST_TIMEOUT 30000//15000
darran 0:55a05330f8cc 32 #define HTTP_PORT 80
darran 0:55a05330f8cc 33
darran 0:55a05330f8cc 34 #define CHUNK_SIZE 256
darran 0:55a05330f8cc 35
darran 0:55a05330f8cc 36 HTTPClient::HTTPClient() : NetService(false) /*Not owned by the pool*/, m_meth(HTTP_GET), m_pCbItem(NULL), m_pCbMeth(NULL), m_pCb(NULL),
darran 0:55a05330f8cc 37 m_watchdog(), m_timeout(0), m_pDnsReq(NULL), m_server(), m_path(),
darran 0:55a05330f8cc 38 m_closed(true), m_state(HTTP_CLOSED),
darran 0:55a05330f8cc 39 m_pDataOut(NULL), m_pDataIn(NULL), m_dataChunked(false), m_dataPos(0), m_dataLen(0), m_httpResponseCode(0), m_blockingResult(HTTP_PROCESSING)
darran 0:55a05330f8cc 40
darran 0:55a05330f8cc 41 {
darran 0:55a05330f8cc 42 setTimeout(HTTP_REQUEST_TIMEOUT);
darran 0:55a05330f8cc 43 m_buf = new char[CHUNK_SIZE];
darran 0:55a05330f8cc 44 DBG("\r\nNew HTTPClient %p\r\n",this);
darran 0:55a05330f8cc 45 }
darran 0:55a05330f8cc 46
darran 0:55a05330f8cc 47 HTTPClient::~HTTPClient()
darran 0:55a05330f8cc 48 {
darran 0:55a05330f8cc 49 close();
darran 0:55a05330f8cc 50 delete[] m_buf;
darran 0:55a05330f8cc 51 }
darran 0:55a05330f8cc 52
darran 0:55a05330f8cc 53 void HTTPClient::basicAuth(const char* user, const char* password) //Basic Authentification
darran 0:55a05330f8cc 54 {
darran 0:55a05330f8cc 55 if(user==NULL)
darran 0:55a05330f8cc 56 {
darran 0:55a05330f8cc 57 m_reqHeaders.erase("Authorization"); //Remove auth str
darran 0:55a05330f8cc 58 return;
darran 0:55a05330f8cc 59 }
darran 0:55a05330f8cc 60 string auth = "Basic ";
darran 0:55a05330f8cc 61 string decStr = user;
darran 0:55a05330f8cc 62 decStr += ":";
darran 0:55a05330f8cc 63 decStr += password;
darran 0:55a05330f8cc 64 auth.append( Base64::encode(decStr) );
darran 0:55a05330f8cc 65 DBG("\r\nAuth str is %s\r\n", auth.c_str());
darran 0:55a05330f8cc 66 m_reqHeaders["Authorization"] = auth;
darran 0:55a05330f8cc 67 }
darran 0:55a05330f8cc 68
darran 0:55a05330f8cc 69 //High Level setup functions
darran 0:55a05330f8cc 70 HTTPResult HTTPClient::get(const char* uri, HTTPData* pDataIn) //Blocking
darran 0:55a05330f8cc 71 {
darran 0:55a05330f8cc 72 doGet(uri, pDataIn);
darran 0:55a05330f8cc 73 return blockingProcess();
darran 0:55a05330f8cc 74 }
darran 0:55a05330f8cc 75
darran 0:55a05330f8cc 76 HTTPResult HTTPClient::get(const char* uri, HTTPData* pDataIn, void (*pMethod)(HTTPResult)) //Non blocking
darran 0:55a05330f8cc 77 {
darran 0:55a05330f8cc 78 setOnResult(pMethod);
darran 0:55a05330f8cc 79 doGet(uri, pDataIn);
darran 0:55a05330f8cc 80 return HTTP_PROCESSING;
darran 0:55a05330f8cc 81 }
darran 0:55a05330f8cc 82
darran 0:55a05330f8cc 83 #ifdef __LINKER_BUG_SOLVED__
darran 0:55a05330f8cc 84 template<class T>
darran 0:55a05330f8cc 85 HTTPResult HTTPClient::get(const char* uri, HTTPData* pDataIn, T* pItem, void (T::*pMethod)(HTTPResult)) //Non blocking
darran 0:55a05330f8cc 86 {
darran 0:55a05330f8cc 87 setOnResult(pItem, pMethod);
darran 0:55a05330f8cc 88 doGet(uri, pDataIn);
darran 0:55a05330f8cc 89 return HTTP_PROCESSING;
darran 0:55a05330f8cc 90 }
darran 0:55a05330f8cc 91 #endif
darran 0:55a05330f8cc 92
darran 0:55a05330f8cc 93 HTTPResult HTTPClient::post(const char* uri, const HTTPData& dataOut, HTTPData* pDataIn) //Blocking
darran 0:55a05330f8cc 94 {
darran 0:55a05330f8cc 95 doPost(uri, dataOut, pDataIn);
darran 0:55a05330f8cc 96 return blockingProcess();
darran 0:55a05330f8cc 97 }
darran 0:55a05330f8cc 98
darran 0:55a05330f8cc 99 HTTPResult HTTPClient::post(const char* uri, const HTTPData& dataOut, HTTPData* pDataIn, void (*pMethod)(HTTPResult)) //Non blocking
darran 0:55a05330f8cc 100 {
darran 0:55a05330f8cc 101 setOnResult(pMethod);
darran 0:55a05330f8cc 102 doPost(uri, dataOut, pDataIn);
darran 0:55a05330f8cc 103 return HTTP_PROCESSING;
darran 0:55a05330f8cc 104 }
darran 0:55a05330f8cc 105
darran 0:55a05330f8cc 106 #ifdef __LINKER_BUG_SOLVED__
darran 0:55a05330f8cc 107 template<class T>
darran 0:55a05330f8cc 108 HTTPResult HTTPClient::post(const char* uri, const HTTPData& dataOut, HTTPData* pDataIn, T* pItem, void (T::*pMethod)(HTTPResult)) //Non blocking
darran 0:55a05330f8cc 109 {
darran 0:55a05330f8cc 110 setOnResult(pItem, pMethod);
darran 0:55a05330f8cc 111 doPost(uri, dataOut, pDataIn);
darran 0:55a05330f8cc 112 return HTTP_PROCESSING;
darran 0:55a05330f8cc 113 }
darran 0:55a05330f8cc 114 #endif
darran 0:55a05330f8cc 115
darran 0:55a05330f8cc 116 void HTTPClient::doGet(const char* uri, HTTPData* pDataIn)
darran 0:55a05330f8cc 117 {
darran 0:55a05330f8cc 118 m_meth = HTTP_GET;
darran 0:55a05330f8cc 119 setup(uri, NULL, pDataIn);
darran 0:55a05330f8cc 120 }
darran 0:55a05330f8cc 121
darran 0:55a05330f8cc 122 void HTTPClient::doPost(const char* uri, const HTTPData& dataOut, HTTPData* pDataIn)
darran 0:55a05330f8cc 123 {
darran 0:55a05330f8cc 124 m_meth = HTTP_POST;
darran 0:55a05330f8cc 125 setup(uri, (HTTPData*) &dataOut, pDataIn);
darran 0:55a05330f8cc 126 }
darran 0:55a05330f8cc 127
darran 0:55a05330f8cc 128 void HTTPClient::setOnResult( void (*pMethod)(HTTPResult) )
darran 0:55a05330f8cc 129 {
darran 0:55a05330f8cc 130 m_pCb = pMethod;
darran 0:55a05330f8cc 131 m_pCbItem = NULL;
darran 0:55a05330f8cc 132 m_pCbMeth = NULL;
darran 0:55a05330f8cc 133 }
darran 0:55a05330f8cc 134
darran 0:55a05330f8cc 135 #ifdef __LINKER_BUG_SOLVED__
darran 0:55a05330f8cc 136 template<class T>
darran 0:55a05330f8cc 137 void HTTPClient::setOnResult( T* pItem, void (T::*pMethod)(NtpResult) )
darran 0:55a05330f8cc 138 {
darran 0:55a05330f8cc 139 m_pCb = NULL;
darran 0:55a05330f8cc 140 m_pCbItem = (CDummy*) pItem;
darran 0:55a05330f8cc 141 m_pCbMeth = (void (CDummy::*)(NtpResult)) pMethod;
darran 0:55a05330f8cc 142 }
darran 0:55a05330f8cc 143 #endif
darran 0:55a05330f8cc 144
darran 0:55a05330f8cc 145 void HTTPClient::setTimeout(int ms)
darran 0:55a05330f8cc 146 {
darran 0:55a05330f8cc 147 m_timeout = 1000*ms;
darran 0:55a05330f8cc 148 //resetTimeout();
darran 0:55a05330f8cc 149 }
darran 0:55a05330f8cc 150
darran 0:55a05330f8cc 151 void HTTPClient::poll() //Called by NetServices
darran 0:55a05330f8cc 152 {
darran 0:55a05330f8cc 153 if(m_closed)
darran 0:55a05330f8cc 154 {
darran 0:55a05330f8cc 155 return;
darran 0:55a05330f8cc 156 }
darran 0:55a05330f8cc 157 if(m_watchdog.read_us()>m_timeout)
darran 0:55a05330f8cc 158 {
darran 0:55a05330f8cc 159 onTimeout();
darran 0:55a05330f8cc 160 }
darran 0:55a05330f8cc 161 else if(m_state == HTTP_READ_DATA_INCOMPLETE)
darran 0:55a05330f8cc 162 {
darran 0:55a05330f8cc 163 readData(); //Try to read more data
darran 0:55a05330f8cc 164 if( m_state == HTTP_DONE )
darran 0:55a05330f8cc 165 {
darran 0:55a05330f8cc 166 //All data has been read, close w/ success :)
darran 0:55a05330f8cc 167 DBG("\r\nDone :)!\r\n");
darran 0:55a05330f8cc 168 onResult(HTTP_OK);
darran 0:55a05330f8cc 169 close();
darran 0:55a05330f8cc 170 }
darran 0:55a05330f8cc 171 }
darran 0:55a05330f8cc 172
darran 0:55a05330f8cc 173 }
darran 0:55a05330f8cc 174
darran 0:55a05330f8cc 175 int HTTPClient::getHTTPResponseCode()
darran 0:55a05330f8cc 176 {
darran 0:55a05330f8cc 177 return m_httpResponseCode;
darran 0:55a05330f8cc 178 }
darran 0:55a05330f8cc 179
darran 0:55a05330f8cc 180 void HTTPClient::setRequestHeader(const string& header, const string& value)
darran 0:55a05330f8cc 181 {
darran 0:55a05330f8cc 182 m_reqHeaders[header] = value;
darran 0:55a05330f8cc 183 }
darran 0:55a05330f8cc 184
darran 0:55a05330f8cc 185 string& HTTPClient::getResponseHeader(const string& header)
darran 0:55a05330f8cc 186 {
darran 0:55a05330f8cc 187 return m_respHeaders[header];
darran 0:55a05330f8cc 188 }
darran 0:55a05330f8cc 189
darran 0:55a05330f8cc 190 void HTTPClient::resetRequestHeaders()
darran 0:55a05330f8cc 191 {
darran 0:55a05330f8cc 192 m_reqHeaders.clear();
darran 0:55a05330f8cc 193 }
darran 0:55a05330f8cc 194
darran 0:55a05330f8cc 195 void HTTPClient::resetTimeout()
darran 0:55a05330f8cc 196 {
darran 0:55a05330f8cc 197 m_watchdog.reset();
darran 0:55a05330f8cc 198 m_watchdog.start();
darran 0:55a05330f8cc 199 }
darran 0:55a05330f8cc 200
darran 0:55a05330f8cc 201 void HTTPClient::init() //Create and setup socket if needed
darran 0:55a05330f8cc 202 {
darran 0:55a05330f8cc 203 close(); //Remove previous elements
darran 0:55a05330f8cc 204 if(!m_closed) //Already opened
darran 0:55a05330f8cc 205 return;
darran 0:55a05330f8cc 206 m_state = HTTP_WRITE_HEADERS;
darran 0:55a05330f8cc 207 m_pTCPSocket = new TCPSocket;
darran 0:55a05330f8cc 208 m_pTCPSocket->setOnEvent(this, &HTTPClient::onTCPSocketEvent);
darran 0:55a05330f8cc 209 m_closed = false;
darran 0:55a05330f8cc 210 m_httpResponseCode = 0;
darran 0:55a05330f8cc 211 }
darran 0:55a05330f8cc 212
darran 0:55a05330f8cc 213 void HTTPClient::close()
darran 0:55a05330f8cc 214 {
darran 0:55a05330f8cc 215 if(m_closed)
darran 0:55a05330f8cc 216 return;
darran 0:55a05330f8cc 217 m_state = HTTP_CLOSED;
darran 0:55a05330f8cc 218 //Now Request headers are kept btw requests unless resetRequestHeaders() is called
darran 0:55a05330f8cc 219 //m_reqHeaders.clear(); //Clear headers for next requests
darran 0:55a05330f8cc 220 m_closed = true; //Prevent recursive calling or calling on an object being destructed by someone else
darran 0:55a05330f8cc 221 m_watchdog.stop(); //Stop timeout
darran 0:55a05330f8cc 222 m_watchdog.reset();
darran 0:55a05330f8cc 223 m_pTCPSocket->resetOnEvent();
darran 0:55a05330f8cc 224 m_pTCPSocket->close();
darran 0:55a05330f8cc 225 delete m_pTCPSocket;
darran 0:55a05330f8cc 226 m_pTCPSocket = NULL;
darran 0:55a05330f8cc 227 if( m_pDnsReq )
darran 0:55a05330f8cc 228 {
darran 0:55a05330f8cc 229 m_pDnsReq->close();
darran 0:55a05330f8cc 230 delete m_pDnsReq;
darran 0:55a05330f8cc 231 m_pDnsReq = NULL;
darran 0:55a05330f8cc 232 }
darran 0:55a05330f8cc 233 }
darran 0:55a05330f8cc 234
darran 0:55a05330f8cc 235 void HTTPClient::setup(const char* uri, HTTPData* pDataOut, HTTPData* pDataIn) //Setup request, make DNS Req if necessary
darran 0:55a05330f8cc 236 {
darran 0:55a05330f8cc 237 init(); //Initialize client in known state, create socket
darran 0:55a05330f8cc 238 m_pDataOut = pDataOut;
darran 0:55a05330f8cc 239 m_pDataIn = pDataIn;
darran 0:55a05330f8cc 240 resetTimeout();
darran 0:55a05330f8cc 241
darran 0:55a05330f8cc 242 //Erase previous headers
darran 0:55a05330f8cc 243 //Do NOT clear m_reqHeaders as they might have already set before connecting
darran 0:55a05330f8cc 244 m_respHeaders.clear();
darran 0:55a05330f8cc 245
darran 0:55a05330f8cc 246 //Erase response buffer
darran 0:55a05330f8cc 247 if(m_pDataIn)
darran 0:55a05330f8cc 248 m_pDataIn->clear();
darran 0:55a05330f8cc 249
darran 0:55a05330f8cc 250 //Assert that buffers are initialized properly
darran 0:55a05330f8cc 251 m_dataLen = 0;
darran 0:55a05330f8cc 252 m_bufRemainingLen = 0;
darran 0:55a05330f8cc 253
darran 0:55a05330f8cc 254 Url url;
darran 0:55a05330f8cc 255 url.fromString(uri);
darran 0:55a05330f8cc 256
darran 0:55a05330f8cc 257 m_path = url.getPath();
darran 0:55a05330f8cc 258
darran 0:55a05330f8cc 259 m_server.setName(url.getHost().c_str());
darran 0:55a05330f8cc 260
darran 0:55a05330f8cc 261 if( url.getPort() > 0 )
darran 0:55a05330f8cc 262 {
darran 0:55a05330f8cc 263 m_server.setPort( url.getPort() );
darran 0:55a05330f8cc 264 }
darran 0:55a05330f8cc 265 else
darran 0:55a05330f8cc 266 {
darran 0:55a05330f8cc 267 m_server.setPort( HTTP_PORT );
darran 0:55a05330f8cc 268 }
darran 0:55a05330f8cc 269
darran 0:55a05330f8cc 270 DBG("\r\nURL parsed,\r\nHost: %s\r\nPort: %d\r\nPath: %s\r\n", url.getHost().c_str(), url.getPort(), url.getPath().c_str());
darran 0:55a05330f8cc 271
darran 0:55a05330f8cc 272 IpAddr ip;
darran 0:55a05330f8cc 273 if( url.getHostIp(&ip) )
darran 0:55a05330f8cc 274 {
darran 0:55a05330f8cc 275 m_server.setIp(ip);
darran 0:55a05330f8cc 276 connect();
darran 0:55a05330f8cc 277 }
darran 0:55a05330f8cc 278 else
darran 0:55a05330f8cc 279 {
darran 0:55a05330f8cc 280 DBG("\r\nDNS Query...\r\n");
darran 0:55a05330f8cc 281 m_pDnsReq = new DNSRequest();
darran 0:55a05330f8cc 282 m_pDnsReq->setOnReply(this, &HTTPClient::onDNSReply);
darran 0:55a05330f8cc 283 m_pDnsReq->resolve(&m_server);
darran 0:55a05330f8cc 284 DBG("\r\nHTTPClient : DNSRequest %p\r\n", m_pDnsReq);
darran 0:55a05330f8cc 285 }
darran 0:55a05330f8cc 286
darran 0:55a05330f8cc 287 }
darran 0:55a05330f8cc 288
darran 0:55a05330f8cc 289 void HTTPClient::connect() //Start Connection
darran 0:55a05330f8cc 290 {
darran 0:55a05330f8cc 291 resetTimeout();
darran 0:55a05330f8cc 292 DBG("\r\nConnecting...\r\n");
darran 0:55a05330f8cc 293 m_pTCPSocket->connect(m_server);
darran 0:55a05330f8cc 294 }
darran 0:55a05330f8cc 295
darran 0:55a05330f8cc 296 #define MIN(a,b) ((a)<(b)?(a):(b))
darran 0:55a05330f8cc 297 #define ABS(a) (((a)>0)?(a):0)
darran 0:55a05330f8cc 298 int HTTPClient::tryRead() //Try to read data from tcp packet and put in the HTTPData object
darran 0:55a05330f8cc 299 {
darran 0:55a05330f8cc 300 int len = 0;
darran 0:55a05330f8cc 301 int readLen;
darran 0:55a05330f8cc 302 do
darran 0:55a05330f8cc 303 {
darran 0:55a05330f8cc 304 if(m_state == HTTP_READ_DATA_INCOMPLETE) //First try to complete buffer copy
darran 0:55a05330f8cc 305 {
darran 0:55a05330f8cc 306 readLen = m_bufRemainingLen;
darran 0:55a05330f8cc 307 if (readLen == 0)
darran 0:55a05330f8cc 308 {
darran 0:55a05330f8cc 309 m_state = HTTP_READ_DATA;
darran 0:55a05330f8cc 310 continue;
darran 0:55a05330f8cc 311 }
darran 0:55a05330f8cc 312 }
darran 0:55a05330f8cc 313 else
darran 0:55a05330f8cc 314 {
darran 0:55a05330f8cc 315 readLen = m_pTCPSocket->recv(m_buf, MIN(ABS(m_dataLen-m_dataPos),CHUNK_SIZE));
darran 0:55a05330f8cc 316 if(readLen < 0) //Error
darran 0:55a05330f8cc 317 {
darran 0:55a05330f8cc 318 return readLen;
darran 0:55a05330f8cc 319 }
darran 0:55a05330f8cc 320 m_pBufRemaining = m_buf;
darran 0:55a05330f8cc 321 }
darran 0:55a05330f8cc 322 /* if (readLen == 0)
darran 0:55a05330f8cc 323 {
darran 0:55a05330f8cc 324 m_state = HTTP_READ_DATA;
darran 0:55a05330f8cc 325 return len;
darran 0:55a05330f8cc 326 }*/
darran 0:55a05330f8cc 327
darran 0:55a05330f8cc 328 int writtenLen = m_pDataIn->write(m_pBufRemaining, readLen);
darran 0:55a05330f8cc 329 m_dataPos += writtenLen;
darran 0:55a05330f8cc 330
darran 0:55a05330f8cc 331 if(writtenLen<readLen) //Data was not completely written
darran 0:55a05330f8cc 332 {
darran 0:55a05330f8cc 333 m_pBufRemaining += writtenLen;
darran 0:55a05330f8cc 334 m_bufRemainingLen = readLen - writtenLen;
darran 0:55a05330f8cc 335 m_state = HTTP_READ_DATA_INCOMPLETE;
darran 0:55a05330f8cc 336 return len + writtenLen;
darran 0:55a05330f8cc 337 }
darran 0:55a05330f8cc 338 else
darran 0:55a05330f8cc 339 {
darran 0:55a05330f8cc 340 m_state = HTTP_READ_DATA;
darran 0:55a05330f8cc 341 }
darran 0:55a05330f8cc 342 len += readLen;
darran 0:55a05330f8cc 343 } while(readLen>0);
darran 0:55a05330f8cc 344
darran 0:55a05330f8cc 345 return len;
darran 0:55a05330f8cc 346 }
darran 0:55a05330f8cc 347
darran 0:55a05330f8cc 348 void HTTPClient::readData() //Data has been read
darran 0:55a05330f8cc 349 {
darran 0:55a05330f8cc 350 if(m_pDataIn == NULL) //Nothing to read (in HEAD for instance, not supported now)
darran 0:55a05330f8cc 351 {
darran 0:55a05330f8cc 352 m_state = HTTP_DONE;
darran 0:55a05330f8cc 353 return;
darran 0:55a05330f8cc 354 }
darran 0:55a05330f8cc 355 DBG("\r\nReading response...\r\n");
darran 0:55a05330f8cc 356 int len = 0;
darran 0:55a05330f8cc 357 do
darran 0:55a05330f8cc 358 {
darran 0:55a05330f8cc 359 if(m_dataChunked && (m_state != HTTP_READ_DATA_INCOMPLETE))
darran 0:55a05330f8cc 360 {
darran 0:55a05330f8cc 361 if(m_dataLen==0)
darran 0:55a05330f8cc 362 {
darran 0:55a05330f8cc 363 DBG("\r\nReading chunk length...\r\n");
darran 0:55a05330f8cc 364 //New block
darran 0:55a05330f8cc 365 static char chunkHeader[16];
darran 0:55a05330f8cc 366 //We use m_dataPos to retain the read position in chunkHeader, it has been set to 0 before the first call of readData()
darran 0:55a05330f8cc 367 m_dataPos += readLine(chunkHeader + m_dataPos, ABS(16 - m_dataPos));
darran 0:55a05330f8cc 368 if( m_dataPos > 0 )
darran 0:55a05330f8cc 369 {
darran 0:55a05330f8cc 370 if( chunkHeader[strlen(chunkHeader)-1] == 0x0d )
darran 0:55a05330f8cc 371 {
darran 0:55a05330f8cc 372 sscanf(chunkHeader, "%x%*[^\r\n]", &m_dataLen);
darran 0:55a05330f8cc 373 DBG("\r\nChunk length is %d\r\n", m_dataLen);
darran 0:55a05330f8cc 374 m_dataPos = 0;
darran 0:55a05330f8cc 375 }
darran 0:55a05330f8cc 376 else
darran 0:55a05330f8cc 377 {
darran 0:55a05330f8cc 378 //Wait for end of line
darran 0:55a05330f8cc 379 DBG("\r\nWait for CRLF\r\n");
darran 0:55a05330f8cc 380 return;
darran 0:55a05330f8cc 381 }
darran 0:55a05330f8cc 382 }
darran 0:55a05330f8cc 383 else
darran 0:55a05330f8cc 384 {
darran 0:55a05330f8cc 385 DBG("\r\nWait for data\r\n");
darran 0:55a05330f8cc 386 //Wait for data
darran 0:55a05330f8cc 387 return;
darran 0:55a05330f8cc 388 }
darran 0:55a05330f8cc 389 }
darran 0:55a05330f8cc 390 }
darran 0:55a05330f8cc 391
darran 0:55a05330f8cc 392 //Proper data recovery
darran 0:55a05330f8cc 393 len = tryRead();
darran 0:55a05330f8cc 394 if(len<0) //Error
darran 0:55a05330f8cc 395 {
darran 0:55a05330f8cc 396 onResult(HTTP_CONN);
darran 0:55a05330f8cc 397 return;
darran 0:55a05330f8cc 398 }
darran 0:55a05330f8cc 399
darran 0:55a05330f8cc 400 if(m_state == HTTP_READ_DATA_INCOMPLETE)
darran 0:55a05330f8cc 401 return;
darran 0:55a05330f8cc 402
darran 0:55a05330f8cc 403 //Chunk Tail
darran 0:55a05330f8cc 404 if(m_dataChunked)
darran 0:55a05330f8cc 405 {
darran 0:55a05330f8cc 406 if(m_dataPos >= m_dataLen)
darran 0:55a05330f8cc 407 {
darran 0:55a05330f8cc 408 DBG("\r\nChunk read, wait for CRLF\r\n");
darran 0:55a05330f8cc 409 char chunkTail[3];
darran 0:55a05330f8cc 410 m_dataPos += readLine(chunkTail, 3);
darran 0:55a05330f8cc 411 }
darran 0:55a05330f8cc 412
darran 0:55a05330f8cc 413 if(m_dataPos >= m_dataLen + 1) //1 == strlen("\n"),
darran 0:55a05330f8cc 414 {
darran 0:55a05330f8cc 415 DBG("\r\nEnd of chunk\r\n");
darran 0:55a05330f8cc 416 if(m_dataLen==0)
darran 0:55a05330f8cc 417 {
darran 0:55a05330f8cc 418 DBG("\r\nEnd of file\r\n");
darran 0:55a05330f8cc 419 //End of file
darran 0:55a05330f8cc 420 m_state = HTTP_DONE; //Done
darran 0:55a05330f8cc 421 }
darran 0:55a05330f8cc 422 m_dataLen = 0;
darran 0:55a05330f8cc 423 m_dataPos = 0;
darran 0:55a05330f8cc 424 }
darran 0:55a05330f8cc 425 }
darran 0:55a05330f8cc 426
darran 0:55a05330f8cc 427 } while(len>0);
darran 0:55a05330f8cc 428
darran 0:55a05330f8cc 429
darran 0:55a05330f8cc 430 if(!m_dataChunked && (m_dataPos >= m_dataLen)) //All Data has been received
darran 0:55a05330f8cc 431 {
darran 0:55a05330f8cc 432 DBG("\r\nEnd of file\r\n");
darran 0:55a05330f8cc 433 m_state = HTTP_DONE; //Done
darran 0:55a05330f8cc 434 }
darran 0:55a05330f8cc 435 }
darran 0:55a05330f8cc 436
darran 0:55a05330f8cc 437 void HTTPClient::writeData() //Data has been written & buf is free
darran 0:55a05330f8cc 438 {
darran 0:55a05330f8cc 439 if(m_pDataOut == NULL) //Nothing to write (in POST for instance)
darran 0:55a05330f8cc 440 {
darran 0:55a05330f8cc 441 m_dataLen = 0; //Reset Data Length
darran 0:55a05330f8cc 442 m_state = HTTP_READ_HEADERS;
darran 0:55a05330f8cc 443 return;
darran 0:55a05330f8cc 444 }
darran 0:55a05330f8cc 445 int len = m_pDataOut->read(m_buf, CHUNK_SIZE);
darran 0:55a05330f8cc 446 if( m_dataChunked )
darran 0:55a05330f8cc 447 {
darran 0:55a05330f8cc 448 //Write chunk header
darran 0:55a05330f8cc 449 char chunkHeader[16];
darran 0:55a05330f8cc 450 sprintf(chunkHeader, "%d\r\n", len);
darran 0:55a05330f8cc 451 int ret = m_pTCPSocket->send(chunkHeader, strlen(chunkHeader));
darran 0:55a05330f8cc 452 if(ret < 0)//Error
darran 0:55a05330f8cc 453 {
darran 0:55a05330f8cc 454 onResult(HTTP_CONN);
darran 0:55a05330f8cc 455 return;
darran 0:55a05330f8cc 456 }
darran 0:55a05330f8cc 457 }
darran 0:55a05330f8cc 458 m_pTCPSocket->send(m_buf, len);
darran 0:55a05330f8cc 459 m_dataPos+=len;
darran 0:55a05330f8cc 460 if( m_dataChunked )
darran 0:55a05330f8cc 461 {
darran 0:55a05330f8cc 462 m_pTCPSocket->send("\r\n", 2); //Chunk terminating CRLF
darran 0:55a05330f8cc 463 }
darran 0:55a05330f8cc 464 if( ( !m_dataChunked && (m_dataPos >= m_dataLen) )
darran 0:55a05330f8cc 465 || ( m_dataChunked && !len ) ) //All Data has been sent
darran 0:55a05330f8cc 466 {
darran 0:55a05330f8cc 467 m_dataLen = 0; //Reset Data Length
darran 0:55a05330f8cc 468 m_state = HTTP_READ_HEADERS; //Wait for resp
darran 0:55a05330f8cc 469 }
darran 0:55a05330f8cc 470 }
darran 0:55a05330f8cc 471
darran 0:55a05330f8cc 472 void HTTPClient::onTCPSocketEvent(TCPSocketEvent e)
darran 0:55a05330f8cc 473 {
darran 0:55a05330f8cc 474 DBG("\r\nEvent %d in HTTPClient::onTCPSocketEvent()\r\n", e);
darran 0:55a05330f8cc 475
darran 0:55a05330f8cc 476 if(m_closed)
darran 0:55a05330f8cc 477 {
darran 0:55a05330f8cc 478 DBG("\r\nWARN: Discarded\r\n");
darran 0:55a05330f8cc 479 return;
darran 0:55a05330f8cc 480 }
darran 0:55a05330f8cc 481
darran 0:55a05330f8cc 482 switch(e)
darran 0:55a05330f8cc 483 {
darran 0:55a05330f8cc 484 case TCPSOCKET_READABLE: //Incoming data
darran 0:55a05330f8cc 485 resetTimeout();
darran 0:55a05330f8cc 486 switch(m_state)
darran 0:55a05330f8cc 487 {
darran 0:55a05330f8cc 488 case HTTP_READ_HEADERS:
darran 0:55a05330f8cc 489 if( !readHeaders() )
darran 0:55a05330f8cc 490 {
darran 0:55a05330f8cc 491 return; //Connection has been closed or incomplete data
darran 0:55a05330f8cc 492 }
darran 0:55a05330f8cc 493 if( m_pDataIn )
darran 0:55a05330f8cc 494 {
darran 0:55a05330f8cc 495 //Data chunked?
darran 0:55a05330f8cc 496 if(m_respHeaders["Transfer-Encoding"].find("chunked")!=string::npos)
darran 0:55a05330f8cc 497 {
darran 0:55a05330f8cc 498 m_dataChunked = true;
darran 0:55a05330f8cc 499 m_dataPos = 0;
darran 0:55a05330f8cc 500 m_dataLen = 0;
darran 0:55a05330f8cc 501 DBG("\r\nEncoding is chunked, Content-Type is %s\r\n", m_respHeaders["Content-Type"].c_str() );
darran 0:55a05330f8cc 502 }
darran 0:55a05330f8cc 503 else
darran 0:55a05330f8cc 504 {
darran 0:55a05330f8cc 505 m_dataChunked = false;
darran 0:55a05330f8cc 506 int len = 0;
darran 0:55a05330f8cc 507 //DBG("\r\nPreparing read... len = %s\r\n", m_respHeaders["Content-Length"].c_str());
darran 0:55a05330f8cc 508 sscanf(m_respHeaders["Content-Length"].c_str(), "%d", &len);
darran 0:55a05330f8cc 509 m_pDataIn->setDataLen( len );
darran 0:55a05330f8cc 510 m_dataPos = 0;
darran 0:55a05330f8cc 511 m_dataLen = len;
darran 0:55a05330f8cc 512 DBG("\r\nContent-Length is %d, Content-Type is %s\r\n", len, m_respHeaders["Content-Type"].c_str() );
darran 0:55a05330f8cc 513 }
darran 0:55a05330f8cc 514 m_pDataIn->setDataType( m_respHeaders["Content-Type"] );
darran 0:55a05330f8cc 515 }
darran 0:55a05330f8cc 516 case HTTP_READ_DATA:
darran 0:55a05330f8cc 517 readData();
darran 0:55a05330f8cc 518 break;
darran 0:55a05330f8cc 519 case HTTP_READ_DATA_INCOMPLETE:
darran 0:55a05330f8cc 520 break; //We need to handle previously received data first
darran 0:55a05330f8cc 521 default:
darran 0:55a05330f8cc 522 //Should not receive data now, req is not complete
darran 0:55a05330f8cc 523 onResult(HTTP_PRTCL);
darran 0:55a05330f8cc 524 }
darran 0:55a05330f8cc 525 //All data has been read, close w/ success :)
darran 0:55a05330f8cc 526 if( m_state == HTTP_DONE )
darran 0:55a05330f8cc 527 {
darran 0:55a05330f8cc 528 DBG("\r\nDone :)!\r\n");
darran 0:55a05330f8cc 529 onResult(HTTP_OK);
darran 0:55a05330f8cc 530 }
darran 0:55a05330f8cc 531 break;
darran 0:55a05330f8cc 532 case TCPSOCKET_CONNECTED:
darran 0:55a05330f8cc 533 case TCPSOCKET_WRITEABLE: //We can send data
darran 0:55a05330f8cc 534 resetTimeout();
darran 0:55a05330f8cc 535 switch(m_state)
darran 0:55a05330f8cc 536 {
darran 0:55a05330f8cc 537 case HTTP_WRITE_HEADERS:
darran 0:55a05330f8cc 538 //Update headers fields according to m_pDataOut
darran 0:55a05330f8cc 539 if( m_pDataOut )
darran 0:55a05330f8cc 540 {
darran 0:55a05330f8cc 541 //Data is chunked?
darran 0:55a05330f8cc 542 if(m_pDataOut->getIsChunked())
darran 0:55a05330f8cc 543 {
darran 0:55a05330f8cc 544 m_dataChunked = true;
darran 0:55a05330f8cc 545 m_reqHeaders.erase("Content-Length");
darran 0:55a05330f8cc 546 m_reqHeaders["Transfer-Encoding"] = "chunked";
darran 0:55a05330f8cc 547 }
darran 0:55a05330f8cc 548 else
darran 0:55a05330f8cc 549 {
darran 0:55a05330f8cc 550 m_dataChunked = false;
darran 0:55a05330f8cc 551 char c_len[16] = "0";
darran 0:55a05330f8cc 552 int len = m_pDataOut->getDataLen();
darran 0:55a05330f8cc 553 sprintf(c_len, "%d", len);
darran 0:55a05330f8cc 554 m_dataPos = 0;
darran 0:55a05330f8cc 555 m_dataLen = len;
darran 0:55a05330f8cc 556 m_reqHeaders.erase("Transfer-Encoding");
darran 0:55a05330f8cc 557 m_reqHeaders["Content-Length"] = string(c_len);
darran 0:55a05330f8cc 558 }
darran 0:55a05330f8cc 559 string type = m_pDataOut->getDataType();
darran 0:55a05330f8cc 560 if(!type.empty())
darran 0:55a05330f8cc 561 {
darran 0:55a05330f8cc 562 m_reqHeaders["Content-Type"] = type;
darran 0:55a05330f8cc 563 }
darran 0:55a05330f8cc 564 else
darran 0:55a05330f8cc 565 {
darran 0:55a05330f8cc 566 m_reqHeaders.erase("Content-Type");
darran 0:55a05330f8cc 567 }
darran 0:55a05330f8cc 568 }
darran 0:55a05330f8cc 569 if( !writeHeaders() )
darran 0:55a05330f8cc 570 {
darran 0:55a05330f8cc 571 return; //Connection has been closed
darran 0:55a05330f8cc 572 }
darran 0:55a05330f8cc 573 break; //Wait for writeable event before sending payload
darran 0:55a05330f8cc 574 case HTTP_WRITE_DATA:
darran 0:55a05330f8cc 575 writeData();
darran 0:55a05330f8cc 576 break;
darran 0:55a05330f8cc 577 }
darran 0:55a05330f8cc 578 //Otherwise request has been sent, now wait for resp
darran 0:55a05330f8cc 579 break;
darran 0:55a05330f8cc 580 case TCPSOCKET_CONTIMEOUT:
darran 0:55a05330f8cc 581 case TCPSOCKET_CONRST:
darran 0:55a05330f8cc 582 case TCPSOCKET_CONABRT:
darran 0:55a05330f8cc 583 case TCPSOCKET_ERROR:
darran 0:55a05330f8cc 584 DBG("\r\nConnection error.\r\n");
darran 0:55a05330f8cc 585 onResult(HTTP_CONN);
darran 0:55a05330f8cc 586 case TCPSOCKET_DISCONNECTED:
darran 0:55a05330f8cc 587 //There might still be some data available for reading
darran 0:55a05330f8cc 588 //So if we are in a reading state, do not close the socket yet
darran 0:55a05330f8cc 589 if( (m_state != HTTP_READ_DATA_INCOMPLETE) && (m_state != HTTP_DONE) && (m_state != HTTP_CLOSED) )
darran 0:55a05330f8cc 590 {
darran 0:55a05330f8cc 591 onResult(HTTP_CONN);
darran 0:55a05330f8cc 592 }
darran 0:55a05330f8cc 593 DBG("\r\nConnection closed by remote host.\r\n");
darran 0:55a05330f8cc 594 break;
darran 0:55a05330f8cc 595 }
darran 0:55a05330f8cc 596 }
darran 0:55a05330f8cc 597
darran 0:55a05330f8cc 598 void HTTPClient::onDNSReply(DNSReply r)
darran 0:55a05330f8cc 599 {
darran 0:55a05330f8cc 600 if(m_closed)
darran 0:55a05330f8cc 601 {
darran 0:55a05330f8cc 602 DBG("\r\nWARN: Discarded\r\n");
darran 0:55a05330f8cc 603 return;
darran 0:55a05330f8cc 604 }
darran 0:55a05330f8cc 605
darran 0:55a05330f8cc 606 if( r != DNS_FOUND )
darran 0:55a05330f8cc 607 {
darran 0:55a05330f8cc 608 DBG("\r\nCould not resolve hostname.\r\n");
darran 0:55a05330f8cc 609 onResult(HTTP_DNS);
darran 0:55a05330f8cc 610 return;
darran 0:55a05330f8cc 611 }
darran 0:55a05330f8cc 612
darran 0:55a05330f8cc 613 DBG("\r\nDNS Resolved to %d.%d.%d.%d.\r\n",m_server.getIp()[0],m_server.getIp()[1],m_server.getIp()[2],m_server.getIp()[3]);
darran 0:55a05330f8cc 614 //If no error, m_server has been updated by m_pDnsReq so we're set to go !
darran 0:55a05330f8cc 615 m_pDnsReq->close();
darran 0:55a05330f8cc 616 delete m_pDnsReq;
darran 0:55a05330f8cc 617 m_pDnsReq = NULL;
darran 0:55a05330f8cc 618 connect();
darran 0:55a05330f8cc 619 }
darran 0:55a05330f8cc 620
darran 0:55a05330f8cc 621 void HTTPClient::onResult(HTTPResult r) //Called when exchange completed or on failure
darran 0:55a05330f8cc 622 {
darran 0:55a05330f8cc 623 if(m_pCbItem && m_pCbMeth)
darran 0:55a05330f8cc 624 (m_pCbItem->*m_pCbMeth)(r);
darran 0:55a05330f8cc 625 else if(m_pCb)
darran 0:55a05330f8cc 626 m_pCb(r);
darran 0:55a05330f8cc 627 m_blockingResult = r; //Blocking mode
darran 0:55a05330f8cc 628 close(); //FIXME:Remove suppl. close() calls
darran 0:55a05330f8cc 629 }
darran 0:55a05330f8cc 630
darran 0:55a05330f8cc 631 void HTTPClient::onTimeout() //Connection has timed out
darran 0:55a05330f8cc 632 {
darran 0:55a05330f8cc 633 DBG("\r\nTimed out.\n");
darran 0:55a05330f8cc 634 onResult(HTTP_TIMEOUT);
darran 0:55a05330f8cc 635 close();
darran 0:55a05330f8cc 636 }
darran 0:55a05330f8cc 637
darran 0:55a05330f8cc 638 //Headers
darran 0:55a05330f8cc 639
darran 0:55a05330f8cc 640 //TODO: Factorize w/ HTTPRequestHandler in a single HTTPHeader class
darran 0:55a05330f8cc 641
darran 0:55a05330f8cc 642 HTTPResult HTTPClient::blockingProcess() //Called in blocking mode, calls Net::poll() until return code is available
darran 0:55a05330f8cc 643 {
darran 0:55a05330f8cc 644 //Disable callbacks
darran 0:55a05330f8cc 645 m_pCb = NULL;
darran 0:55a05330f8cc 646 m_pCbItem = NULL;
darran 0:55a05330f8cc 647 m_pCbMeth = NULL;
darran 0:55a05330f8cc 648 m_blockingResult = HTTP_PROCESSING;
darran 0:55a05330f8cc 649 do
darran 0:55a05330f8cc 650 {
darran 0:55a05330f8cc 651 Net::poll();
darran 0:55a05330f8cc 652 } while(m_blockingResult == HTTP_PROCESSING);
darran 0:55a05330f8cc 653 Net::poll(); //Necessary for cleanup
darran 0:55a05330f8cc 654 return m_blockingResult;
darran 0:55a05330f8cc 655 }
darran 0:55a05330f8cc 656
darran 0:55a05330f8cc 657 bool HTTPClient::readHeaders()
darran 0:55a05330f8cc 658 {
darran 0:55a05330f8cc 659 static char* line = m_buf;
darran 0:55a05330f8cc 660 static char key[128];
darran 0:55a05330f8cc 661 static char value[128];
darran 0:55a05330f8cc 662 if(!m_dataLen) //No incomplete header in buffer, this is the first time we read data
darran 0:55a05330f8cc 663 {
darran 0:55a05330f8cc 664 if( readLine(line, 128) > 0 )
darran 0:55a05330f8cc 665 {
darran 0:55a05330f8cc 666 //Check RC
darran 0:55a05330f8cc 667 m_httpResponseCode = 0;
darran 0:55a05330f8cc 668 if( sscanf(line, "HTTP/%*d.%*d %d %*[^\r\n]", &m_httpResponseCode) != 1 )
darran 0:55a05330f8cc 669 {
darran 0:55a05330f8cc 670 //Cannot match string, error
darran 0:55a05330f8cc 671 DBG("\r\nNot a correct HTTP answer : %s\r\n", line);
darran 0:55a05330f8cc 672 onResult(HTTP_PRTCL);
darran 0:55a05330f8cc 673 close();
darran 0:55a05330f8cc 674 return false;
darran 0:55a05330f8cc 675 }
darran 0:55a05330f8cc 676
darran 0:55a05330f8cc 677 if(m_httpResponseCode != 200)
darran 0:55a05330f8cc 678 {
darran 0:55a05330f8cc 679 DBG("\r\nResponse: error code %d\r\n", m_httpResponseCode);
darran 0:55a05330f8cc 680 HTTPResult res = HTTP_ERROR;
darran 0:55a05330f8cc 681 switch(m_httpResponseCode)
darran 0:55a05330f8cc 682 {
darran 0:55a05330f8cc 683 case 404:
darran 0:55a05330f8cc 684 res = HTTP_NOTFOUND;
darran 0:55a05330f8cc 685 break;
darran 0:55a05330f8cc 686 case 403:
darran 0:55a05330f8cc 687 res = HTTP_REFUSED;
darran 0:55a05330f8cc 688 break;
darran 0:55a05330f8cc 689 default:
darran 0:55a05330f8cc 690 res = HTTP_ERROR;
darran 0:55a05330f8cc 691 }
darran 0:55a05330f8cc 692 onResult(res);
darran 0:55a05330f8cc 693 close();
darran 0:55a05330f8cc 694 return false;
darran 0:55a05330f8cc 695 }
darran 0:55a05330f8cc 696 DBG("\r\nResponse OK\r\n");
darran 0:55a05330f8cc 697 }
darran 0:55a05330f8cc 698 else
darran 0:55a05330f8cc 699 {
darran 0:55a05330f8cc 700 //Empty packet, weird!
darran 0:55a05330f8cc 701 DBG("\r\nEmpty packet!\r\n");
darran 0:55a05330f8cc 702 onResult(HTTP_PRTCL);
darran 0:55a05330f8cc 703 close();
darran 0:55a05330f8cc 704 return false;
darran 0:55a05330f8cc 705 }
darran 0:55a05330f8cc 706 }
darran 0:55a05330f8cc 707 bool incomplete = false;
darran 0:55a05330f8cc 708 while( true )
darran 0:55a05330f8cc 709 {
darran 0:55a05330f8cc 710 int readLen = readLine(line + m_dataLen, 128 - m_dataLen, &incomplete);
darran 0:55a05330f8cc 711 m_dataLen = 0;
darran 0:55a05330f8cc 712 if( readLen <= 2 ) //if == 1 or 2, it is an empty line = end of headers
darran 0:55a05330f8cc 713 {
darran 0:55a05330f8cc 714 DBG("\r\nAll headers read.\r\n");
darran 0:55a05330f8cc 715 m_state = HTTP_READ_DATA;
darran 0:55a05330f8cc 716 break;
darran 0:55a05330f8cc 717 }
darran 0:55a05330f8cc 718 else if( incomplete == true )
darran 0:55a05330f8cc 719 {
darran 0:55a05330f8cc 720 m_dataLen = readLen;//Sets data length available in buffer
darran 0:55a05330f8cc 721 return false;
darran 0:55a05330f8cc 722 }
darran 0:55a05330f8cc 723 //DBG("\r\nHeader : %s\r\n", line);
darran 0:55a05330f8cc 724 int n = sscanf(line, "%[^:] : %[^\r\n]", key, value);
darran 0:55a05330f8cc 725 if ( n == 2 )
darran 0:55a05330f8cc 726 {
darran 0:55a05330f8cc 727 DBG("\r\nRead header : %s: %s\r\n", key, value);
darran 0:55a05330f8cc 728 m_respHeaders[key] = value;
darran 0:55a05330f8cc 729 }
darran 0:55a05330f8cc 730 //TODO: Impl n==1 case (part 2 of previous header)
darran 0:55a05330f8cc 731 }
darran 0:55a05330f8cc 732
darran 0:55a05330f8cc 733 return true;
darran 0:55a05330f8cc 734 }
darran 0:55a05330f8cc 735
darran 0:55a05330f8cc 736 bool HTTPClient::writeHeaders() //Called at the first writeData call
darran 0:55a05330f8cc 737 {
darran 0:55a05330f8cc 738 static char* line = m_buf;
darran 0:55a05330f8cc 739 const char* HTTP_METH_STR[] = {"GET", "POST", "HEAD"};
darran 0:55a05330f8cc 740
darran 0:55a05330f8cc 741 //Req
darran 0:55a05330f8cc 742 sprintf(line, "%s %s HTTP/1.1\r\nHost: %s\r\n", HTTP_METH_STR[m_meth], m_path.c_str(), m_server.getName()); //Write request
darran 0:55a05330f8cc 743 m_pTCPSocket->send(line, strlen(line));
darran 0:55a05330f8cc 744 DBG("\r\nRequest: %s\r\n", line);
darran 0:55a05330f8cc 745
darran 0:55a05330f8cc 746 DBG("\r\nWriting headers:\r\n");
darran 0:55a05330f8cc 747 map<string,string>::iterator it;
darran 0:55a05330f8cc 748 for( it = m_reqHeaders.begin(); it != m_reqHeaders.end(); it++ )
darran 0:55a05330f8cc 749 {
darran 0:55a05330f8cc 750 sprintf(line, "%s: %s\r\n", (*it).first.c_str(), (*it).second.c_str() );
darran 0:55a05330f8cc 751 DBG("\r\n%s", line);
darran 0:55a05330f8cc 752 m_pTCPSocket->send(line, strlen(line));
darran 0:55a05330f8cc 753 }
darran 0:55a05330f8cc 754 m_pTCPSocket->send("\r\n",2); //End of head
darran 0:55a05330f8cc 755 m_state = HTTP_WRITE_DATA;
darran 0:55a05330f8cc 756 return true;
darran 0:55a05330f8cc 757 }
darran 0:55a05330f8cc 758
darran 0:55a05330f8cc 759 int HTTPClient::readLine(char* str, int maxLen, bool* pIncomplete /* = NULL*/)
darran 0:55a05330f8cc 760 {
darran 0:55a05330f8cc 761 int ret;
darran 0:55a05330f8cc 762 int len = 0;
darran 0:55a05330f8cc 763 if(pIncomplete)
darran 0:55a05330f8cc 764 *pIncomplete = false;
darran 0:55a05330f8cc 765 for(int i = 0; i < maxLen - 1; i++)
darran 0:55a05330f8cc 766 {
darran 0:55a05330f8cc 767 ret = m_pTCPSocket->recv(str, 1);
darran 0:55a05330f8cc 768 if(ret != 1)
darran 0:55a05330f8cc 769 {
darran 0:55a05330f8cc 770 if(pIncomplete)
darran 0:55a05330f8cc 771 *pIncomplete = true;
darran 0:55a05330f8cc 772 break;
darran 0:55a05330f8cc 773 }
darran 0:55a05330f8cc 774 if( (len > 1) && *(str-1)=='\r' && *str=='\n' )
darran 0:55a05330f8cc 775 {
darran 0:55a05330f8cc 776 break;
darran 0:55a05330f8cc 777 }
darran 0:55a05330f8cc 778 else if( *str=='\n' )
darran 0:55a05330f8cc 779 {
darran 0:55a05330f8cc 780 break;
darran 0:55a05330f8cc 781 }
darran 0:55a05330f8cc 782 str++;
darran 0:55a05330f8cc 783 len++;
darran 0:55a05330f8cc 784 }
darran 0:55a05330f8cc 785 *str = 0;
darran 0:55a05330f8cc 786 return len;
darran 0:55a05330f8cc 787 }