NetTribute library with debug turned on in FShandler Donatien Garner -> Segundo Equipo -> this version

Committer:
hexley
Date:
Fri Nov 19 01:54:45 2010 +0000
Revision:
0:281d6ff68967

        

Who changed what in which revision?

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