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