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@20:89ad63c03f10, 2014-11-19 (annotated)

Committer:
TimWoo
Date:
Wed Nov 19 21:03:21 2014 +0000
Revision:
20:89ad63c03f10
Parent:
19:e5a52252710f 
changed default debug setting to 0 (off) in HTTPClient.cpp

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