Tim Wöstemeier / HTTPClient_KVplus

Changed key and value max length from 32 to 64 to accommodate for longer header lines.

Fork of HTTPClient by Donatien Garnier

HTTPClient.cpp@18:277279a1891e, 2014-05-07 (annotated)

Committer:
donatien
Date:
Wed May 07 16:48:10 2014 +0000
Revision:
18:277279a1891e
Parent:
17:679e15a3d3db
Child:
19:e5a52252710f
Fixed issue with ARMCC

Who changed what in which revision?

UserRevisionLine numberNew contents of line
donatien 0:2ccb9960a044 1 /* HTTPClient.cpp */
donatien 10:e1351de84c16 2 /* Copyright (C) 2012 mbed.org, MIT License
donatien 10:e1351de84c16 3 *
donatien 10:e1351de84c16 4 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
donatien 10:e1351de84c16 5 * and associated documentation files (the "Software"), to deal in the Software without restriction,
donatien 10:e1351de84c16 6 * including without limitation the rights to use, copy, modify, merge, publish, distribute,
donatien 10:e1351de84c16 7 * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
donatien 10:e1351de84c16 8 * furnished to do so, subject to the following conditions:
donatien 10:e1351de84c16 9 *
donatien 10:e1351de84c16 10 * The above copyright notice and this permission notice shall be included in all copies or
donatien 10:e1351de84c16 11 * substantial portions of the Software.
donatien 10:e1351de84c16 12 *
donatien 10:e1351de84c16 13 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
donatien 10:e1351de84c16 14 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
donatien 10:e1351de84c16 15 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
donatien 10:e1351de84c16 16 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
donatien 10:e1351de84c16 17 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
donatien 10:e1351de84c16 18 */
donatien 0:2ccb9960a044 19
donatien 7:4e39864f7b15 20 //Debug is disabled by default
donatien 16:1f743885e7de 21 #if 0
donatien 12:89d09a6db00a 22 //Enable debug
donatien 11:390362de8c3f 23 #include <cstdio>
donatien 16:1f743885e7de 24 #define DBG(x, ...) std::printf("[HTTPClient : DBG]"x"\r\n", ##__VA_ARGS__);
donatien 11:390362de8c3f 25 #define WARN(x, ...) std::printf("[HTTPClient : WARN]"x"\r\n", ##__VA_ARGS__);
donatien 11:390362de8c3f 26 #define ERR(x, ...) std::printf("[HTTPClient : ERR]"x"\r\n", ##__VA_ARGS__);
donatien 12:89d09a6db00a 27
donatien 12:89d09a6db00a 28 #else
donatien 12:89d09a6db00a 29 //Disable debug
donatien 12:89d09a6db00a 30 #define DBG(x, ...)
donatien 12:89d09a6db00a 31 #define WARN(x, ...)
donatien 12:89d09a6db00a 32 #define ERR(x, ...)
donatien 12:89d09a6db00a 33
donatien 7:4e39864f7b15 34 #endif
donatien 0:2ccb9960a044 35
donatien 0:2ccb9960a044 36 #define HTTP_PORT 80
donatien 0:2ccb9960a044 37
donatien 11:390362de8c3f 38 #define OK 0
donatien 11:390362de8c3f 39
donatien 11:390362de8c3f 40 #define MIN(x,y) (((x)<(y))?(x):(y))
donatien 11:390362de8c3f 41 #define MAX(x,y) (((x)>(y))?(x):(y))
donatien 11:390362de8c3f 42
donatien 0:2ccb9960a044 43 #define CHUNK_SIZE 256
donatien 0:2ccb9960a044 44
donatien 0:2ccb9960a044 45 #include <cstring>
donatien 0:2ccb9960a044 46
donatien 11:390362de8c3f 47 #include "HTTPClient.h"
donatien 11:390362de8c3f 48
donatien 0:2ccb9960a044 49 HTTPClient::HTTPClient() :
donatien 7:4e39864f7b15 50 m_sock(), m_basicAuthUser(NULL), m_basicAuthPassword(NULL), m_httpResponseCode(0)
donatien 0:2ccb9960a044 51 {
donatien 0:2ccb9960a044 52
donatien 0:2ccb9960a044 53 }
donatien 0:2ccb9960a044 54
donatien 0:2ccb9960a044 55 HTTPClient::~HTTPClient()
donatien 0:2ccb9960a044 56 {
donatien 0:2ccb9960a044 57
donatien 0:2ccb9960a044 58 }
donatien 0:2ccb9960a044 59
donatien 0:2ccb9960a044 60 #if 0
donatien 0:2ccb9960a044 61 void HTTPClient::basicAuth(const char* user, const char* password) //Basic Authentification
donatien 0:2ccb9960a044 62 {
donatien 0:2ccb9960a044 63 m_basicAuthUser = user;
donatien 0:2ccb9960a044 64 m_basicAuthPassword = password;
donatien 0:2ccb9960a044 65 }
donatien 0:2ccb9960a044 66 #endif
donatien 0:2ccb9960a044 67
donatien 12:89d09a6db00a 68 HTTPResult HTTPClient::get(const char* url, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 69 {
donatien 0:2ccb9960a044 70 return connect(url, HTTP_GET, NULL, pDataIn, timeout);
donatien 0:2ccb9960a044 71 }
donatien 0:2ccb9960a044 72
donatien 12:89d09a6db00a 73 HTTPResult HTTPClient::get(const char* url, char* result, size_t maxResultLen, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 74 {
donatien 0:2ccb9960a044 75 HTTPText str(result, maxResultLen);
donatien 0:2ccb9960a044 76 return get(url, &str, timeout);
donatien 0:2ccb9960a044 77 }
donatien 0:2ccb9960a044 78
donatien 12:89d09a6db00a 79 HTTPResult HTTPClient::post(const char* url, const IHTTPDataOut& dataOut, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 80 {
donatien 0:2ccb9960a044 81 return connect(url, HTTP_POST, (IHTTPDataOut*)&dataOut, pDataIn, timeout);
donatien 0:2ccb9960a044 82 }
donatien 0:2ccb9960a044 83
donatien 16:1f743885e7de 84 HTTPResult HTTPClient::put(const char* url, const IHTTPDataOut& dataOut, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 16:1f743885e7de 85 {
donatien 16:1f743885e7de 86 return connect(url, HTTP_PUT, (IHTTPDataOut*)&dataOut, pDataIn, timeout);
donatien 16:1f743885e7de 87 }
donatien 16:1f743885e7de 88
donatien 16:1f743885e7de 89 HTTPResult HTTPClient::del(const char* url, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 16:1f743885e7de 90 {
donatien 16:1f743885e7de 91 return connect(url, HTTP_DELETE, NULL, pDataIn, timeout);
donatien 16:1f743885e7de 92 }
donatien 16:1f743885e7de 93
donatien 16:1f743885e7de 94
donatien 0:2ccb9960a044 95 int HTTPClient::getHTTPResponseCode()
donatien 0:2ccb9960a044 96 {
donatien 0:2ccb9960a044 97 return m_httpResponseCode;
donatien 0:2ccb9960a044 98 }
donatien 0:2ccb9960a044 99
donatien 5:791fc3dcb6c4 100 #define CHECK_CONN_ERR(ret) \
donatien 5:791fc3dcb6c4 101 do{ \
donatien 7:4e39864f7b15 102 if(ret) { \
donatien 7:4e39864f7b15 103 m_sock.close(); \
donatien 5:791fc3dcb6c4 104 ERR("Connection error (%d)", ret); \
donatien 11:390362de8c3f 105 return HTTP_CONN; \
donatien 5:791fc3dcb6c4 106 } \
donatien 5:791fc3dcb6c4 107 } while(0)
donatien 5:791fc3dcb6c4 108
donatien 5:791fc3dcb6c4 109 #define PRTCL_ERR() \
donatien 5:791fc3dcb6c4 110 do{ \
donatien 7:4e39864f7b15 111 m_sock.close(); \
donatien 5:791fc3dcb6c4 112 ERR("Protocol error"); \
donatien 11:390362de8c3f 113 return HTTP_PRTCL; \
donatien 5:791fc3dcb6c4 114 } while(0)
donatien 0:2ccb9960a044 115
donatien 12:89d09a6db00a 116 HTTPResult HTTPClient::connect(const char* url, HTTP_METH method, IHTTPDataOut* pDataOut, IHTTPDataIn* pDataIn, int timeout) //Execute request
donatien 12:89d09a6db00a 117 {
donatien 0:2ccb9960a044 118 m_httpResponseCode = 0; //Invalidate code
donatien 0:2ccb9960a044 119 m_timeout = timeout;
donatien 16:1f743885e7de 120
donatien 16:1f743885e7de 121 pDataIn->writeReset();
donatien 16:1f743885e7de 122 if( pDataOut )
donatien 16:1f743885e7de 123 {
donatien 16:1f743885e7de 124 pDataOut->readReset();
donatien 16:1f743885e7de 125 }
donatien 0:2ccb9960a044 126
donatien 0:2ccb9960a044 127 char scheme[8];
donatien 0:2ccb9960a044 128 uint16_t port;
donatien 0:2ccb9960a044 129 char host[32];
donatien 0:2ccb9960a044 130 char path[64];
donatien 0:2ccb9960a044 131 //First we need to parse the url (http[s]://host[:port][/[path]]) -- HTTPS not supported (yet?)
donatien 11:390362de8c3f 132 HTTPResult res = parseURL(url, scheme, sizeof(scheme), host, sizeof(host), &port, path, sizeof(path));
donatien 11:390362de8c3f 133 if(res != HTTP_OK)
donatien 0:2ccb9960a044 134 {
donatien 11:390362de8c3f 135 ERR("parseURL returned %d", res);
donatien 11:390362de8c3f 136 return res;
donatien 0:2ccb9960a044 137 }
donatien 0:2ccb9960a044 138
donatien 0:2ccb9960a044 139 if(port == 0) //TODO do handle HTTPS->443
donatien 0:2ccb9960a044 140 {
donatien 0:2ccb9960a044 141 port = 80;
donatien 0:2ccb9960a044 142 }
donatien 0:2ccb9960a044 143
donatien 0:2ccb9960a044 144 DBG("Scheme: %s", scheme);
donatien 0:2ccb9960a044 145 DBG("Host: %s", host);
donatien 0:2ccb9960a044 146 DBG("Port: %d", port);
donatien 0:2ccb9960a044 147 DBG("Path: %s", path);
donatien 0:2ccb9960a044 148
donatien 7:4e39864f7b15 149 //Connect
donatien 7:4e39864f7b15 150 DBG("Connecting socket to server");
donatien 11:390362de8c3f 151 int ret = m_sock.connect(host, port);
donatien 0:2ccb9960a044 152 if (ret < 0)
donatien 0:2ccb9960a044 153 {
donatien 7:4e39864f7b15 154 m_sock.close();
donatien 0:2ccb9960a044 155 ERR("Could not connect");
donatien 11:390362de8c3f 156 return HTTP_CONN;
donatien 0:2ccb9960a044 157 }
donatien 0:2ccb9960a044 158
donatien 0:2ccb9960a044 159 //Send request
donatien 0:2ccb9960a044 160 DBG("Sending request");
donatien 9:ff30cc189191 161 char buf[CHUNK_SIZE];
donatien 16:1f743885e7de 162 const char* meth = (method==HTTP_GET)?"GET":(method==HTTP_POST)?"POST":(method==HTTP_PUT)?"PUT":(method==HTTP_DELETE)?"DELETE":"";
donatien 9:ff30cc189191 163 snprintf(buf, sizeof(buf), "%s %s HTTP/1.1\r\nHost: %s\r\n", meth, path, host); //Write request
donatien 9:ff30cc189191 164 ret = send(buf);
donatien 0:2ccb9960a044 165 if(ret)
donatien 0:2ccb9960a044 166 {
donatien 7:4e39864f7b15 167 m_sock.close();
donatien 0:2ccb9960a044 168 ERR("Could not write request");
donatien 11:390362de8c3f 169 return HTTP_CONN;
donatien 0:2ccb9960a044 170 }
donatien 0:2ccb9960a044 171
donatien 0:2ccb9960a044 172 //Send all headers
donatien 0:2ccb9960a044 173
donatien 0:2ccb9960a044 174 //Send default headers
donatien 0:2ccb9960a044 175 DBG("Sending headers");
donatien 16:1f743885e7de 176 if( pDataOut != NULL )
donatien 0:2ccb9960a044 177 {
donatien 0:2ccb9960a044 178 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 179 {
donatien 0:2ccb9960a044 180 ret = send("Transfer-Encoding: chunked\r\n");
donatien 5:791fc3dcb6c4 181 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 182 }
donatien 0:2ccb9960a044 183 else
donatien 0:2ccb9960a044 184 {
donatien 9:ff30cc189191 185 snprintf(buf, sizeof(buf), "Content-Length: %d\r\n", pDataOut->getDataLen());
donatien 9:ff30cc189191 186 ret = send(buf);
donatien 5:791fc3dcb6c4 187 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 188 }
donatien 0:2ccb9960a044 189 char type[48];
donatien 11:390362de8c3f 190 if( pDataOut->getDataType(type, 48) == HTTP_OK )
donatien 0:2ccb9960a044 191 {
donatien 9:ff30cc189191 192 snprintf(buf, sizeof(buf), "Content-Type: %s\r\n", type);
donatien 9:ff30cc189191 193 ret = send(buf);
donatien 5:791fc3dcb6c4 194 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 195 }
donatien 17:679e15a3d3db 196
donatien 17:679e15a3d3db 197 //Send specific headers
donatien 17:679e15a3d3db 198 while( pDataOut->getHeader(buf, sizeof(buf) - 3) ) //must have space left for CRLF + 0 terminating char
donatien 17:679e15a3d3db 199 {
donatien 17:679e15a3d3db 200 size_t headerlen = strlen(buf);
donatien 17:679e15a3d3db 201 snprintf(buf + headerlen, sizeof(buf) - headerlen, "\r\n");
donatien 17:679e15a3d3db 202 ret = send(buf);
donatien 17:679e15a3d3db 203 CHECK_CONN_ERR(ret);
donatien 17:679e15a3d3db 204 }
donatien 17:679e15a3d3db 205 }
donatien 17:679e15a3d3db 206
donatien 17:679e15a3d3db 207 //Send specific headers
donatien 17:679e15a3d3db 208 while( pDataIn->getHeader(buf, sizeof(buf) - 3) )
donatien 17:679e15a3d3db 209 {
donatien 17:679e15a3d3db 210 size_t headerlen = strlen(buf);
donatien 17:679e15a3d3db 211 snprintf(buf + headerlen, sizeof(buf) - headerlen, "\r\n");
donatien 17:679e15a3d3db 212 ret = send(buf);
donatien 17:679e15a3d3db 213 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 214 }
donatien 9:ff30cc189191 215
donatien 0:2ccb9960a044 216 //Close headers
donatien 0:2ccb9960a044 217 DBG("Headers sent");
donatien 0:2ccb9960a044 218 ret = send("\r\n");
donatien 5:791fc3dcb6c4 219 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 220
donatien 4:c071b05ac026 221 size_t trfLen;
donatien 9:ff30cc189191 222
donatien 16:1f743885e7de 223 //Send data (if available)
donatien 16:1f743885e7de 224 if( pDataOut != NULL )
donatien 0:2ccb9960a044 225 {
donatien 0:2ccb9960a044 226 DBG("Sending data");
donatien 0:2ccb9960a044 227 while(true)
donatien 0:2ccb9960a044 228 {
donatien 0:2ccb9960a044 229 size_t writtenLen = 0;
donatien 0:2ccb9960a044 230 pDataOut->read(buf, CHUNK_SIZE, &trfLen);
donatien 0:2ccb9960a044 231 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 232 {
donatien 0:2ccb9960a044 233 //Write chunk header
donatien 9:ff30cc189191 234 char chunkHeader[16];
donatien 9:ff30cc189191 235 snprintf(chunkHeader, sizeof(chunkHeader), "%X\r\n", trfLen); //In hex encoding
donatien 9:ff30cc189191 236 ret = send(chunkHeader);
donatien 5:791fc3dcb6c4 237 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 238 }
donatien 0:2ccb9960a044 239 else if( trfLen == 0 )
donatien 0:2ccb9960a044 240 {
donatien 0:2ccb9960a044 241 break;
donatien 0:2ccb9960a044 242 }
donatien 0:2ccb9960a044 243 if( trfLen != 0 )
donatien 0:2ccb9960a044 244 {
donatien 0:2ccb9960a044 245 ret = send(buf, trfLen);
donatien 5:791fc3dcb6c4 246 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 247 }
donatien 0:2ccb9960a044 248
donatien 0:2ccb9960a044 249 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 250 {
donatien 0:2ccb9960a044 251 ret = send("\r\n"); //Chunk-terminating CRLF
donatien 5:791fc3dcb6c4 252 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 253 }
donatien 0:2ccb9960a044 254 else
donatien 0:2ccb9960a044 255 {
donatien 0:2ccb9960a044 256 writtenLen += trfLen;
donatien 0:2ccb9960a044 257 if( writtenLen >= pDataOut->getDataLen() )
donatien 0:2ccb9960a044 258 {
donatien 0:2ccb9960a044 259 break;
donatien 0:2ccb9960a044 260 }
donatien 0:2ccb9960a044 261 }
donatien 0:2ccb9960a044 262
donatien 0:2ccb9960a044 263 if( trfLen == 0 )
donatien 0:2ccb9960a044 264 {
donatien 0:2ccb9960a044 265 break;
donatien 0:2ccb9960a044 266 }
donatien 0:2ccb9960a044 267 }
donatien 0:2ccb9960a044 268 }
donatien 9:ff30cc189191 269
donatien 0:2ccb9960a044 270 //Receive response
donatien 0:2ccb9960a044 271 DBG("Receiving response");
donatien 17:679e15a3d3db 272 ret = recv(buf, 1, CHUNK_SIZE - 1, &trfLen); //Read n bytes
donatien 5:791fc3dcb6c4 273 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 274
donatien 0:2ccb9960a044 275 buf[trfLen] = '\0';
donatien 0:2ccb9960a044 276
donatien 17:679e15a3d3db 277 //Make sure we got the first response line
donatien 17:679e15a3d3db 278 char* crlfPtr = NULL;
donatien 17:679e15a3d3db 279 while( true )
donatien 17:679e15a3d3db 280 {
donatien 17:679e15a3d3db 281 crlfPtr = strstr(buf, "\r\n");
donatien 0:2ccb9960a044 282 if(crlfPtr == NULL)
donatien 0:2ccb9960a044 283 {
donatien 17:679e15a3d3db 284 if( trfLen < CHUNK_SIZE - 1 )
donatien 17:679e15a3d3db 285 {
donatien 17:679e15a3d3db 286 size_t newTrfLen;
donatien 17:679e15a3d3db 287 ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 17:679e15a3d3db 288 trfLen += newTrfLen;
donatien 17:679e15a3d3db 289 buf[trfLen] = '\0';
donatien 17:679e15a3d3db 290 DBG("Read %d chars; In buf: [%s]", newTrfLen, buf);
donatien 17:679e15a3d3db 291 CHECK_CONN_ERR(ret);
donatien 17:679e15a3d3db 292 continue;
donatien 17:679e15a3d3db 293 }
donatien 17:679e15a3d3db 294 else
donatien 17:679e15a3d3db 295 {
donatien 5:791fc3dcb6c4 296 PRTCL_ERR();
donatien 0:2ccb9960a044 297 }
donatien 17:679e15a3d3db 298 }
donatien 17:679e15a3d3db 299 break;
donatien 17:679e15a3d3db 300 }
donatien 0:2ccb9960a044 301
donatien 4:c071b05ac026 302 int crlfPos = crlfPtr - buf;
donatien 0:2ccb9960a044 303 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 304
donatien 0:2ccb9960a044 305 //Parse HTTP response
donatien 17:679e15a3d3db 306 //if( sscanf(buf, "HTTP/%*d.%*d %d %*[^\r\n]", &m_httpResponseCode) != 1 )
donatien 17:679e15a3d3db 307 if(crlfPos > 13)
donatien 17:679e15a3d3db 308 {
donatien 17:679e15a3d3db 309 buf[13] = '\0';
donatien 17:679e15a3d3db 310 }
donatien 17:679e15a3d3db 311 if( sscanf(buf, "HTTP/%*d.%*d %d", &m_httpResponseCode) != 1 ) //Kludge for newlib nano
donatien 0:2ccb9960a044 312 {
donatien 0:2ccb9960a044 313 //Cannot match string, error
donatien 0:2ccb9960a044 314 ERR("Not a correct HTTP answer : %s\n", buf);
donatien 5:791fc3dcb6c4 315 PRTCL_ERR();
donatien 0:2ccb9960a044 316 }
donatien 0:2ccb9960a044 317
donatien 16:1f743885e7de 318 if( (m_httpResponseCode < 200) || (m_httpResponseCode >= 300) )
donatien 0:2ccb9960a044 319 {
donatien 16:1f743885e7de 320 //Did not return a 2xx code; TODO fetch headers/(&data?) anyway and implement a mean of writing/reading headers
donatien 0:2ccb9960a044 321 WARN("Response code %d", m_httpResponseCode);
donatien 5:791fc3dcb6c4 322 PRTCL_ERR();
donatien 0:2ccb9960a044 323 }
donatien 0:2ccb9960a044 324
donatien 0:2ccb9960a044 325 DBG("Reading headers");
donatien 0:2ccb9960a044 326
donatien 4:c071b05ac026 327 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 328 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 329
donatien 4:c071b05ac026 330 size_t recvContentLength = 0;
donatien 4:c071b05ac026 331 bool recvChunked = false;
donatien 17:679e15a3d3db 332 bool recvLengthUnknown = true;
donatien 0:2ccb9960a044 333 //Now get headers
donatien 0:2ccb9960a044 334 while( true )
donatien 0:2ccb9960a044 335 {
donatien 0:2ccb9960a044 336 crlfPtr = strstr(buf, "\r\n");
donatien 0:2ccb9960a044 337 if(crlfPtr == NULL)
donatien 0:2ccb9960a044 338 {
donatien 4:c071b05ac026 339 if( trfLen < CHUNK_SIZE - 1 )
donatien 0:2ccb9960a044 340 {
donatien 0:2ccb9960a044 341 size_t newTrfLen;
donatien 0:2ccb9960a044 342 ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 0:2ccb9960a044 343 trfLen += newTrfLen;
donatien 0:2ccb9960a044 344 buf[trfLen] = '\0';
donatien 4:c071b05ac026 345 DBG("Read %d chars; In buf: [%s]", newTrfLen, buf);
donatien 5:791fc3dcb6c4 346 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 347 continue;
donatien 0:2ccb9960a044 348 }
donatien 0:2ccb9960a044 349 else
donatien 0:2ccb9960a044 350 {
donatien 5:791fc3dcb6c4 351 PRTCL_ERR();
donatien 0:2ccb9960a044 352 }
donatien 0:2ccb9960a044 353 }
donatien 0:2ccb9960a044 354
donatien 0:2ccb9960a044 355 crlfPos = crlfPtr - buf;
donatien 0:2ccb9960a044 356
donatien 0:2ccb9960a044 357 if(crlfPos == 0) //End of headers
donatien 0:2ccb9960a044 358 {
donatien 0:2ccb9960a044 359 DBG("Headers read");
donatien 4:c071b05ac026 360 memmove(buf, &buf[2], trfLen - 2 + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 361 trfLen -= 2;
donatien 0:2ccb9960a044 362 break;
donatien 0:2ccb9960a044 363 }
donatien 0:2ccb9960a044 364
donatien 0:2ccb9960a044 365 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 366
donatien 4:c071b05ac026 367 char key[32];
donatien 4:c071b05ac026 368 char value[32];
donatien 0:2ccb9960a044 369
donatien 17:679e15a3d3db 370 //key[31] = '\0';
donatien 17:679e15a3d3db 371 //value[31] = '\0';
donatien 17:679e15a3d3db 372
donatien 17:679e15a3d3db 373 memset(key, 0, 32);
donatien 17:679e15a3d3db 374 memset(value, 0, 32);
donatien 4:c071b05ac026 375
donatien 17:679e15a3d3db 376 //int n = sscanf(buf, "%31[^:]: %31[^\r\n]", key, value);
donatien 17:679e15a3d3db 377
donatien 17:679e15a3d3db 378 int n = 0;
donatien 17:679e15a3d3db 379
donatien 17:679e15a3d3db 380 char* keyEnd = strchr(buf, ':');
donatien 17:679e15a3d3db 381 if(keyEnd != NULL)
donatien 17:679e15a3d3db 382 {
donatien 17:679e15a3d3db 383 *keyEnd = '\0';
donatien 18:277279a1891e 384 if(strlen(buf) < 32)
donatien 17:679e15a3d3db 385 {
donatien 18:277279a1891e 386 strcpy(key, buf);
donatien 17:679e15a3d3db 387 n++;
donatien 17:679e15a3d3db 388 char* valueStart = keyEnd + 2;
donatien 17:679e15a3d3db 389 if( (valueStart - buf) < crlfPos )
donatien 17:679e15a3d3db 390 {
donatien 18:277279a1891e 391 if(strlen(valueStart) < 32)
donatien 18:277279a1891e 392 {
donatien 18:277279a1891e 393 strcpy(value, valueStart);
donatien 17:679e15a3d3db 394 n++;
donatien 17:679e15a3d3db 395 }
donatien 17:679e15a3d3db 396 }
donatien 17:679e15a3d3db 397 }
donatien 17:679e15a3d3db 398 }
donatien 0:2ccb9960a044 399 if ( n == 2 )
donatien 0:2ccb9960a044 400 {
donatien 0:2ccb9960a044 401 DBG("Read header : %s: %s\n", key, value);
donatien 0:2ccb9960a044 402 if( !strcmp(key, "Content-Length") )
donatien 0:2ccb9960a044 403 {
donatien 0:2ccb9960a044 404 sscanf(value, "%d", &recvContentLength);
donatien 17:679e15a3d3db 405 recvLengthUnknown = false;
donatien 0:2ccb9960a044 406 pDataIn->setDataLen(recvContentLength);
donatien 0:2ccb9960a044 407 }
donatien 0:2ccb9960a044 408 else if( !strcmp(key, "Transfer-Encoding") )
donatien 0:2ccb9960a044 409 {
donatien 0:2ccb9960a044 410 if( !strcmp(value, "Chunked") || !strcmp(value, "chunked") )
donatien 0:2ccb9960a044 411 {
donatien 0:2ccb9960a044 412 recvChunked = true;
donatien 17:679e15a3d3db 413 recvLengthUnknown = false;
donatien 0:2ccb9960a044 414 pDataIn->setIsChunked(true);
donatien 0:2ccb9960a044 415 }
donatien 0:2ccb9960a044 416 }
donatien 0:2ccb9960a044 417 else if( !strcmp(key, "Content-Type") )
donatien 0:2ccb9960a044 418 {
donatien 0:2ccb9960a044 419 pDataIn->setDataType(value);
donatien 0:2ccb9960a044 420 }
donatien 0:2ccb9960a044 421
donatien 4:c071b05ac026 422 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 423 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 424
donatien 0:2ccb9960a044 425 }
donatien 0:2ccb9960a044 426 else
donatien 0:2ccb9960a044 427 {
donatien 0:2ccb9960a044 428 ERR("Could not parse header");
donatien 5:791fc3dcb6c4 429 PRTCL_ERR();
donatien 0:2ccb9960a044 430 }
donatien 0:2ccb9960a044 431
donatien 0:2ccb9960a044 432 }
donatien 0:2ccb9960a044 433
donatien 0:2ccb9960a044 434 //Receive data
donatien 0:2ccb9960a044 435 DBG("Receiving data");
donatien 0:2ccb9960a044 436 while(true)
donatien 0:2ccb9960a044 437 {
donatien 0:2ccb9960a044 438 size_t readLen = 0;
donatien 0:2ccb9960a044 439
donatien 0:2ccb9960a044 440 if( recvChunked )
donatien 0:2ccb9960a044 441 {
donatien 0:2ccb9960a044 442 //Read chunk header
donatien 14:2744e0c0e527 443 bool foundCrlf;
donatien 14:2744e0c0e527 444 do
donatien 0:2ccb9960a044 445 {
donatien 14:2744e0c0e527 446 foundCrlf = false;
donatien 14:2744e0c0e527 447 crlfPos=0;
donatien 14:2744e0c0e527 448 buf[trfLen]=0;
donatien 14:2744e0c0e527 449 if(trfLen >= 2)
donatien 0:2ccb9960a044 450 {
donatien 14:2744e0c0e527 451 for(; crlfPos < trfLen - 2; crlfPos++)
donatien 14:2744e0c0e527 452 {
donatien 14:2744e0c0e527 453 if( buf[crlfPos] == '\r' && buf[crlfPos + 1] == '\n' )
donatien 14:2744e0c0e527 454 {
donatien 14:2744e0c0e527 455 foundCrlf = true;
donatien 14:2744e0c0e527 456 break;
donatien 14:2744e0c0e527 457 }
donatien 14:2744e0c0e527 458 }
donatien 0:2ccb9960a044 459 }
donatien 14:2744e0c0e527 460 if(!foundCrlf) //Try to read more
donatien 0:2ccb9960a044 461 {
donatien 14:2744e0c0e527 462 if( trfLen < CHUNK_SIZE )
donatien 14:2744e0c0e527 463 {
donatien 14:2744e0c0e527 464 size_t newTrfLen;
donatien 14:2744e0c0e527 465 ret = recv(buf + trfLen, 0, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 14:2744e0c0e527 466 trfLen += newTrfLen;
donatien 14:2744e0c0e527 467 CHECK_CONN_ERR(ret);
donatien 14:2744e0c0e527 468 continue;
donatien 14:2744e0c0e527 469 }
donatien 14:2744e0c0e527 470 else
donatien 14:2744e0c0e527 471 {
donatien 14:2744e0c0e527 472 PRTCL_ERR();
donatien 14:2744e0c0e527 473 }
donatien 0:2ccb9960a044 474 }
donatien 14:2744e0c0e527 475 } while(!foundCrlf);
donatien 0:2ccb9960a044 476 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 477 int n = sscanf(buf, "%x", &readLen);
donatien 0:2ccb9960a044 478 if(n!=1)
donatien 0:2ccb9960a044 479 {
donatien 15:5ad07f90e895 480 ERR("Could not read chunk length");
donatien 5:791fc3dcb6c4 481 PRTCL_ERR();
donatien 0:2ccb9960a044 482 }
donatien 0:2ccb9960a044 483
donatien 4:c071b05ac026 484 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2)); //Not need to move NULL-terminating char any more
donatien 0:2ccb9960a044 485 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 486
donatien 0:2ccb9960a044 487 if( readLen == 0 )
donatien 0:2ccb9960a044 488 {
donatien 0:2ccb9960a044 489 //Last chunk
donatien 0:2ccb9960a044 490 break;
donatien 0:2ccb9960a044 491 }
donatien 0:2ccb9960a044 492 }
donatien 0:2ccb9960a044 493 else
donatien 0:2ccb9960a044 494 {
donatien 0:2ccb9960a044 495 readLen = recvContentLength;
donatien 0:2ccb9960a044 496 }
donatien 0:2ccb9960a044 497
donatien 17:679e15a3d3db 498 DBG("Retrieving %d bytes (%d bytes in buffer)", readLen, trfLen);
donatien 0:2ccb9960a044 499
donatien 0:2ccb9960a044 500 do
donatien 0:2ccb9960a044 501 {
donatien 17:679e15a3d3db 502 if(recvLengthUnknown )
donatien 17:679e15a3d3db 503 {
donatien 17:679e15a3d3db 504 readLen = trfLen;
donatien 17:679e15a3d3db 505 }
donatien 0:2ccb9960a044 506 pDataIn->write(buf, MIN(trfLen, readLen));
donatien 17:679e15a3d3db 507 if(!recvLengthUnknown)
donatien 0:2ccb9960a044 508 {
donatien 17:679e15a3d3db 509 if( trfLen > readLen )
donatien 17:679e15a3d3db 510 {
donatien 17:679e15a3d3db 511 memmove(buf, &buf[readLen], trfLen - readLen);
donatien 17:679e15a3d3db 512 trfLen -= readLen;
donatien 17:679e15a3d3db 513 readLen = 0;
donatien 17:679e15a3d3db 514 }
donatien 17:679e15a3d3db 515 else
donatien 17:679e15a3d3db 516 {
donatien 17:679e15a3d3db 517 readLen -= trfLen;
donatien 17:679e15a3d3db 518 }
donatien 0:2ccb9960a044 519 }
donatien 0:2ccb9960a044 520 else
donatien 0:2ccb9960a044 521 {
donatien 17:679e15a3d3db 522 trfLen = 0;
donatien 0:2ccb9960a044 523 }
donatien 0:2ccb9960a044 524
donatien 17:679e15a3d3db 525 if(readLen || recvLengthUnknown)
donatien 0:2ccb9960a044 526 {
donatien 0:2ccb9960a044 527 ret = recv(buf, 1, CHUNK_SIZE - trfLen - 1, &trfLen);
donatien 17:679e15a3d3db 528 if(recvLengthUnknown && (ret == HTTP_CLOSED))
donatien 17:679e15a3d3db 529 {
donatien 17:679e15a3d3db 530 //Write and exit
donatien 17:679e15a3d3db 531 pDataIn->write(buf, trfLen);
donatien 17:679e15a3d3db 532 break;
donatien 17:679e15a3d3db 533 }
donatien 5:791fc3dcb6c4 534 CHECK_CONN_ERR(ret);
donatien 17:679e15a3d3db 535 if(recvLengthUnknown && (trfLen == 0))
donatien 17:679e15a3d3db 536 {
donatien 17:679e15a3d3db 537 break;
donatien 17:679e15a3d3db 538 }
donatien 0:2ccb9960a044 539 }
donatien 17:679e15a3d3db 540 } while(readLen || recvLengthUnknown);
donatien 0:2ccb9960a044 541
donatien 0:2ccb9960a044 542 if( recvChunked )
donatien 0:2ccb9960a044 543 {
donatien 0:2ccb9960a044 544 if(trfLen < 2)
donatien 0:2ccb9960a044 545 {
donatien 0:2ccb9960a044 546 size_t newTrfLen;
donatien 0:2ccb9960a044 547 //Read missing chars to find end of chunk
donatien 14:2744e0c0e527 548 ret = recv(buf + trfLen, 2 - trfLen, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 5:791fc3dcb6c4 549 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 550 trfLen += newTrfLen;
donatien 0:2ccb9960a044 551 }
donatien 0:2ccb9960a044 552 if( (buf[0] != '\r') || (buf[1] != '\n') )
donatien 0:2ccb9960a044 553 {
donatien 0:2ccb9960a044 554 ERR("Format error");
donatien 5:791fc3dcb6c4 555 PRTCL_ERR();
donatien 0:2ccb9960a044 556 }
donatien 0:2ccb9960a044 557 memmove(buf, &buf[2], trfLen - 2);
donatien 0:2ccb9960a044 558 trfLen -= 2;
donatien 0:2ccb9960a044 559 }
donatien 0:2ccb9960a044 560 else
donatien 0:2ccb9960a044 561 {
donatien 0:2ccb9960a044 562 break;
donatien 0:2ccb9960a044 563 }
donatien 0:2ccb9960a044 564
donatien 0:2ccb9960a044 565 }
donatien 0:2ccb9960a044 566
donatien 7:4e39864f7b15 567 m_sock.close();
donatien 0:2ccb9960a044 568 DBG("Completed HTTP transaction");
donatien 0:2ccb9960a044 569
donatien 11:390362de8c3f 570 return HTTP_OK;
donatien 0:2ccb9960a044 571 }
donatien 0:2ccb9960a044 572
donatien 11:390362de8c3f 573 HTTPResult HTTPClient::recv(char* buf, size_t minLen, size_t maxLen, size_t* pReadLen) //0 on success, err code on failure
donatien 0:2ccb9960a044 574 {
donatien 0:2ccb9960a044 575 DBG("Trying to read between %d and %d bytes", minLen, maxLen);
donatien 0:2ccb9960a044 576 size_t readLen = 0;
donatien 12:89d09a6db00a 577
donatien 12:89d09a6db00a 578 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 579 {
donatien 12:89d09a6db00a 580 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 581 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 582 }
donatien 12:89d09a6db00a 583
donatien 7:4e39864f7b15 584 int ret;
donatien 7:4e39864f7b15 585 while(readLen < maxLen)
donatien 0:2ccb9960a044 586 {
donatien 7:4e39864f7b15 587 if(readLen < minLen)
donatien 0:2ccb9960a044 588 {
donatien 12:89d09a6db00a 589 DBG("Trying to read at most %d bytes [Blocking]", minLen - readLen);
donatien 13:be61104f4e91 590 m_sock.set_blocking(false, m_timeout);
donatien 12:89d09a6db00a 591 ret = m_sock.receive_all(buf + readLen, minLen - readLen);
donatien 0:2ccb9960a044 592 }
donatien 7:4e39864f7b15 593 else
donatien 7:4e39864f7b15 594 {
donatien 12:89d09a6db00a 595 DBG("Trying to read at most %d bytes [Not blocking]", maxLen - readLen);
donatien 13:be61104f4e91 596 m_sock.set_blocking(false, 0);
donatien 12:89d09a6db00a 597 ret = m_sock.receive(buf + readLen, maxLen - readLen);
donatien 7:4e39864f7b15 598 }
donatien 7:4e39864f7b15 599
donatien 0:2ccb9960a044 600 if( ret > 0)
donatien 0:2ccb9960a044 601 {
donatien 0:2ccb9960a044 602 readLen += ret;
donatien 0:2ccb9960a044 603 }
donatien 0:2ccb9960a044 604 else if( ret == 0 )
donatien 0:2ccb9960a044 605 {
donatien 7:4e39864f7b15 606 break;
donatien 7:4e39864f7b15 607 }
donatien 7:4e39864f7b15 608 else
donatien 7:4e39864f7b15 609 {
donatien 12:89d09a6db00a 610 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 611 {
donatien 12:89d09a6db00a 612 ERR("Connection error (recv returned %d)", ret);
donatien 12:89d09a6db00a 613 *pReadLen = readLen;
donatien 12:89d09a6db00a 614 return HTTP_CONN;
donatien 12:89d09a6db00a 615 }
donatien 12:89d09a6db00a 616 else
donatien 12:89d09a6db00a 617 {
donatien 12:89d09a6db00a 618 break;
donatien 12:89d09a6db00a 619 }
donatien 12:89d09a6db00a 620 }
donatien 12:89d09a6db00a 621
donatien 12:89d09a6db00a 622 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 623 {
donatien 12:89d09a6db00a 624 break;
donatien 7:4e39864f7b15 625 }
donatien 7:4e39864f7b15 626 }
donatien 7:4e39864f7b15 627 DBG("Read %d bytes", readLen);
donatien 7:4e39864f7b15 628 *pReadLen = readLen;
donatien 11:390362de8c3f 629 return HTTP_OK;
donatien 7:4e39864f7b15 630 }
donatien 7:4e39864f7b15 631
donatien 11:390362de8c3f 632 HTTPResult HTTPClient::send(char* buf, size_t len) //0 on success, err code on failure
donatien 7:4e39864f7b15 633 {
donatien 7:4e39864f7b15 634 if(len == 0)
donatien 7:4e39864f7b15 635 {
donatien 7:4e39864f7b15 636 len = strlen(buf);
donatien 7:4e39864f7b15 637 }
donatien 7:4e39864f7b15 638 DBG("Trying to write %d bytes", len);
donatien 7:4e39864f7b15 639 size_t writtenLen = 0;
donatien 12:89d09a6db00a 640
donatien 12:89d09a6db00a 641 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 642 {
donatien 12:89d09a6db00a 643 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 644 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 645 }
donatien 7:4e39864f7b15 646
donatien 13:be61104f4e91 647 m_sock.set_blocking(false, m_timeout);
donatien 12:89d09a6db00a 648 int ret = m_sock.send_all(buf, len);
donatien 12:89d09a6db00a 649 if(ret > 0)
donatien 7:4e39864f7b15 650 {
donatien 12:89d09a6db00a 651 writtenLen += ret;
donatien 12:89d09a6db00a 652 }
donatien 12:89d09a6db00a 653 else if( ret == 0 )
donatien 12:89d09a6db00a 654 {
donatien 12:89d09a6db00a 655 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 656 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 657 }
donatien 12:89d09a6db00a 658 else
donatien 12:89d09a6db00a 659 {
donatien 12:89d09a6db00a 660 ERR("Connection error (send returned %d)", ret);
donatien 12:89d09a6db00a 661 return HTTP_CONN;
donatien 12:89d09a6db00a 662 }
donatien 7:4e39864f7b15 663
donatien 0:2ccb9960a044 664 DBG("Written %d bytes", writtenLen);
donatien 11:390362de8c3f 665 return HTTP_OK;
donatien 0:2ccb9960a044 666 }
donatien 0:2ccb9960a044 667
donatien 11:390362de8c3f 668 HTTPResult HTTPClient::parseURL(const char* url, char* scheme, size_t maxSchemeLen, char* host, size_t maxHostLen, uint16_t* port, char* path, size_t maxPathLen) //Parse URL
donatien 0:2ccb9960a044 669 {
donatien 0:2ccb9960a044 670 char* schemePtr = (char*) url;
donatien 0:2ccb9960a044 671 char* hostPtr = (char*) strstr(url, "://");
donatien 0:2ccb9960a044 672 if(hostPtr == NULL)
donatien 0:2ccb9960a044 673 {
donatien 0:2ccb9960a044 674 WARN("Could not find host");
donatien 11:390362de8c3f 675 return HTTP_PARSE; //URL is invalid
donatien 0:2ccb9960a044 676 }
donatien 0:2ccb9960a044 677
donatien 0:2ccb9960a044 678 if( maxSchemeLen < hostPtr - schemePtr + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 679 {
donatien 0:2ccb9960a044 680 WARN("Scheme str is too small (%d >= %d)", maxSchemeLen, hostPtr - schemePtr + 1);
donatien 11:390362de8c3f 681 return HTTP_PARSE;
donatien 0:2ccb9960a044 682 }
donatien 0:2ccb9960a044 683 memcpy(scheme, schemePtr, hostPtr - schemePtr);
donatien 0:2ccb9960a044 684 scheme[hostPtr - schemePtr] = '\0';
donatien 0:2ccb9960a044 685
donatien 0:2ccb9960a044 686 hostPtr+=3;
donatien 0:2ccb9960a044 687
donatien 0:2ccb9960a044 688 size_t hostLen = 0;
donatien 0:2ccb9960a044 689
donatien 0:2ccb9960a044 690 char* portPtr = strchr(hostPtr, ':');
donatien 0:2ccb9960a044 691 if( portPtr != NULL )
donatien 0:2ccb9960a044 692 {
donatien 0:2ccb9960a044 693 hostLen = portPtr - hostPtr;
donatien 0:2ccb9960a044 694 portPtr++;
donatien 8:45c8da29a1cf 695 if( sscanf(portPtr, "%hu", port) != 1)
donatien 0:2ccb9960a044 696 {
donatien 0:2ccb9960a044 697 WARN("Could not find port");
donatien 11:390362de8c3f 698 return HTTP_PARSE;
donatien 0:2ccb9960a044 699 }
donatien 0:2ccb9960a044 700 }
donatien 0:2ccb9960a044 701 else
donatien 0:2ccb9960a044 702 {
donatien 0:2ccb9960a044 703 *port=0;
donatien 0:2ccb9960a044 704 }
donatien 0:2ccb9960a044 705 char* pathPtr = strchr(hostPtr, '/');
donatien 0:2ccb9960a044 706 if( hostLen == 0 )
donatien 0:2ccb9960a044 707 {
donatien 0:2ccb9960a044 708 hostLen = pathPtr - hostPtr;
donatien 0:2ccb9960a044 709 }
donatien 0:2ccb9960a044 710
donatien 0:2ccb9960a044 711 if( maxHostLen < hostLen + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 712 {
donatien 0:2ccb9960a044 713 WARN("Host str is too small (%d >= %d)", maxHostLen, hostLen + 1);
donatien 11:390362de8c3f 714 return HTTP_PARSE;
donatien 0:2ccb9960a044 715 }
donatien 0:2ccb9960a044 716 memcpy(host, hostPtr, hostLen);
donatien 0:2ccb9960a044 717 host[hostLen] = '\0';
donatien 0:2ccb9960a044 718
donatien 0:2ccb9960a044 719 size_t pathLen;
donatien 0:2ccb9960a044 720 char* fragmentPtr = strchr(hostPtr, '#');
donatien 0:2ccb9960a044 721 if(fragmentPtr != NULL)
donatien 0:2ccb9960a044 722 {
donatien 0:2ccb9960a044 723 pathLen = fragmentPtr - pathPtr;
donatien 0:2ccb9960a044 724 }
donatien 0:2ccb9960a044 725 else
donatien 0:2ccb9960a044 726 {
donatien 0:2ccb9960a044 727 pathLen = strlen(pathPtr);
donatien 0:2ccb9960a044 728 }
donatien 0:2ccb9960a044 729
donatien 0:2ccb9960a044 730 if( maxPathLen < pathLen + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 731 {
donatien 0:2ccb9960a044 732 WARN("Path str is too small (%d >= %d)", maxPathLen, pathLen + 1);
donatien 11:390362de8c3f 733 return HTTP_PARSE;
donatien 0:2ccb9960a044 734 }
donatien 0:2ccb9960a044 735 memcpy(path, pathPtr, pathLen);
donatien 0:2ccb9960a044 736 path[pathLen] = '\0';
donatien 0:2ccb9960a044 737
donatien 11:390362de8c3f 738 return HTTP_OK;
donatien 0:2ccb9960a044 739 }