Yasushi TAUCHI / HTTPClientForSOAP

SOAPの為に修正します。

Dependents:   temp_FIAP temp_FIAP_fetch tepco_demand BlueUSB_f_IEEE1888 ... more

Fork of HTTPClient by Donatien Garnier

HTTPClient.cpp@16:e8866f68cb4a, 2013-10-23 (annotated)

Committer:
yueee_yt
Date:
Wed Oct 23 07:34:47 2013 +0000
Revision:
16:e8866f68cb4a
Parent:
15:e09afb9ca1cd 
BugFix

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 13:be61104f4e91 21 #if 1
donatien 12:89d09a6db00a 22 //Enable debug
donatien 11:390362de8c3f 23 #include <cstdio>
donatien 13:be61104f4e91 24 //#define DBG(x, ...) std::printf("[HTTPClient : DBG]"x"\r\n", ##__VA_ARGS__);
donatien 13:be61104f4e91 25 #define DBG(x, ...)
donatien 11:390362de8c3f 26 #define WARN(x, ...) std::printf("[HTTPClient : WARN]"x"\r\n", ##__VA_ARGS__);
donatien 11:390362de8c3f 27 #define ERR(x, ...) std::printf("[HTTPClient : ERR]"x"\r\n", ##__VA_ARGS__);
donatien 12:89d09a6db00a 28
donatien 12:89d09a6db00a 29 #else
donatien 12:89d09a6db00a 30 //Disable debug
donatien 12:89d09a6db00a 31 #define DBG(x, ...)
donatien 12:89d09a6db00a 32 #define WARN(x, ...)
donatien 12:89d09a6db00a 33 #define ERR(x, ...)
donatien 12:89d09a6db00a 34
donatien 7:4e39864f7b15 35 #endif
donatien 0:2ccb9960a044 36
donatien 0:2ccb9960a044 37 #define HTTP_PORT 80
donatien 0:2ccb9960a044 38
donatien 11:390362de8c3f 39 #define OK 0
donatien 11:390362de8c3f 40
donatien 11:390362de8c3f 41 #define MIN(x,y) (((x)<(y))?(x):(y))
donatien 11:390362de8c3f 42 #define MAX(x,y) (((x)>(y))?(x):(y))
donatien 11:390362de8c3f 43
donatien 0:2ccb9960a044 44 #define CHUNK_SIZE 256
donatien 0:2ccb9960a044 45
donatien 0:2ccb9960a044 46 #include <cstring>
donatien 0:2ccb9960a044 47
donatien 11:390362de8c3f 48 #include "HTTPClient.h"
donatien 11:390362de8c3f 49
donatien 0:2ccb9960a044 50 HTTPClient::HTTPClient() :
donatien 7:4e39864f7b15 51 m_sock(), m_basicAuthUser(NULL), m_basicAuthPassword(NULL), m_httpResponseCode(0)
donatien 0:2ccb9960a044 52 {
donatien 0:2ccb9960a044 53
donatien 0:2ccb9960a044 54 }
donatien 0:2ccb9960a044 55
donatien 0:2ccb9960a044 56 HTTPClient::~HTTPClient()
donatien 0:2ccb9960a044 57 {
donatien 0:2ccb9960a044 58
donatien 0:2ccb9960a044 59 }
donatien 0:2ccb9960a044 60
donatien 0:2ccb9960a044 61 #if 0
donatien 0:2ccb9960a044 62 void HTTPClient::basicAuth(const char* user, const char* password) //Basic Authentification
donatien 0:2ccb9960a044 63 {
donatien 0:2ccb9960a044 64 m_basicAuthUser = user;
donatien 0:2ccb9960a044 65 m_basicAuthPassword = password;
donatien 0:2ccb9960a044 66 }
donatien 0:2ccb9960a044 67 #endif
donatien 0:2ccb9960a044 68
donatien 12:89d09a6db00a 69 HTTPResult HTTPClient::get(const char* url, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 70 {
donatien 0:2ccb9960a044 71 return connect(url, HTTP_GET, NULL, pDataIn, timeout);
donatien 0:2ccb9960a044 72 }
donatien 0:2ccb9960a044 73
donatien 12:89d09a6db00a 74 HTTPResult HTTPClient::get(const char* url, char* result, size_t maxResultLen, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 75 {
donatien 0:2ccb9960a044 76 HTTPText str(result, maxResultLen);
donatien 0:2ccb9960a044 77 return get(url, &str, timeout);
donatien 0:2ccb9960a044 78 }
donatien 0:2ccb9960a044 79
donatien 12:89d09a6db00a 80 HTTPResult HTTPClient::post(const char* url, const IHTTPDataOut& dataOut, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
donatien 0:2ccb9960a044 81 {
donatien 0:2ccb9960a044 82 return connect(url, HTTP_POST, (IHTTPDataOut*)&dataOut, pDataIn, timeout);
donatien 0:2ccb9960a044 83 }
yueee_yt 15:e09afb9ca1cd 84
yueee_yt 15:e09afb9ca1cd 85 HTTPResult HTTPClient::postXML(const char* url,const char* SOAPAction, const IHTTPDataOut& dataOut, IHTTPDataIn* pDataIn, int timeout /*= HTTP_CLIENT_DEFAULT_TIMEOUT*/) //Blocking
yueee_yt 14:477c357c1c24 86 {
yueee_yt 14:477c357c1c24 87 return connect(url, HTTP_POST, SOAPAction, (IHTTPDataOut*)&dataOut, pDataIn, timeout);
yueee_yt 14:477c357c1c24 88 }
donatien 0:2ccb9960a044 89
donatien 0:2ccb9960a044 90 int HTTPClient::getHTTPResponseCode()
donatien 0:2ccb9960a044 91 {
donatien 0:2ccb9960a044 92 return m_httpResponseCode;
donatien 0:2ccb9960a044 93 }
donatien 0:2ccb9960a044 94
donatien 5:791fc3dcb6c4 95 #define CHECK_CONN_ERR(ret) \
donatien 5:791fc3dcb6c4 96 do{ \
donatien 7:4e39864f7b15 97 if(ret) { \
donatien 7:4e39864f7b15 98 m_sock.close(); \
donatien 5:791fc3dcb6c4 99 ERR("Connection error (%d)", ret); \
donatien 11:390362de8c3f 100 return HTTP_CONN; \
donatien 5:791fc3dcb6c4 101 } \
donatien 5:791fc3dcb6c4 102 } while(0)
donatien 5:791fc3dcb6c4 103
donatien 5:791fc3dcb6c4 104 #define PRTCL_ERR() \
donatien 5:791fc3dcb6c4 105 do{ \
donatien 7:4e39864f7b15 106 m_sock.close(); \
donatien 5:791fc3dcb6c4 107 ERR("Protocol error"); \
donatien 11:390362de8c3f 108 return HTTP_PRTCL; \
donatien 5:791fc3dcb6c4 109 } while(0)
donatien 0:2ccb9960a044 110
donatien 12:89d09a6db00a 111 HTTPResult HTTPClient::connect(const char* url, HTTP_METH method, IHTTPDataOut* pDataOut, IHTTPDataIn* pDataIn, int timeout) //Execute request
donatien 12:89d09a6db00a 112 {
donatien 0:2ccb9960a044 113 m_httpResponseCode = 0; //Invalidate code
donatien 0:2ccb9960a044 114 m_timeout = timeout;
donatien 0:2ccb9960a044 115
donatien 0:2ccb9960a044 116 char scheme[8];
donatien 0:2ccb9960a044 117 uint16_t port;
donatien 0:2ccb9960a044 118 char host[32];
donatien 0:2ccb9960a044 119 char path[64];
donatien 0:2ccb9960a044 120 //First we need to parse the url (http[s]://host[:port][/[path]]) -- HTTPS not supported (yet?)
donatien 11:390362de8c3f 121 HTTPResult res = parseURL(url, scheme, sizeof(scheme), host, sizeof(host), &port, path, sizeof(path));
donatien 11:390362de8c3f 122 if(res != HTTP_OK)
donatien 0:2ccb9960a044 123 {
donatien 11:390362de8c3f 124 ERR("parseURL returned %d", res);
donatien 11:390362de8c3f 125 return res;
donatien 0:2ccb9960a044 126 }
donatien 0:2ccb9960a044 127
donatien 0:2ccb9960a044 128 if(port == 0) //TODO do handle HTTPS->443
donatien 0:2ccb9960a044 129 {
donatien 0:2ccb9960a044 130 port = 80;
donatien 0:2ccb9960a044 131 }
donatien 0:2ccb9960a044 132
donatien 0:2ccb9960a044 133 DBG("Scheme: %s", scheme);
donatien 0:2ccb9960a044 134 DBG("Host: %s", host);
donatien 0:2ccb9960a044 135 DBG("Port: %d", port);
donatien 0:2ccb9960a044 136 DBG("Path: %s", path);
donatien 0:2ccb9960a044 137
donatien 7:4e39864f7b15 138 //Connect
donatien 7:4e39864f7b15 139 DBG("Connecting socket to server");
donatien 11:390362de8c3f 140 int ret = m_sock.connect(host, port);
donatien 0:2ccb9960a044 141 if (ret < 0)
donatien 0:2ccb9960a044 142 {
donatien 7:4e39864f7b15 143 m_sock.close();
donatien 0:2ccb9960a044 144 ERR("Could not connect");
donatien 11:390362de8c3f 145 return HTTP_CONN;
donatien 0:2ccb9960a044 146 }
donatien 0:2ccb9960a044 147
donatien 0:2ccb9960a044 148 //Send request
donatien 0:2ccb9960a044 149 DBG("Sending request");
donatien 9:ff30cc189191 150 char buf[CHUNK_SIZE];
donatien 0:2ccb9960a044 151 const char* meth = (method==HTTP_GET)?"GET":(method==HTTP_POST)?"POST":"";
donatien 9:ff30cc189191 152 snprintf(buf, sizeof(buf), "%s %s HTTP/1.1\r\nHost: %s\r\n", meth, path, host); //Write request
donatien 9:ff30cc189191 153 ret = send(buf);
donatien 0:2ccb9960a044 154 if(ret)
donatien 0:2ccb9960a044 155 {
donatien 7:4e39864f7b15 156 m_sock.close();
donatien 0:2ccb9960a044 157 ERR("Could not write request");
donatien 11:390362de8c3f 158 return HTTP_CONN;
donatien 0:2ccb9960a044 159 }
donatien 0:2ccb9960a044 160
donatien 0:2ccb9960a044 161 //Send all headers
donatien 0:2ccb9960a044 162
donatien 0:2ccb9960a044 163 //Send default headers
donatien 0:2ccb9960a044 164 DBG("Sending headers");
donatien 0:2ccb9960a044 165 if( (method == HTTP_POST) && (pDataOut != NULL) )
donatien 0:2ccb9960a044 166 {
donatien 0:2ccb9960a044 167 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 168 {
donatien 0:2ccb9960a044 169 ret = send("Transfer-Encoding: chunked\r\n");
donatien 5:791fc3dcb6c4 170 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 171 }
donatien 0:2ccb9960a044 172 else
donatien 0:2ccb9960a044 173 {
donatien 9:ff30cc189191 174 snprintf(buf, sizeof(buf), "Content-Length: %d\r\n", pDataOut->getDataLen());
donatien 9:ff30cc189191 175 ret = send(buf);
donatien 5:791fc3dcb6c4 176 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 177 }
donatien 0:2ccb9960a044 178 char type[48];
donatien 11:390362de8c3f 179 if( pDataOut->getDataType(type, 48) == HTTP_OK )
donatien 0:2ccb9960a044 180 {
donatien 9:ff30cc189191 181 snprintf(buf, sizeof(buf), "Content-Type: %s\r\n", type);
donatien 9:ff30cc189191 182 ret = send(buf);
donatien 5:791fc3dcb6c4 183 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 184 }
donatien 0:2ccb9960a044 185 }
donatien 9:ff30cc189191 186
donatien 0:2ccb9960a044 187 //Close headers
donatien 0:2ccb9960a044 188 DBG("Headers sent");
donatien 0:2ccb9960a044 189 ret = send("\r\n");
donatien 5:791fc3dcb6c4 190 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 191
donatien 4:c071b05ac026 192 size_t trfLen;
donatien 9:ff30cc189191 193
donatien 0:2ccb9960a044 194 //Send data (if POST)
donatien 0:2ccb9960a044 195 if( (method == HTTP_POST) && (pDataOut != NULL) )
donatien 0:2ccb9960a044 196 {
donatien 0:2ccb9960a044 197 DBG("Sending data");
donatien 0:2ccb9960a044 198 while(true)
donatien 0:2ccb9960a044 199 {
donatien 0:2ccb9960a044 200 size_t writtenLen = 0;
donatien 0:2ccb9960a044 201 pDataOut->read(buf, CHUNK_SIZE, &trfLen);
donatien 0:2ccb9960a044 202 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 203 {
donatien 0:2ccb9960a044 204 //Write chunk header
donatien 9:ff30cc189191 205 char chunkHeader[16];
donatien 9:ff30cc189191 206 snprintf(chunkHeader, sizeof(chunkHeader), "%X\r\n", trfLen); //In hex encoding
donatien 9:ff30cc189191 207 ret = send(chunkHeader);
donatien 5:791fc3dcb6c4 208 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 209 }
donatien 0:2ccb9960a044 210 else if( trfLen == 0 )
donatien 0:2ccb9960a044 211 {
donatien 0:2ccb9960a044 212 break;
donatien 0:2ccb9960a044 213 }
donatien 0:2ccb9960a044 214 if( trfLen != 0 )
donatien 0:2ccb9960a044 215 {
donatien 0:2ccb9960a044 216 ret = send(buf, trfLen);
donatien 5:791fc3dcb6c4 217 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 218 }
donatien 0:2ccb9960a044 219
donatien 0:2ccb9960a044 220 if( pDataOut->getIsChunked() )
donatien 0:2ccb9960a044 221 {
donatien 0:2ccb9960a044 222 ret = send("\r\n"); //Chunk-terminating CRLF
donatien 5:791fc3dcb6c4 223 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 224 }
donatien 0:2ccb9960a044 225 else
donatien 0:2ccb9960a044 226 {
donatien 0:2ccb9960a044 227 writtenLen += trfLen;
donatien 0:2ccb9960a044 228 if( writtenLen >= pDataOut->getDataLen() )
donatien 0:2ccb9960a044 229 {
donatien 0:2ccb9960a044 230 break;
donatien 0:2ccb9960a044 231 }
donatien 0:2ccb9960a044 232 }
donatien 0:2ccb9960a044 233
donatien 0:2ccb9960a044 234 if( trfLen == 0 )
donatien 0:2ccb9960a044 235 {
donatien 0:2ccb9960a044 236 break;
donatien 0:2ccb9960a044 237 }
donatien 0:2ccb9960a044 238 }
donatien 0:2ccb9960a044 239
donatien 0:2ccb9960a044 240 }
donatien 9:ff30cc189191 241
donatien 0:2ccb9960a044 242 //Receive response
donatien 0:2ccb9960a044 243 DBG("Receiving response");
donatien 4:c071b05ac026 244 ret = recv(buf, CHUNK_SIZE - 1, CHUNK_SIZE - 1, &trfLen); //Read n bytes
donatien 5:791fc3dcb6c4 245 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 246
donatien 0:2ccb9960a044 247 buf[trfLen] = '\0';
donatien 0:2ccb9960a044 248
donatien 0:2ccb9960a044 249 char* crlfPtr = strstr(buf, "\r\n");
donatien 0:2ccb9960a044 250 if(crlfPtr == NULL)
donatien 0:2ccb9960a044 251 {
donatien 5:791fc3dcb6c4 252 PRTCL_ERR();
donatien 0:2ccb9960a044 253 }
donatien 0:2ccb9960a044 254
donatien 4:c071b05ac026 255 int crlfPos = crlfPtr - buf;
donatien 0:2ccb9960a044 256 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 257
donatien 0:2ccb9960a044 258 //Parse HTTP response
donatien 0:2ccb9960a044 259 if( sscanf(buf, "HTTP/%*d.%*d %d %*[^\r\n]", &m_httpResponseCode) != 1 )
donatien 0:2ccb9960a044 260 {
donatien 0:2ccb9960a044 261 //Cannot match string, error
donatien 0:2ccb9960a044 262 ERR("Not a correct HTTP answer : %s\n", buf);
donatien 5:791fc3dcb6c4 263 PRTCL_ERR();
donatien 0:2ccb9960a044 264 }
donatien 0:2ccb9960a044 265
donatien 0:2ccb9960a044 266 if(m_httpResponseCode != 200)
donatien 0:2ccb9960a044 267 {
donatien 0:2ccb9960a044 268 //Cannot match string, error
donatien 0:2ccb9960a044 269 WARN("Response code %d", m_httpResponseCode);
donatien 5:791fc3dcb6c4 270 PRTCL_ERR();
donatien 0:2ccb9960a044 271 }
donatien 0:2ccb9960a044 272
donatien 0:2ccb9960a044 273 DBG("Reading headers");
donatien 0:2ccb9960a044 274
donatien 4:c071b05ac026 275 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 276 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 277
donatien 4:c071b05ac026 278 size_t recvContentLength = 0;
donatien 4:c071b05ac026 279 bool recvChunked = false;
donatien 0:2ccb9960a044 280 //Now get headers
donatien 0:2ccb9960a044 281 while( true )
donatien 0:2ccb9960a044 282 {
donatien 0:2ccb9960a044 283 crlfPtr = strstr(buf, "\r\n");
donatien 0:2ccb9960a044 284 if(crlfPtr == NULL)
donatien 0:2ccb9960a044 285 {
donatien 4:c071b05ac026 286 if( trfLen < CHUNK_SIZE - 1 )
donatien 0:2ccb9960a044 287 {
donatien 0:2ccb9960a044 288 size_t newTrfLen;
donatien 0:2ccb9960a044 289 ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 0:2ccb9960a044 290 trfLen += newTrfLen;
donatien 0:2ccb9960a044 291 buf[trfLen] = '\0';
donatien 4:c071b05ac026 292 DBG("Read %d chars; In buf: [%s]", newTrfLen, buf);
donatien 5:791fc3dcb6c4 293 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 294 continue;
donatien 0:2ccb9960a044 295 }
donatien 0:2ccb9960a044 296 else
donatien 0:2ccb9960a044 297 {
donatien 5:791fc3dcb6c4 298 PRTCL_ERR();
donatien 0:2ccb9960a044 299 }
donatien 0:2ccb9960a044 300 }
donatien 0:2ccb9960a044 301
donatien 0:2ccb9960a044 302 crlfPos = crlfPtr - buf;
donatien 0:2ccb9960a044 303
donatien 0:2ccb9960a044 304 if(crlfPos == 0) //End of headers
donatien 0:2ccb9960a044 305 {
donatien 0:2ccb9960a044 306 DBG("Headers read");
donatien 4:c071b05ac026 307 memmove(buf, &buf[2], trfLen - 2 + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 308 trfLen -= 2;
donatien 0:2ccb9960a044 309 break;
donatien 0:2ccb9960a044 310 }
donatien 0:2ccb9960a044 311
donatien 0:2ccb9960a044 312 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 313
donatien 4:c071b05ac026 314 char key[32];
donatien 4:c071b05ac026 315 char value[32];
donatien 0:2ccb9960a044 316
donatien 4:c071b05ac026 317 key[31] = '\0';
donatien 4:c071b05ac026 318 value[31] = '\0';
donatien 4:c071b05ac026 319
donatien 4:c071b05ac026 320 int n = sscanf(buf, "%31[^:]: %31[^\r\n]", key, value);
donatien 0:2ccb9960a044 321 if ( n == 2 )
donatien 0:2ccb9960a044 322 {
donatien 0:2ccb9960a044 323 DBG("Read header : %s: %s\n", key, value);
donatien 0:2ccb9960a044 324 if( !strcmp(key, "Content-Length") )
donatien 0:2ccb9960a044 325 {
donatien 0:2ccb9960a044 326 sscanf(value, "%d", &recvContentLength);
donatien 0:2ccb9960a044 327 pDataIn->setDataLen(recvContentLength);
donatien 0:2ccb9960a044 328 }
donatien 0:2ccb9960a044 329 else if( !strcmp(key, "Transfer-Encoding") )
donatien 0:2ccb9960a044 330 {
donatien 0:2ccb9960a044 331 if( !strcmp(value, "Chunked") || !strcmp(value, "chunked") )
donatien 0:2ccb9960a044 332 {
donatien 0:2ccb9960a044 333 recvChunked = true;
donatien 0:2ccb9960a044 334 pDataIn->setIsChunked(true);
donatien 0:2ccb9960a044 335 }
donatien 0:2ccb9960a044 336 }
donatien 0:2ccb9960a044 337 else if( !strcmp(key, "Content-Type") )
donatien 0:2ccb9960a044 338 {
donatien 0:2ccb9960a044 339 pDataIn->setDataType(value);
donatien 0:2ccb9960a044 340 }
donatien 0:2ccb9960a044 341
donatien 4:c071b05ac026 342 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
donatien 0:2ccb9960a044 343 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 344
donatien 0:2ccb9960a044 345 }
donatien 0:2ccb9960a044 346 else
donatien 0:2ccb9960a044 347 {
donatien 0:2ccb9960a044 348 ERR("Could not parse header");
donatien 5:791fc3dcb6c4 349 PRTCL_ERR();
donatien 0:2ccb9960a044 350 }
donatien 0:2ccb9960a044 351
donatien 0:2ccb9960a044 352 }
donatien 0:2ccb9960a044 353
donatien 0:2ccb9960a044 354 //Receive data
donatien 0:2ccb9960a044 355 DBG("Receiving data");
donatien 0:2ccb9960a044 356 while(true)
donatien 0:2ccb9960a044 357 {
donatien 0:2ccb9960a044 358 size_t readLen = 0;
donatien 0:2ccb9960a044 359
donatien 0:2ccb9960a044 360 if( recvChunked )
donatien 0:2ccb9960a044 361 {
donatien 0:2ccb9960a044 362 //Read chunk header
donatien 0:2ccb9960a044 363 crlfPos=0;
donatien 0:2ccb9960a044 364 for(crlfPos++; crlfPos < trfLen - 2; crlfPos++)
donatien 0:2ccb9960a044 365 {
donatien 0:2ccb9960a044 366 if( buf[crlfPos] == '\r' && buf[crlfPos + 1] == '\n' )
donatien 0:2ccb9960a044 367 {
donatien 0:2ccb9960a044 368 break;
donatien 0:2ccb9960a044 369 }
donatien 0:2ccb9960a044 370 }
donatien 0:2ccb9960a044 371 if(crlfPos >= trfLen - 2) //Try to read more
donatien 0:2ccb9960a044 372 {
donatien 0:2ccb9960a044 373 if( trfLen < CHUNK_SIZE )
donatien 0:2ccb9960a044 374 {
donatien 0:2ccb9960a044 375 size_t newTrfLen;
donatien 0:2ccb9960a044 376 ret = recv(buf + trfLen, 0, CHUNK_SIZE - trfLen - 1, &newTrfLen);
donatien 0:2ccb9960a044 377 trfLen += newTrfLen;
donatien 5:791fc3dcb6c4 378 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 379 continue;
donatien 0:2ccb9960a044 380 }
donatien 0:2ccb9960a044 381 else
donatien 0:2ccb9960a044 382 {
donatien 5:791fc3dcb6c4 383 PRTCL_ERR();
donatien 0:2ccb9960a044 384 }
donatien 0:2ccb9960a044 385 }
donatien 0:2ccb9960a044 386 buf[crlfPos] = '\0';
donatien 0:2ccb9960a044 387 int n = sscanf(buf, "%x", &readLen);
donatien 0:2ccb9960a044 388 if(n!=1)
donatien 0:2ccb9960a044 389 {
donatien 0:2ccb9960a044 390 ERR("Could not read chunk length");
donatien 5:791fc3dcb6c4 391 PRTCL_ERR();
donatien 0:2ccb9960a044 392 }
donatien 0:2ccb9960a044 393
donatien 4:c071b05ac026 394 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2)); //Not need to move NULL-terminating char any more
donatien 0:2ccb9960a044 395 trfLen -= (crlfPos + 2);
donatien 0:2ccb9960a044 396
donatien 0:2ccb9960a044 397 if( readLen == 0 )
donatien 0:2ccb9960a044 398 {
donatien 0:2ccb9960a044 399 //Last chunk
donatien 0:2ccb9960a044 400 break;
donatien 0:2ccb9960a044 401 }
donatien 0:2ccb9960a044 402 }
donatien 0:2ccb9960a044 403 else
donatien 0:2ccb9960a044 404 {
donatien 0:2ccb9960a044 405 readLen = recvContentLength;
donatien 0:2ccb9960a044 406 }
donatien 0:2ccb9960a044 407
donatien 0:2ccb9960a044 408 DBG("Retrieving %d bytes", readLen);
donatien 0:2ccb9960a044 409
donatien 0:2ccb9960a044 410 do
donatien 0:2ccb9960a044 411 {
donatien 0:2ccb9960a044 412 pDataIn->write(buf, MIN(trfLen, readLen));
donatien 0:2ccb9960a044 413 if( trfLen > readLen )
donatien 0:2ccb9960a044 414 {
donatien 0:2ccb9960a044 415 memmove(buf, &buf[readLen], trfLen - readLen);
donatien 0:2ccb9960a044 416 trfLen -= readLen;
donatien 0:2ccb9960a044 417 readLen = 0;
donatien 0:2ccb9960a044 418 }
donatien 0:2ccb9960a044 419 else
donatien 0:2ccb9960a044 420 {
donatien 0:2ccb9960a044 421 readLen -= trfLen;
donatien 0:2ccb9960a044 422 }
donatien 0:2ccb9960a044 423
donatien 0:2ccb9960a044 424 if(readLen)
donatien 0:2ccb9960a044 425 {
donatien 0:2ccb9960a044 426 ret = recv(buf, 1, CHUNK_SIZE - trfLen - 1, &trfLen);
donatien 5:791fc3dcb6c4 427 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 428 }
donatien 0:2ccb9960a044 429 } while(readLen);
donatien 0:2ccb9960a044 430
donatien 0:2ccb9960a044 431 if( recvChunked )
donatien 0:2ccb9960a044 432 {
donatien 0:2ccb9960a044 433 if(trfLen < 2)
donatien 0:2ccb9960a044 434 {
donatien 0:2ccb9960a044 435 size_t newTrfLen;
donatien 0:2ccb9960a044 436 //Read missing chars to find end of chunk
donatien 0:2ccb9960a044 437 ret = recv(buf, 2 - trfLen, CHUNK_SIZE, &newTrfLen);
donatien 5:791fc3dcb6c4 438 CHECK_CONN_ERR(ret);
donatien 0:2ccb9960a044 439 trfLen += newTrfLen;
donatien 0:2ccb9960a044 440 }
donatien 0:2ccb9960a044 441 if( (buf[0] != '\r') || (buf[1] != '\n') )
donatien 0:2ccb9960a044 442 {
donatien 0:2ccb9960a044 443 ERR("Format error");
donatien 5:791fc3dcb6c4 444 PRTCL_ERR();
donatien 0:2ccb9960a044 445 }
donatien 0:2ccb9960a044 446 memmove(buf, &buf[2], trfLen - 2);
donatien 0:2ccb9960a044 447 trfLen -= 2;
donatien 0:2ccb9960a044 448 }
donatien 0:2ccb9960a044 449 else
donatien 0:2ccb9960a044 450 {
donatien 0:2ccb9960a044 451 break;
donatien 0:2ccb9960a044 452 }
donatien 0:2ccb9960a044 453
donatien 0:2ccb9960a044 454 }
donatien 0:2ccb9960a044 455
donatien 7:4e39864f7b15 456 m_sock.close();
donatien 0:2ccb9960a044 457 DBG("Completed HTTP transaction");
donatien 0:2ccb9960a044 458
donatien 11:390362de8c3f 459 return HTTP_OK;
donatien 0:2ccb9960a044 460 }
donatien 0:2ccb9960a044 461
yueee_yt 14:477c357c1c24 462 HTTPResult HTTPClient::connect(const char* url, HTTP_METH method, const char* SOAPAction, IHTTPDataOut* pDataOut, IHTTPDataIn* pDataIn, int timeout) //Execute request
yueee_yt 14:477c357c1c24 463 {
yueee_yt 14:477c357c1c24 464 m_httpResponseCode = 0; //Invalidate code
yueee_yt 14:477c357c1c24 465 m_timeout = timeout;
yueee_yt 14:477c357c1c24 466
yueee_yt 14:477c357c1c24 467 char scheme[8];
yueee_yt 14:477c357c1c24 468 uint16_t port;
yueee_yt 16:e8866f68cb4a 469 char host[100];
yueee_yt 14:477c357c1c24 470 char path[64];
yueee_yt 14:477c357c1c24 471 //First we need to parse the url (http[s]://host[:port][/[path]]) -- HTTPS not supported (yet?)
yueee_yt 14:477c357c1c24 472 HTTPResult res = parseURL(url, scheme, sizeof(scheme), host, sizeof(host), &port, path, sizeof(path));
yueee_yt 14:477c357c1c24 473 if(res != HTTP_OK)
yueee_yt 14:477c357c1c24 474 {
yueee_yt 14:477c357c1c24 475 ERR("parseURL returned %d", res);
yueee_yt 14:477c357c1c24 476 return res;
yueee_yt 14:477c357c1c24 477 }
yueee_yt 14:477c357c1c24 478
yueee_yt 14:477c357c1c24 479 if(port == 0) //TODO do handle HTTPS->443
yueee_yt 14:477c357c1c24 480 {
yueee_yt 14:477c357c1c24 481 port = 80;
yueee_yt 14:477c357c1c24 482 }
yueee_yt 14:477c357c1c24 483
yueee_yt 14:477c357c1c24 484 DBG("Scheme: %s", scheme);
yueee_yt 14:477c357c1c24 485 DBG("Host: %s", host);
yueee_yt 14:477c357c1c24 486 DBG("Port: %d", port);
yueee_yt 14:477c357c1c24 487 DBG("Path: %s", path);
yueee_yt 16:e8866f68cb4a 488 DBG("SOAPAction: %s",SOAPAction);
yueee_yt 14:477c357c1c24 489
yueee_yt 14:477c357c1c24 490 //Connect
yueee_yt 14:477c357c1c24 491 DBG("Connecting socket to server");
yueee_yt 14:477c357c1c24 492 int ret = m_sock.connect(host, port);
yueee_yt 14:477c357c1c24 493 if (ret < 0)
yueee_yt 14:477c357c1c24 494 {
yueee_yt 14:477c357c1c24 495 m_sock.close();
yueee_yt 14:477c357c1c24 496 ERR("Could not connect");
yueee_yt 14:477c357c1c24 497 return HTTP_CONN;
yueee_yt 14:477c357c1c24 498 }
yueee_yt 14:477c357c1c24 499
yueee_yt 14:477c357c1c24 500 //Send request
yueee_yt 14:477c357c1c24 501 DBG("Sending request");
yueee_yt 14:477c357c1c24 502 char buf[CHUNK_SIZE];
yueee_yt 14:477c357c1c24 503 const char* meth = (method==HTTP_GET)?"GET":(method==HTTP_POST)?"POST":"";
yueee_yt 14:477c357c1c24 504 snprintf(buf, sizeof(buf), "%s %s HTTP/1.1\r\nHost: %s\r\n", meth, path, host); //Write request
yueee_yt 14:477c357c1c24 505 ret = send(buf);
yueee_yt 14:477c357c1c24 506 if(ret)
yueee_yt 14:477c357c1c24 507 {
yueee_yt 14:477c357c1c24 508 m_sock.close();
yueee_yt 14:477c357c1c24 509 ERR("Could not write request");
yueee_yt 14:477c357c1c24 510 return HTTP_CONN;
yueee_yt 14:477c357c1c24 511 }
yueee_yt 14:477c357c1c24 512
yueee_yt 14:477c357c1c24 513 //Send all headers
yueee_yt 14:477c357c1c24 514
yueee_yt 14:477c357c1c24 515 //Send default headers
yueee_yt 14:477c357c1c24 516 DBG("Sending headers");
yueee_yt 14:477c357c1c24 517 if( (method == HTTP_POST) && (pDataOut != NULL) )
yueee_yt 14:477c357c1c24 518 {
yueee_yt 14:477c357c1c24 519 if( pDataOut->getIsChunked() )
yueee_yt 14:477c357c1c24 520 {
yueee_yt 14:477c357c1c24 521 ret = send("Transfer-Encoding: chunked\r\n");
yueee_yt 14:477c357c1c24 522 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 523 }
yueee_yt 14:477c357c1c24 524 else
yueee_yt 14:477c357c1c24 525 {
yueee_yt 14:477c357c1c24 526 snprintf(buf, sizeof(buf), "Content-Length: %d\r\n", pDataOut->getDataLen());
yueee_yt 14:477c357c1c24 527 ret = send(buf);
yueee_yt 14:477c357c1c24 528 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 529 }
yueee_yt 16:e8866f68cb4a 530 //char type[48];
yueee_yt 16:e8866f68cb4a 531 //if( pDataOut->getDataType(type, 48) == HTTP_OK )
yueee_yt 16:e8866f68cb4a 532 //{
yueee_yt 14:477c357c1c24 533 snprintf(buf, sizeof(buf), "Content-Type: text/xml;charset=UTF-8\r\n");
yueee_yt 14:477c357c1c24 534 ret = send(buf);
yueee_yt 14:477c357c1c24 535 CHECK_CONN_ERR(ret);
yueee_yt 16:e8866f68cb4a 536 snprintf(buf, sizeof(buf), "SOAPAction: \"%s\"\r\n", SOAPAction);
yueee_yt 14:477c357c1c24 537 ret = send(buf);
yueee_yt 14:477c357c1c24 538 CHECK_CONN_ERR(ret);
yueee_yt 16:e8866f68cb4a 539 //}
yueee_yt 14:477c357c1c24 540 }
yueee_yt 14:477c357c1c24 541
yueee_yt 14:477c357c1c24 542 //Close headers
yueee_yt 14:477c357c1c24 543 DBG("Headers sent");
yueee_yt 14:477c357c1c24 544 ret = send("\r\n");
yueee_yt 14:477c357c1c24 545 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 546
yueee_yt 14:477c357c1c24 547 size_t trfLen;
yueee_yt 14:477c357c1c24 548
yueee_yt 14:477c357c1c24 549 //Send data (if POST)
yueee_yt 14:477c357c1c24 550 if( (method == HTTP_POST) && (pDataOut != NULL) )
yueee_yt 14:477c357c1c24 551 {
yueee_yt 14:477c357c1c24 552 DBG("Sending data");
yueee_yt 14:477c357c1c24 553 while(true)
yueee_yt 14:477c357c1c24 554 {
yueee_yt 14:477c357c1c24 555 size_t writtenLen = 0;
yueee_yt 14:477c357c1c24 556 pDataOut->read(buf, CHUNK_SIZE, &trfLen);
yueee_yt 14:477c357c1c24 557 if( pDataOut->getIsChunked() )
yueee_yt 14:477c357c1c24 558 {
yueee_yt 14:477c357c1c24 559 //Write chunk header
yueee_yt 14:477c357c1c24 560 char chunkHeader[16];
yueee_yt 14:477c357c1c24 561 snprintf(chunkHeader, sizeof(chunkHeader), "%X\r\n", trfLen); //In hex encoding
yueee_yt 14:477c357c1c24 562 ret = send(chunkHeader);
yueee_yt 14:477c357c1c24 563 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 564 }
yueee_yt 14:477c357c1c24 565 else if( trfLen == 0 )
yueee_yt 14:477c357c1c24 566 {
yueee_yt 14:477c357c1c24 567 break;
yueee_yt 14:477c357c1c24 568 }
yueee_yt 14:477c357c1c24 569 if( trfLen != 0 )
yueee_yt 14:477c357c1c24 570 {
yueee_yt 14:477c357c1c24 571 ret = send(buf, trfLen);
yueee_yt 14:477c357c1c24 572 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 573 }
yueee_yt 14:477c357c1c24 574
yueee_yt 14:477c357c1c24 575 if( pDataOut->getIsChunked() )
yueee_yt 14:477c357c1c24 576 {
yueee_yt 14:477c357c1c24 577 ret = send("\r\n"); //Chunk-terminating CRLF
yueee_yt 14:477c357c1c24 578 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 579 }
yueee_yt 14:477c357c1c24 580 else
yueee_yt 14:477c357c1c24 581 {
yueee_yt 14:477c357c1c24 582 writtenLen += trfLen;
yueee_yt 14:477c357c1c24 583 if( writtenLen >= pDataOut->getDataLen() )
yueee_yt 14:477c357c1c24 584 {
yueee_yt 14:477c357c1c24 585 break;
yueee_yt 14:477c357c1c24 586 }
yueee_yt 14:477c357c1c24 587 }
yueee_yt 14:477c357c1c24 588
yueee_yt 14:477c357c1c24 589 if( trfLen == 0 )
yueee_yt 14:477c357c1c24 590 {
yueee_yt 14:477c357c1c24 591 break;
yueee_yt 14:477c357c1c24 592 }
yueee_yt 14:477c357c1c24 593 }
yueee_yt 14:477c357c1c24 594
yueee_yt 14:477c357c1c24 595 }
yueee_yt 14:477c357c1c24 596
yueee_yt 14:477c357c1c24 597 //Receive response
yueee_yt 14:477c357c1c24 598 DBG("Receiving response");
yueee_yt 14:477c357c1c24 599 ret = recv(buf, CHUNK_SIZE - 1, CHUNK_SIZE - 1, &trfLen); //Read n bytes
yueee_yt 14:477c357c1c24 600 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 601
yueee_yt 14:477c357c1c24 602 buf[trfLen] = '\0';
yueee_yt 14:477c357c1c24 603
yueee_yt 14:477c357c1c24 604 char* crlfPtr = strstr(buf, "\r\n");
yueee_yt 14:477c357c1c24 605 if(crlfPtr == NULL)
yueee_yt 14:477c357c1c24 606 {
yueee_yt 14:477c357c1c24 607 PRTCL_ERR();
yueee_yt 14:477c357c1c24 608 }
yueee_yt 14:477c357c1c24 609
yueee_yt 14:477c357c1c24 610 int crlfPos = crlfPtr - buf;
yueee_yt 14:477c357c1c24 611 buf[crlfPos] = '\0';
yueee_yt 14:477c357c1c24 612
yueee_yt 14:477c357c1c24 613 //Parse HTTP response
yueee_yt 14:477c357c1c24 614 if( sscanf(buf, "HTTP/%*d.%*d %d %*[^\r\n]", &m_httpResponseCode) != 1 )
yueee_yt 14:477c357c1c24 615 {
yueee_yt 14:477c357c1c24 616 //Cannot match string, error
yueee_yt 14:477c357c1c24 617 ERR("Not a correct HTTP answer : %s\n", buf);
yueee_yt 14:477c357c1c24 618 PRTCL_ERR();
yueee_yt 14:477c357c1c24 619 }
yueee_yt 14:477c357c1c24 620
yueee_yt 14:477c357c1c24 621 if(m_httpResponseCode != 200)
yueee_yt 14:477c357c1c24 622 {
yueee_yt 14:477c357c1c24 623 //Cannot match string, error
yueee_yt 14:477c357c1c24 624 WARN("Response code %d", m_httpResponseCode);
yueee_yt 14:477c357c1c24 625 PRTCL_ERR();
yueee_yt 14:477c357c1c24 626 }
yueee_yt 14:477c357c1c24 627
yueee_yt 14:477c357c1c24 628 DBG("Reading headers");
yueee_yt 14:477c357c1c24 629
yueee_yt 14:477c357c1c24 630 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
yueee_yt 14:477c357c1c24 631 trfLen -= (crlfPos + 2);
yueee_yt 14:477c357c1c24 632
yueee_yt 14:477c357c1c24 633 size_t recvContentLength = 0;
yueee_yt 14:477c357c1c24 634 bool recvChunked = false;
yueee_yt 14:477c357c1c24 635 //Now get headers
yueee_yt 14:477c357c1c24 636 while( true )
yueee_yt 14:477c357c1c24 637 {
yueee_yt 14:477c357c1c24 638 crlfPtr = strstr(buf, "\r\n");
yueee_yt 14:477c357c1c24 639 if(crlfPtr == NULL)
yueee_yt 14:477c357c1c24 640 {
yueee_yt 14:477c357c1c24 641 if( trfLen < CHUNK_SIZE - 1 )
yueee_yt 14:477c357c1c24 642 {
yueee_yt 14:477c357c1c24 643 size_t newTrfLen;
yueee_yt 14:477c357c1c24 644 ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen);
yueee_yt 14:477c357c1c24 645 trfLen += newTrfLen;
yueee_yt 14:477c357c1c24 646 buf[trfLen] = '\0';
yueee_yt 14:477c357c1c24 647 DBG("Read %d chars; In buf: [%s]", newTrfLen, buf);
yueee_yt 14:477c357c1c24 648 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 649 continue;
yueee_yt 14:477c357c1c24 650 }
yueee_yt 14:477c357c1c24 651 else
yueee_yt 14:477c357c1c24 652 {
yueee_yt 14:477c357c1c24 653 PRTCL_ERR();
yueee_yt 14:477c357c1c24 654 }
yueee_yt 14:477c357c1c24 655 }
yueee_yt 14:477c357c1c24 656
yueee_yt 14:477c357c1c24 657 crlfPos = crlfPtr - buf;
yueee_yt 14:477c357c1c24 658
yueee_yt 14:477c357c1c24 659 if(crlfPos == 0) //End of headers
yueee_yt 14:477c357c1c24 660 {
yueee_yt 14:477c357c1c24 661 DBG("Headers read");
yueee_yt 14:477c357c1c24 662 memmove(buf, &buf[2], trfLen - 2 + 1); //Be sure to move NULL-terminating char as well
yueee_yt 14:477c357c1c24 663 trfLen -= 2;
yueee_yt 14:477c357c1c24 664 break;
yueee_yt 14:477c357c1c24 665 }
yueee_yt 14:477c357c1c24 666
yueee_yt 14:477c357c1c24 667 buf[crlfPos] = '\0';
yueee_yt 14:477c357c1c24 668
yueee_yt 14:477c357c1c24 669 char key[32];
yueee_yt 14:477c357c1c24 670 char value[32];
yueee_yt 14:477c357c1c24 671
yueee_yt 14:477c357c1c24 672 key[31] = '\0';
yueee_yt 14:477c357c1c24 673 value[31] = '\0';
yueee_yt 14:477c357c1c24 674
yueee_yt 14:477c357c1c24 675 int n = sscanf(buf, "%31[^:]: %31[^\r\n]", key, value);
yueee_yt 14:477c357c1c24 676 if ( n == 2 )
yueee_yt 14:477c357c1c24 677 {
yueee_yt 14:477c357c1c24 678 DBG("Read header : %s: %s\n", key, value);
yueee_yt 14:477c357c1c24 679 if( !strcmp(key, "Content-Length") )
yueee_yt 14:477c357c1c24 680 {
yueee_yt 14:477c357c1c24 681 sscanf(value, "%d", &recvContentLength);
yueee_yt 14:477c357c1c24 682 pDataIn->setDataLen(recvContentLength);
yueee_yt 14:477c357c1c24 683 }
yueee_yt 14:477c357c1c24 684 else if( !strcmp(key, "Transfer-Encoding") )
yueee_yt 14:477c357c1c24 685 {
yueee_yt 14:477c357c1c24 686 if( !strcmp(value, "Chunked") || !strcmp(value, "chunked") )
yueee_yt 14:477c357c1c24 687 {
yueee_yt 14:477c357c1c24 688 recvChunked = true;
yueee_yt 14:477c357c1c24 689 pDataIn->setIsChunked(true);
yueee_yt 14:477c357c1c24 690 }
yueee_yt 14:477c357c1c24 691 }
yueee_yt 14:477c357c1c24 692 else if( !strcmp(key, "Content-Type") )
yueee_yt 14:477c357c1c24 693 {
yueee_yt 14:477c357c1c24 694 pDataIn->setDataType(value);
yueee_yt 14:477c357c1c24 695 }
yueee_yt 14:477c357c1c24 696
yueee_yt 14:477c357c1c24 697 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well
yueee_yt 14:477c357c1c24 698 trfLen -= (crlfPos + 2);
yueee_yt 14:477c357c1c24 699
yueee_yt 14:477c357c1c24 700 }
yueee_yt 14:477c357c1c24 701 else
yueee_yt 14:477c357c1c24 702 {
yueee_yt 14:477c357c1c24 703 ERR("Could not parse header");
yueee_yt 14:477c357c1c24 704 PRTCL_ERR();
yueee_yt 14:477c357c1c24 705 }
yueee_yt 14:477c357c1c24 706
yueee_yt 14:477c357c1c24 707 }
yueee_yt 14:477c357c1c24 708
yueee_yt 14:477c357c1c24 709 //Receive data
yueee_yt 14:477c357c1c24 710 DBG("Receiving data");
yueee_yt 14:477c357c1c24 711 while(true)
yueee_yt 14:477c357c1c24 712 {
yueee_yt 14:477c357c1c24 713 size_t readLen = 0;
yueee_yt 14:477c357c1c24 714
yueee_yt 14:477c357c1c24 715 if( recvChunked )
yueee_yt 14:477c357c1c24 716 {
yueee_yt 14:477c357c1c24 717 //Read chunk header
yueee_yt 14:477c357c1c24 718 crlfPos=0;
yueee_yt 14:477c357c1c24 719 for(crlfPos++; crlfPos < trfLen - 2; crlfPos++)
yueee_yt 14:477c357c1c24 720 {
yueee_yt 14:477c357c1c24 721 if( buf[crlfPos] == '\r' && buf[crlfPos + 1] == '\n' )
yueee_yt 14:477c357c1c24 722 {
yueee_yt 14:477c357c1c24 723 break;
yueee_yt 14:477c357c1c24 724 }
yueee_yt 14:477c357c1c24 725 }
yueee_yt 14:477c357c1c24 726 if(crlfPos >= trfLen - 2) //Try to read more
yueee_yt 14:477c357c1c24 727 {
yueee_yt 14:477c357c1c24 728 if( trfLen < CHUNK_SIZE )
yueee_yt 14:477c357c1c24 729 {
yueee_yt 14:477c357c1c24 730 size_t newTrfLen;
yueee_yt 14:477c357c1c24 731 ret = recv(buf + trfLen, 0, CHUNK_SIZE - trfLen - 1, &newTrfLen);
yueee_yt 14:477c357c1c24 732 trfLen += newTrfLen;
yueee_yt 14:477c357c1c24 733 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 734 continue;
yueee_yt 14:477c357c1c24 735 }
yueee_yt 14:477c357c1c24 736 else
yueee_yt 14:477c357c1c24 737 {
yueee_yt 14:477c357c1c24 738 PRTCL_ERR();
yueee_yt 14:477c357c1c24 739 }
yueee_yt 14:477c357c1c24 740 }
yueee_yt 14:477c357c1c24 741 buf[crlfPos] = '\0';
yueee_yt 14:477c357c1c24 742 int n = sscanf(buf, "%x", &readLen);
yueee_yt 14:477c357c1c24 743 if(n!=1)
yueee_yt 14:477c357c1c24 744 {
yueee_yt 14:477c357c1c24 745 ERR("Could not read chunk length");
yueee_yt 14:477c357c1c24 746 PRTCL_ERR();
yueee_yt 14:477c357c1c24 747 }
yueee_yt 14:477c357c1c24 748
yueee_yt 14:477c357c1c24 749 memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2)); //Not need to move NULL-terminating char any more
yueee_yt 14:477c357c1c24 750 trfLen -= (crlfPos + 2);
yueee_yt 14:477c357c1c24 751
yueee_yt 14:477c357c1c24 752 if( readLen == 0 )
yueee_yt 14:477c357c1c24 753 {
yueee_yt 14:477c357c1c24 754 //Last chunk
yueee_yt 14:477c357c1c24 755 break;
yueee_yt 14:477c357c1c24 756 }
yueee_yt 14:477c357c1c24 757 }
yueee_yt 14:477c357c1c24 758 else
yueee_yt 14:477c357c1c24 759 {
yueee_yt 14:477c357c1c24 760 readLen = recvContentLength;
yueee_yt 14:477c357c1c24 761 }
yueee_yt 14:477c357c1c24 762
yueee_yt 14:477c357c1c24 763 DBG("Retrieving %d bytes", readLen);
yueee_yt 14:477c357c1c24 764
yueee_yt 14:477c357c1c24 765 do
yueee_yt 14:477c357c1c24 766 {
yueee_yt 14:477c357c1c24 767 pDataIn->write(buf, MIN(trfLen, readLen));
yueee_yt 14:477c357c1c24 768 if( trfLen > readLen )
yueee_yt 14:477c357c1c24 769 {
yueee_yt 14:477c357c1c24 770 memmove(buf, &buf[readLen], trfLen - readLen);
yueee_yt 14:477c357c1c24 771 trfLen -= readLen;
yueee_yt 14:477c357c1c24 772 readLen = 0;
yueee_yt 14:477c357c1c24 773 }
yueee_yt 14:477c357c1c24 774 else
yueee_yt 14:477c357c1c24 775 {
yueee_yt 14:477c357c1c24 776 readLen -= trfLen;
yueee_yt 14:477c357c1c24 777 }
yueee_yt 14:477c357c1c24 778
yueee_yt 14:477c357c1c24 779 if(readLen)
yueee_yt 14:477c357c1c24 780 {
yueee_yt 14:477c357c1c24 781 ret = recv(buf, 1, CHUNK_SIZE - trfLen - 1, &trfLen);
yueee_yt 14:477c357c1c24 782 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 783 }
yueee_yt 14:477c357c1c24 784 } while(readLen);
yueee_yt 14:477c357c1c24 785
yueee_yt 14:477c357c1c24 786 if( recvChunked )
yueee_yt 14:477c357c1c24 787 {
yueee_yt 14:477c357c1c24 788 if(trfLen < 2)
yueee_yt 14:477c357c1c24 789 {
yueee_yt 14:477c357c1c24 790 size_t newTrfLen;
yueee_yt 14:477c357c1c24 791 //Read missing chars to find end of chunk
yueee_yt 14:477c357c1c24 792 ret = recv(buf, 2 - trfLen, CHUNK_SIZE, &newTrfLen);
yueee_yt 14:477c357c1c24 793 CHECK_CONN_ERR(ret);
yueee_yt 14:477c357c1c24 794 trfLen += newTrfLen;
yueee_yt 14:477c357c1c24 795 }
yueee_yt 14:477c357c1c24 796 if( (buf[0] != '\r') || (buf[1] != '\n') )
yueee_yt 14:477c357c1c24 797 {
yueee_yt 14:477c357c1c24 798 ERR("Format error");
yueee_yt 14:477c357c1c24 799 PRTCL_ERR();
yueee_yt 14:477c357c1c24 800 }
yueee_yt 14:477c357c1c24 801 memmove(buf, &buf[2], trfLen - 2);
yueee_yt 14:477c357c1c24 802 trfLen -= 2;
yueee_yt 14:477c357c1c24 803 }
yueee_yt 14:477c357c1c24 804 else
yueee_yt 14:477c357c1c24 805 {
yueee_yt 14:477c357c1c24 806 break;
yueee_yt 14:477c357c1c24 807 }
yueee_yt 14:477c357c1c24 808
yueee_yt 14:477c357c1c24 809 }
yueee_yt 14:477c357c1c24 810
yueee_yt 14:477c357c1c24 811 m_sock.close();
yueee_yt 14:477c357c1c24 812 DBG("Completed HTTP transaction");
yueee_yt 14:477c357c1c24 813
yueee_yt 14:477c357c1c24 814 return HTTP_OK;
yueee_yt 14:477c357c1c24 815 }
yueee_yt 14:477c357c1c24 816
yueee_yt 14:477c357c1c24 817
donatien 11:390362de8c3f 818 HTTPResult HTTPClient::recv(char* buf, size_t minLen, size_t maxLen, size_t* pReadLen) //0 on success, err code on failure
donatien 0:2ccb9960a044 819 {
donatien 0:2ccb9960a044 820 DBG("Trying to read between %d and %d bytes", minLen, maxLen);
donatien 0:2ccb9960a044 821 size_t readLen = 0;
donatien 12:89d09a6db00a 822
donatien 12:89d09a6db00a 823 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 824 {
donatien 12:89d09a6db00a 825 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 826 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 827 }
donatien 12:89d09a6db00a 828
donatien 7:4e39864f7b15 829 int ret;
donatien 7:4e39864f7b15 830 while(readLen < maxLen)
donatien 0:2ccb9960a044 831 {
donatien 7:4e39864f7b15 832 if(readLen < minLen)
donatien 0:2ccb9960a044 833 {
donatien 12:89d09a6db00a 834 DBG("Trying to read at most %d bytes [Blocking]", minLen - readLen);
donatien 13:be61104f4e91 835 m_sock.set_blocking(false, m_timeout);
donatien 12:89d09a6db00a 836 ret = m_sock.receive_all(buf + readLen, minLen - readLen);
donatien 0:2ccb9960a044 837 }
donatien 7:4e39864f7b15 838 else
donatien 7:4e39864f7b15 839 {
donatien 12:89d09a6db00a 840 DBG("Trying to read at most %d bytes [Not blocking]", maxLen - readLen);
donatien 13:be61104f4e91 841 m_sock.set_blocking(false, 0);
donatien 12:89d09a6db00a 842 ret = m_sock.receive(buf + readLen, maxLen - readLen);
donatien 7:4e39864f7b15 843 }
donatien 7:4e39864f7b15 844
donatien 0:2ccb9960a044 845 if( ret > 0)
donatien 0:2ccb9960a044 846 {
donatien 0:2ccb9960a044 847 readLen += ret;
donatien 0:2ccb9960a044 848 }
donatien 0:2ccb9960a044 849 else if( ret == 0 )
donatien 0:2ccb9960a044 850 {
donatien 7:4e39864f7b15 851 break;
donatien 7:4e39864f7b15 852 }
donatien 7:4e39864f7b15 853 else
donatien 7:4e39864f7b15 854 {
donatien 12:89d09a6db00a 855 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 856 {
donatien 12:89d09a6db00a 857 ERR("Connection error (recv returned %d)", ret);
donatien 12:89d09a6db00a 858 *pReadLen = readLen;
donatien 12:89d09a6db00a 859 return HTTP_CONN;
donatien 12:89d09a6db00a 860 }
donatien 12:89d09a6db00a 861 else
donatien 12:89d09a6db00a 862 {
donatien 12:89d09a6db00a 863 break;
donatien 12:89d09a6db00a 864 }
donatien 12:89d09a6db00a 865 }
donatien 12:89d09a6db00a 866
donatien 12:89d09a6db00a 867 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 868 {
donatien 12:89d09a6db00a 869 break;
donatien 7:4e39864f7b15 870 }
donatien 7:4e39864f7b15 871 }
donatien 7:4e39864f7b15 872 DBG("Read %d bytes", readLen);
donatien 7:4e39864f7b15 873 *pReadLen = readLen;
donatien 11:390362de8c3f 874 return HTTP_OK;
donatien 7:4e39864f7b15 875 }
donatien 7:4e39864f7b15 876
donatien 11:390362de8c3f 877 HTTPResult HTTPClient::send(char* buf, size_t len) //0 on success, err code on failure
donatien 7:4e39864f7b15 878 {
donatien 7:4e39864f7b15 879 if(len == 0)
donatien 7:4e39864f7b15 880 {
donatien 7:4e39864f7b15 881 len = strlen(buf);
donatien 7:4e39864f7b15 882 }
donatien 7:4e39864f7b15 883 DBG("Trying to write %d bytes", len);
donatien 7:4e39864f7b15 884 size_t writtenLen = 0;
donatien 12:89d09a6db00a 885
donatien 12:89d09a6db00a 886 if(!m_sock.is_connected())
donatien 12:89d09a6db00a 887 {
donatien 12:89d09a6db00a 888 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 889 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 890 }
donatien 7:4e39864f7b15 891
donatien 13:be61104f4e91 892 m_sock.set_blocking(false, m_timeout);
donatien 12:89d09a6db00a 893 int ret = m_sock.send_all(buf, len);
donatien 12:89d09a6db00a 894 if(ret > 0)
donatien 7:4e39864f7b15 895 {
donatien 12:89d09a6db00a 896 writtenLen += ret;
donatien 12:89d09a6db00a 897 }
donatien 12:89d09a6db00a 898 else if( ret == 0 )
donatien 12:89d09a6db00a 899 {
donatien 12:89d09a6db00a 900 WARN("Connection was closed by server");
donatien 12:89d09a6db00a 901 return HTTP_CLOSED; //Connection was closed by server
donatien 12:89d09a6db00a 902 }
donatien 12:89d09a6db00a 903 else
donatien 12:89d09a6db00a 904 {
donatien 12:89d09a6db00a 905 ERR("Connection error (send returned %d)", ret);
donatien 12:89d09a6db00a 906 return HTTP_CONN;
donatien 12:89d09a6db00a 907 }
donatien 7:4e39864f7b15 908
donatien 0:2ccb9960a044 909 DBG("Written %d bytes", writtenLen);
donatien 11:390362de8c3f 910 return HTTP_OK;
donatien 0:2ccb9960a044 911 }
donatien 0:2ccb9960a044 912
donatien 11:390362de8c3f 913 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 914 {
donatien 0:2ccb9960a044 915 char* schemePtr = (char*) url;
donatien 0:2ccb9960a044 916 char* hostPtr = (char*) strstr(url, "://");
donatien 0:2ccb9960a044 917 if(hostPtr == NULL)
donatien 0:2ccb9960a044 918 {
donatien 0:2ccb9960a044 919 WARN("Could not find host");
donatien 11:390362de8c3f 920 return HTTP_PARSE; //URL is invalid
donatien 0:2ccb9960a044 921 }
donatien 0:2ccb9960a044 922
donatien 0:2ccb9960a044 923 if( maxSchemeLen < hostPtr - schemePtr + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 924 {
donatien 0:2ccb9960a044 925 WARN("Scheme str is too small (%d >= %d)", maxSchemeLen, hostPtr - schemePtr + 1);
donatien 11:390362de8c3f 926 return HTTP_PARSE;
donatien 0:2ccb9960a044 927 }
donatien 0:2ccb9960a044 928 memcpy(scheme, schemePtr, hostPtr - schemePtr);
donatien 0:2ccb9960a044 929 scheme[hostPtr - schemePtr] = '\0';
donatien 0:2ccb9960a044 930
donatien 0:2ccb9960a044 931 hostPtr+=3;
donatien 0:2ccb9960a044 932
donatien 0:2ccb9960a044 933 size_t hostLen = 0;
donatien 0:2ccb9960a044 934
donatien 0:2ccb9960a044 935 char* portPtr = strchr(hostPtr, ':');
donatien 0:2ccb9960a044 936 if( portPtr != NULL )
donatien 0:2ccb9960a044 937 {
donatien 0:2ccb9960a044 938 hostLen = portPtr - hostPtr;
donatien 0:2ccb9960a044 939 portPtr++;
donatien 8:45c8da29a1cf 940 if( sscanf(portPtr, "%hu", port) != 1)
donatien 0:2ccb9960a044 941 {
donatien 0:2ccb9960a044 942 WARN("Could not find port");
donatien 11:390362de8c3f 943 return HTTP_PARSE;
donatien 0:2ccb9960a044 944 }
donatien 0:2ccb9960a044 945 }
donatien 0:2ccb9960a044 946 else
donatien 0:2ccb9960a044 947 {
donatien 0:2ccb9960a044 948 *port=0;
donatien 0:2ccb9960a044 949 }
donatien 0:2ccb9960a044 950 char* pathPtr = strchr(hostPtr, '/');
donatien 0:2ccb9960a044 951 if( hostLen == 0 )
donatien 0:2ccb9960a044 952 {
donatien 0:2ccb9960a044 953 hostLen = pathPtr - hostPtr;
donatien 0:2ccb9960a044 954 }
donatien 0:2ccb9960a044 955
donatien 0:2ccb9960a044 956 if( maxHostLen < hostLen + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 957 {
donatien 0:2ccb9960a044 958 WARN("Host str is too small (%d >= %d)", maxHostLen, hostLen + 1);
donatien 11:390362de8c3f 959 return HTTP_PARSE;
donatien 0:2ccb9960a044 960 }
donatien 0:2ccb9960a044 961 memcpy(host, hostPtr, hostLen);
donatien 0:2ccb9960a044 962 host[hostLen] = '\0';
donatien 0:2ccb9960a044 963
donatien 0:2ccb9960a044 964 size_t pathLen;
donatien 0:2ccb9960a044 965 char* fragmentPtr = strchr(hostPtr, '#');
donatien 0:2ccb9960a044 966 if(fragmentPtr != NULL)
donatien 0:2ccb9960a044 967 {
donatien 0:2ccb9960a044 968 pathLen = fragmentPtr - pathPtr;
donatien 0:2ccb9960a044 969 }
donatien 0:2ccb9960a044 970 else
donatien 0:2ccb9960a044 971 {
donatien 0:2ccb9960a044 972 pathLen = strlen(pathPtr);
donatien 0:2ccb9960a044 973 }
donatien 0:2ccb9960a044 974
donatien 0:2ccb9960a044 975 if( maxPathLen < pathLen + 1 ) //including NULL-terminating char
donatien 0:2ccb9960a044 976 {
donatien 0:2ccb9960a044 977 WARN("Path str is too small (%d >= %d)", maxPathLen, pathLen + 1);
donatien 11:390362de8c3f 978 return HTTP_PARSE;
donatien 0:2ccb9960a044 979 }
donatien 0:2ccb9960a044 980 memcpy(path, pathPtr, pathLen);
donatien 0:2ccb9960a044 981 path[pathLen] = '\0';
donatien 0:2ccb9960a044 982
donatien 11:390362de8c3f 983 return HTTP_OK;
donatien 0:2ccb9960a044 984 }