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