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