Httpclient changes
Dependents: Final_ver2 Final_test
Fork of HTTPClient by
HTTPClient.cpp@22:9e246a41abe8, 2015-04-27 (annotated)
- Committer:
- jderiso2
- Date:
- Mon Apr 27 17:38:13 2015 +0000
- Revision:
- 22:9e246a41abe8
- Parent:
- 21:f042d41ddf10
updates;
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 | 22:9e246a41abe8 | 24 | //#define DBG(x, ...) std::printf("[HTTPClient : DBG]"x"\r\n", ##__VA_ARGS__); |
jderiso2 | 21:f042d41ddf10 | 25 | #define DBG(X, ...) |
jderiso2 | 22:9e246a41abe8 | 26 | #define WARN(x, ...) std::printf("[HTTPClient : WARN]"x"\r\n", ##__VA_ARGS__); |
jderiso2 | 22:9e246a41abe8 | 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 |
jderiso2 | 22:9e246a41abe8 | 31 | #define DBG(x, ...) |
donatien | 12:89d09a6db00a | 32 | #define WARN(x, ...) |
jderiso2 | 22:9e246a41abe8 | 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() : |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 65 | m_basicAuthUser = user; |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 77 | HTTPText string_result(result, maxResultLen); |
jderiso2 | 22:9e246a41abe8 | 78 | return get(url, &string_result, 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 | { |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 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 | { |
jderiso2 | 22:9e246a41abe8 | 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 |
jderiso2 | 22:9e246a41abe8 | 119 | { |
jderiso2 | 22:9e246a41abe8 | 120 | m_httpResponseCode = 0; //Invalidate code |
jderiso2 | 22:9e246a41abe8 | 121 | m_timeout = timeout; |
jderiso2 | 22:9e246a41abe8 | 122 | |
jderiso2 | 22:9e246a41abe8 | 123 | pDataIn->writeReset(); |
jderiso2 | 22:9e246a41abe8 | 124 | if( pDataOut ) { |
jderiso2 | 22:9e246a41abe8 | 125 | pDataOut->readReset(); |
jderiso2 | 22:9e246a41abe8 | 126 | } |
donatien | 0:2ccb9960a044 | 127 | |
jderiso2 | 22:9e246a41abe8 | 128 | /* char scheme[8]; |
jderiso2 | 22:9e246a41abe8 | 129 | uint16_t port; |
jderiso2 | 22:9e246a41abe8 | 130 | char host[32]; |
jderiso2 | 22:9e246a41abe8 | 131 | char path[64];*/ |
jderiso2 | 22:9e246a41abe8 | 132 | char scheme[16]; |
jderiso2 | 22:9e246a41abe8 | 133 | uint16_t port; |
jderiso2 | 22:9e246a41abe8 | 134 | char host[64]; |
jderiso2 | 22:9e246a41abe8 | 135 | char path[128]; |
jderiso2 | 22:9e246a41abe8 | 136 | //First we need to parse the url (http[s]://host[:port][/[path]]) -- HTTPS not supported (yet?) |
jderiso2 | 22:9e246a41abe8 | 137 | HTTPResult res = parseURL(url, scheme, sizeof(scheme), host, sizeof(host), &port, path, sizeof(path)); |
jderiso2 | 22:9e246a41abe8 | 138 | if(res != HTTP_OK) { |
jderiso2 | 22:9e246a41abe8 | 139 | ERR("parseURL returned %d", res); |
jderiso2 | 22:9e246a41abe8 | 140 | return res; |
jderiso2 | 22:9e246a41abe8 | 141 | } |
donatien | 0:2ccb9960a044 | 142 | |
jderiso2 | 22:9e246a41abe8 | 143 | if(port == 0) { //TODO do handle HTTPS->443 |
jderiso2 | 22:9e246a41abe8 | 144 | port = 80; |
jderiso2 | 22:9e246a41abe8 | 145 | } |
donatien | 0:2ccb9960a044 | 146 | |
jderiso2 | 22:9e246a41abe8 | 147 | DBG("Scheme: %s", scheme); |
jderiso2 | 22:9e246a41abe8 | 148 | DBG("Host: %s", host); |
jderiso2 | 22:9e246a41abe8 | 149 | DBG("Port: %d", port); |
jderiso2 | 22:9e246a41abe8 | 150 | DBG("Path: %s", path); |
donatien | 0:2ccb9960a044 | 151 | |
jderiso2 | 22:9e246a41abe8 | 152 | //Connect |
jderiso2 | 22:9e246a41abe8 | 153 | DBG("Connecting socket to server"); |
jderiso2 | 22:9e246a41abe8 | 154 | int ret = m_sock.connect(host, port); |
jderiso2 | 22:9e246a41abe8 | 155 | if (ret < 0) { |
jderiso2 | 22:9e246a41abe8 | 156 | m_sock.close(); |
jderiso2 | 22:9e246a41abe8 | 157 | ERR("Could not connect"); |
jderiso2 | 22:9e246a41abe8 | 158 | return HTTP_CONN; |
jderiso2 | 22:9e246a41abe8 | 159 | } |
donatien | 0:2ccb9960a044 | 160 | |
jderiso2 | 22:9e246a41abe8 | 161 | //Send request |
jderiso2 | 22:9e246a41abe8 | 162 | DBG("Sending request"); |
jderiso2 | 22:9e246a41abe8 | 163 | char buf[CHUNK_SIZE]; |
jderiso2 | 22:9e246a41abe8 | 164 | const char* meth = (method==HTTP_GET)?"GET":(method==HTTP_POST)?"POST":(method==HTTP_PUT)?"PUT":(method==HTTP_DELETE)?"DELETE":""; |
jderiso2 | 22:9e246a41abe8 | 165 | snprintf(buf, sizeof(buf), "%s %s HTTP/1.1\r\nHost: %s:%d\r\n", meth, path, host ,port); //Write request |
jderiso2 | 22:9e246a41abe8 | 166 | DBG("Request line: buf."); |
jderiso2 | 22:9e246a41abe8 | 167 | ret = send(buf); |
jderiso2 | 22:9e246a41abe8 | 168 | if(ret) { |
jderiso2 | 22:9e246a41abe8 | 169 | m_sock.close(); |
jderiso2 | 22:9e246a41abe8 | 170 | ERR("Could not write request"); |
jderiso2 | 22:9e246a41abe8 | 171 | return HTTP_CONN; |
donatien | 0:2ccb9960a044 | 172 | } |
jderiso2 | 22:9e246a41abe8 | 173 | |
jderiso2 | 22:9e246a41abe8 | 174 | //Send all headers |
jderiso2 | 22:9e246a41abe8 | 175 | |
jderiso2 | 22:9e246a41abe8 | 176 | //Send default headers |
jderiso2 | 22:9e246a41abe8 | 177 | DBG("Sending headers"); |
jderiso2 | 22:9e246a41abe8 | 178 | if( pDataOut != NULL ) { |
jderiso2 | 22:9e246a41abe8 | 179 | if( pDataOut->getIsChunked() ) { |
jderiso2 | 22:9e246a41abe8 | 180 | ret = send("Transfer-Encoding: chunked\r\n"); |
jderiso2 | 22:9e246a41abe8 | 181 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 182 | } else { |
jderiso2 | 22:9e246a41abe8 | 183 | snprintf(buf, sizeof(buf), "Content-Length: %d\r\n", pDataOut->getDataLen()); |
jderiso2 | 22:9e246a41abe8 | 184 | ret = send(buf); |
jderiso2 | 22:9e246a41abe8 | 185 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 186 | } |
jderiso2 | 22:9e246a41abe8 | 187 | char type[48]; |
jderiso2 | 22:9e246a41abe8 | 188 | if( pDataOut->getDataType(type, 48) == HTTP_OK ) { |
jderiso2 | 22:9e246a41abe8 | 189 | snprintf(buf, sizeof(buf), "Content-Type: %s\r\n", type); |
jderiso2 | 22:9e246a41abe8 | 190 | ret = send(buf); |
jderiso2 | 22:9e246a41abe8 | 191 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 192 | } |
jderiso2 | 22:9e246a41abe8 | 193 | |
jderiso2 | 22:9e246a41abe8 | 194 | //Send specific headers |
jderiso2 | 22:9e246a41abe8 | 195 | while( pDataOut->getHeader(buf, sizeof(buf) - 3) ) { //must have space left for CRLF + 0 terminating char |
jderiso2 | 22:9e246a41abe8 | 196 | size_t headerlen = strlen(buf); |
jderiso2 | 22:9e246a41abe8 | 197 | snprintf(buf + headerlen, sizeof(buf) - headerlen, "\r\n"); |
jderiso2 | 22:9e246a41abe8 | 198 | ret = send(buf); |
jderiso2 | 22:9e246a41abe8 | 199 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 200 | } |
donatien | 17:679e15a3d3db | 201 | } |
donatien | 0:2ccb9960a044 | 202 | |
jderiso2 | 22:9e246a41abe8 | 203 | //Send specific headers |
jderiso2 | 22:9e246a41abe8 | 204 | while( pDataIn->getHeader(buf, sizeof(buf) - 3) ) { |
jderiso2 | 22:9e246a41abe8 | 205 | size_t headerlen = strlen(buf); |
jderiso2 | 22:9e246a41abe8 | 206 | snprintf(buf + headerlen, sizeof(buf) - headerlen, "\r\n"); |
jderiso2 | 22:9e246a41abe8 | 207 | ret = send(buf); |
donatien | 5:791fc3dcb6c4 | 208 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 209 | } |
jderiso2 | 22:9e246a41abe8 | 210 | |
jderiso2 | 22:9e246a41abe8 | 211 | //Close headers |
jderiso2 | 22:9e246a41abe8 | 212 | DBG("Headers sent"); |
jderiso2 | 22:9e246a41abe8 | 213 | ret = send("\r\n"); |
jderiso2 | 22:9e246a41abe8 | 214 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 215 | |
jderiso2 | 22:9e246a41abe8 | 216 | size_t trfLen; |
donatien | 0:2ccb9960a044 | 217 | |
jderiso2 | 22:9e246a41abe8 | 218 | //Send data (if available) |
jderiso2 | 22:9e246a41abe8 | 219 | if( pDataOut != NULL ) { |
jderiso2 | 22:9e246a41abe8 | 220 | DBG("Sending data"); |
jderiso2 | 22:9e246a41abe8 | 221 | while(true) { |
jderiso2 | 22:9e246a41abe8 | 222 | size_t writtenLen = 0; |
jderiso2 | 22:9e246a41abe8 | 223 | pDataOut->read(buf, CHUNK_SIZE, &trfLen); |
jderiso2 | 22:9e246a41abe8 | 224 | if( pDataOut->getIsChunked() ) { |
jderiso2 | 22:9e246a41abe8 | 225 | //Write chunk header |
jderiso2 | 22:9e246a41abe8 | 226 | char chunkHeader[16]; |
jderiso2 | 22:9e246a41abe8 | 227 | snprintf(chunkHeader, sizeof(chunkHeader), "%X\r\n", trfLen); //In hex encoding |
jderiso2 | 22:9e246a41abe8 | 228 | ret = send(chunkHeader); |
jderiso2 | 22:9e246a41abe8 | 229 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 230 | } else if( trfLen == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 231 | break; |
jderiso2 | 22:9e246a41abe8 | 232 | } |
jderiso2 | 22:9e246a41abe8 | 233 | if( trfLen != 0 ) { |
jderiso2 | 22:9e246a41abe8 | 234 | ret = send(buf, trfLen); |
jderiso2 | 22:9e246a41abe8 | 235 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 236 | } |
donatien | 0:2ccb9960a044 | 237 | |
jderiso2 | 22:9e246a41abe8 | 238 | if( pDataOut->getIsChunked() ) { |
jderiso2 | 22:9e246a41abe8 | 239 | ret = send("\r\n"); //Chunk-terminating CRLF |
jderiso2 | 22:9e246a41abe8 | 240 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 241 | } else { |
jderiso2 | 22:9e246a41abe8 | 242 | writtenLen += trfLen; |
jderiso2 | 22:9e246a41abe8 | 243 | if( writtenLen >= pDataOut->getDataLen() ) { |
jderiso2 | 22:9e246a41abe8 | 244 | break; |
jderiso2 | 22:9e246a41abe8 | 245 | } |
jderiso2 | 22:9e246a41abe8 | 246 | } |
donatien | 0:2ccb9960a044 | 247 | |
jderiso2 | 22:9e246a41abe8 | 248 | if( trfLen == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 249 | break; |
jderiso2 | 22:9e246a41abe8 | 250 | } |
jderiso2 | 22:9e246a41abe8 | 251 | } |
donatien | 17:679e15a3d3db | 252 | } |
donatien | 0:2ccb9960a044 | 253 | |
jderiso2 | 22:9e246a41abe8 | 254 | //Receive response |
jderiso2 | 22:9e246a41abe8 | 255 | DBG("Receiving response"); |
jderiso2 | 22:9e246a41abe8 | 256 | ret = recv(buf, 1, CHUNK_SIZE - 1, &trfLen); //Read n bytes |
jderiso2 | 22:9e246a41abe8 | 257 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 258 | |
jderiso2 | 22:9e246a41abe8 | 259 | buf[trfLen] = '\0'; |
donatien | 0:2ccb9960a044 | 260 | |
jderiso2 | 22:9e246a41abe8 | 261 | //Make sure we got the first response line |
jderiso2 | 22:9e246a41abe8 | 262 | char* crlfPtr = NULL; |
jderiso2 | 22:9e246a41abe8 | 263 | while( true ) { |
jderiso2 | 22:9e246a41abe8 | 264 | crlfPtr = strstr(buf, "\r\n"); |
jderiso2 | 22:9e246a41abe8 | 265 | if(crlfPtr == NULL) { |
jderiso2 | 22:9e246a41abe8 | 266 | if( trfLen < CHUNK_SIZE - 1 ) { |
jderiso2 | 22:9e246a41abe8 | 267 | size_t newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 268 | ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen); |
jderiso2 | 22:9e246a41abe8 | 269 | trfLen += newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 270 | buf[trfLen] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 271 | DBG("Read %d chars; In buf: [%s]", newTrfLen, buf); |
jderiso2 | 22:9e246a41abe8 | 272 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 273 | continue; |
jderiso2 | 22:9e246a41abe8 | 274 | } else { |
jderiso2 | 22:9e246a41abe8 | 275 | PRTCL_ERR(); |
jderiso2 | 22:9e246a41abe8 | 276 | } |
jderiso2 | 22:9e246a41abe8 | 277 | } |
jderiso2 | 22:9e246a41abe8 | 278 | break; |
jderiso2 | 22:9e246a41abe8 | 279 | } |
donatien | 0:2ccb9960a044 | 280 | |
jderiso2 | 22:9e246a41abe8 | 281 | int crlfPos = crlfPtr - buf; |
jderiso2 | 22:9e246a41abe8 | 282 | buf[crlfPos] = '\0'; |
donatien | 0:2ccb9960a044 | 283 | |
jderiso2 | 22:9e246a41abe8 | 284 | //Parse HTTP response |
jderiso2 | 22:9e246a41abe8 | 285 | //if( sscanf(buf, "HTTP/%*d.%*d %d %*[^\r\n]", &m_httpResponseCode) != 1 ) |
jderiso2 | 22:9e246a41abe8 | 286 | if(crlfPos > 13) { |
jderiso2 | 22:9e246a41abe8 | 287 | buf[13] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 288 | } |
jderiso2 | 22:9e246a41abe8 | 289 | if( sscanf(buf, "HTTP/%*d.%*d %d", &m_httpResponseCode) != 1 ) { //Kludge for newlib nano |
jderiso2 | 22:9e246a41abe8 | 290 | //Cannot match string, error |
jderiso2 | 22:9e246a41abe8 | 291 | ERR("Not a correct HTTP answer : %s\n", buf); |
donatien | 5:791fc3dcb6c4 | 292 | PRTCL_ERR(); |
jderiso2 | 22:9e246a41abe8 | 293 | } |
jderiso2 | 22:9e246a41abe8 | 294 | |
jderiso2 | 22:9e246a41abe8 | 295 | if( (m_httpResponseCode < 200) || (m_httpResponseCode >= 300) ) { |
jderiso2 | 22:9e246a41abe8 | 296 | //Did not return a 2xx code; TODO fetch headers/(&data?) anyway and implement a mean of writing/reading headers |
jderiso2 | 22:9e246a41abe8 | 297 | WARN("Response code %d", m_httpResponseCode); |
jderiso2 | 22:9e246a41abe8 | 298 | PRTCL_ERR(); |
donatien | 0:2ccb9960a044 | 299 | } |
donatien | 0:2ccb9960a044 | 300 | |
jderiso2 | 22:9e246a41abe8 | 301 | DBG("Reading headers"); |
donatien | 0:2ccb9960a044 | 302 | |
jderiso2 | 22:9e246a41abe8 | 303 | memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well |
jderiso2 | 22:9e246a41abe8 | 304 | trfLen -= (crlfPos + 2); |
donatien | 0:2ccb9960a044 | 305 | |
jderiso2 | 22:9e246a41abe8 | 306 | size_t recvContentLength = 0; |
jderiso2 | 22:9e246a41abe8 | 307 | bool recvChunked = false; |
jderiso2 | 22:9e246a41abe8 | 308 | bool recvLengthUnknown = true; |
jderiso2 | 22:9e246a41abe8 | 309 | //Now get headers |
jderiso2 | 22:9e246a41abe8 | 310 | while( true ) { |
jderiso2 | 22:9e246a41abe8 | 311 | crlfPtr = strstr(buf, "\r\n"); |
jderiso2 | 22:9e246a41abe8 | 312 | if(crlfPtr == NULL) { |
jderiso2 | 22:9e246a41abe8 | 313 | if( trfLen < CHUNK_SIZE - 1 ) { |
jderiso2 | 22:9e246a41abe8 | 314 | size_t newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 315 | ret = recv(buf + trfLen, 1, CHUNK_SIZE - trfLen - 1, &newTrfLen); |
jderiso2 | 22:9e246a41abe8 | 316 | trfLen += newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 317 | buf[trfLen] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 318 | DBG("Read %d chars; In buf: [%s]", newTrfLen, buf); |
jderiso2 | 22:9e246a41abe8 | 319 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 320 | continue; |
jderiso2 | 22:9e246a41abe8 | 321 | } else { |
jderiso2 | 22:9e246a41abe8 | 322 | PRTCL_ERR(); |
jderiso2 | 22:9e246a41abe8 | 323 | } |
jderiso2 | 22:9e246a41abe8 | 324 | } |
donatien | 0:2ccb9960a044 | 325 | |
jderiso2 | 22:9e246a41abe8 | 326 | crlfPos = crlfPtr - buf; |
donatien | 17:679e15a3d3db | 327 | |
jderiso2 | 22:9e246a41abe8 | 328 | if(crlfPos == 0) { //End of headers |
jderiso2 | 22:9e246a41abe8 | 329 | DBG("Headers read"); |
jderiso2 | 22:9e246a41abe8 | 330 | memmove(buf, &buf[2], trfLen - 2 + 1); //Be sure to move NULL-terminating char as well |
jderiso2 | 22:9e246a41abe8 | 331 | trfLen -= 2; |
jderiso2 | 22:9e246a41abe8 | 332 | break; |
jderiso2 | 22:9e246a41abe8 | 333 | } |
jderiso2 | 22:9e246a41abe8 | 334 | |
jderiso2 | 22:9e246a41abe8 | 335 | buf[crlfPos] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 336 | |
jderiso2 | 22:9e246a41abe8 | 337 | char key[BUF_SIZE]; |
jderiso2 | 22:9e246a41abe8 | 338 | char value[BUF_SIZE]; |
jderiso2 | 22:9e246a41abe8 | 339 | |
jderiso2 | 22:9e246a41abe8 | 340 | //key[31] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 341 | //value[31] = '\0'; |
donatien | 4:c071b05ac026 | 342 | |
jderiso2 | 22:9e246a41abe8 | 343 | memset(key, 0, BUF_SIZE); |
jderiso2 | 22:9e246a41abe8 | 344 | memset(value, 0, BUF_SIZE); |
jderiso2 | 22:9e246a41abe8 | 345 | |
jderiso2 | 22:9e246a41abe8 | 346 | //int n = sscanf(buf, "%31[^:]: %31[^\r\n]", key, value); |
jderiso2 | 22:9e246a41abe8 | 347 | |
jderiso2 | 22:9e246a41abe8 | 348 | int n = 0; |
jderiso2 | 22:9e246a41abe8 | 349 | |
jderiso2 | 22:9e246a41abe8 | 350 | char* keyEnd = strchr(buf, ':'); |
jderiso2 | 22:9e246a41abe8 | 351 | if(keyEnd != NULL) { |
jderiso2 | 22:9e246a41abe8 | 352 | *keyEnd = '\0'; |
jderiso2 | 22:9e246a41abe8 | 353 | if(strlen(buf) < BUF_SIZE) { |
jderiso2 | 22:9e246a41abe8 | 354 | strcpy(key, buf); |
jderiso2 | 22:9e246a41abe8 | 355 | n++; |
jderiso2 | 22:9e246a41abe8 | 356 | char* valueStart = keyEnd + 2; |
jderiso2 | 22:9e246a41abe8 | 357 | if( (valueStart - buf) < crlfPos ) { |
jderiso2 | 22:9e246a41abe8 | 358 | if(strlen(valueStart) < BUF_SIZE) { |
jderiso2 | 22:9e246a41abe8 | 359 | strcpy(value, valueStart); |
jderiso2 | 22:9e246a41abe8 | 360 | n++; |
jderiso2 | 22:9e246a41abe8 | 361 | } |
jderiso2 | 22:9e246a41abe8 | 362 | } |
jderiso2 | 22:9e246a41abe8 | 363 | } |
donatien | 17:679e15a3d3db | 364 | } |
jderiso2 | 22:9e246a41abe8 | 365 | if ( n == 2 ) { |
jderiso2 | 22:9e246a41abe8 | 366 | DBG("Read header : %s: %s\n", key, value); |
jderiso2 | 22:9e246a41abe8 | 367 | if( !strcmp(key, "Content-Length") ) { |
jderiso2 | 22:9e246a41abe8 | 368 | sscanf(value, "%d", &recvContentLength); |
jderiso2 | 22:9e246a41abe8 | 369 | recvLengthUnknown = false; |
jderiso2 | 22:9e246a41abe8 | 370 | pDataIn->setDataLen(recvContentLength); |
jderiso2 | 22:9e246a41abe8 | 371 | } else if( !strcmp(key, "Transfer-Encoding") ) { |
jderiso2 | 22:9e246a41abe8 | 372 | if( !strcmp(value, "Chunked") || !strcmp(value, "chunked") ) { |
jderiso2 | 22:9e246a41abe8 | 373 | recvChunked = true; |
jderiso2 | 22:9e246a41abe8 | 374 | recvLengthUnknown = false; |
jderiso2 | 22:9e246a41abe8 | 375 | pDataIn->setIsChunked(true); |
jderiso2 | 22:9e246a41abe8 | 376 | } |
jderiso2 | 22:9e246a41abe8 | 377 | } else if( !strcmp(key, "Content-Type") ) { |
jderiso2 | 22:9e246a41abe8 | 378 | pDataIn->setDataType(value); |
jderiso2 | 22:9e246a41abe8 | 379 | } |
jderiso2 | 22:9e246a41abe8 | 380 | |
jderiso2 | 22:9e246a41abe8 | 381 | memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2) + 1); //Be sure to move NULL-terminating char as well |
jderiso2 | 22:9e246a41abe8 | 382 | trfLen -= (crlfPos + 2); |
jderiso2 | 22:9e246a41abe8 | 383 | |
jderiso2 | 22:9e246a41abe8 | 384 | } else { |
jderiso2 | 22:9e246a41abe8 | 385 | ERR("Could not parse header"); |
jderiso2 | 22:9e246a41abe8 | 386 | PRTCL_ERR(); |
donatien | 0:2ccb9960a044 | 387 | } |
donatien | 0:2ccb9960a044 | 388 | |
donatien | 0:2ccb9960a044 | 389 | } |
donatien | 0:2ccb9960a044 | 390 | |
jderiso2 | 22:9e246a41abe8 | 391 | //Receive data |
jderiso2 | 22:9e246a41abe8 | 392 | DBG("Receiving data"); |
jderiso2 | 22:9e246a41abe8 | 393 | while(true) { |
jderiso2 | 22:9e246a41abe8 | 394 | size_t readLen = 0; |
donatien | 0:2ccb9960a044 | 395 | |
jderiso2 | 22:9e246a41abe8 | 396 | if( recvChunked ) { |
jderiso2 | 22:9e246a41abe8 | 397 | //Read chunk header |
jderiso2 | 22:9e246a41abe8 | 398 | bool foundCrlf; |
jderiso2 | 22:9e246a41abe8 | 399 | do { |
jderiso2 | 22:9e246a41abe8 | 400 | foundCrlf = false; |
jderiso2 | 22:9e246a41abe8 | 401 | crlfPos=0; |
jderiso2 | 22:9e246a41abe8 | 402 | buf[trfLen]=0; |
jderiso2 | 22:9e246a41abe8 | 403 | if(trfLen >= 2) { |
jderiso2 | 22:9e246a41abe8 | 404 | for(; crlfPos < trfLen - 2; crlfPos++) { |
jderiso2 | 22:9e246a41abe8 | 405 | if( buf[crlfPos] == '\r' && buf[crlfPos + 1] == '\n' ) { |
jderiso2 | 22:9e246a41abe8 | 406 | foundCrlf = true; |
jderiso2 | 22:9e246a41abe8 | 407 | break; |
jderiso2 | 22:9e246a41abe8 | 408 | } |
jderiso2 | 22:9e246a41abe8 | 409 | } |
jderiso2 | 22:9e246a41abe8 | 410 | } |
jderiso2 | 22:9e246a41abe8 | 411 | if(!foundCrlf) { //Try to read more |
jderiso2 | 22:9e246a41abe8 | 412 | if( trfLen < CHUNK_SIZE ) { |
jderiso2 | 22:9e246a41abe8 | 413 | size_t newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 414 | ret = recv(buf + trfLen, 0, CHUNK_SIZE - trfLen - 1, &newTrfLen); |
jderiso2 | 22:9e246a41abe8 | 415 | trfLen += newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 416 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 417 | continue; |
jderiso2 | 22:9e246a41abe8 | 418 | } else { |
jderiso2 | 22:9e246a41abe8 | 419 | PRTCL_ERR(); |
jderiso2 | 22:9e246a41abe8 | 420 | } |
jderiso2 | 22:9e246a41abe8 | 421 | } |
jderiso2 | 22:9e246a41abe8 | 422 | } while(!foundCrlf); |
jderiso2 | 22:9e246a41abe8 | 423 | buf[crlfPos] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 424 | int n = sscanf(buf, "%x", &readLen); |
jderiso2 | 22:9e246a41abe8 | 425 | if(n!=1) { |
jderiso2 | 22:9e246a41abe8 | 426 | ERR("Could not read chunk length"); |
jderiso2 | 22:9e246a41abe8 | 427 | PRTCL_ERR(); |
donatien | 14:2744e0c0e527 | 428 | } |
jderiso2 | 22:9e246a41abe8 | 429 | |
jderiso2 | 22:9e246a41abe8 | 430 | memmove(buf, &buf[crlfPos+2], trfLen - (crlfPos + 2)); //Not need to move NULL-terminating char any more |
jderiso2 | 22:9e246a41abe8 | 431 | trfLen -= (crlfPos + 2); |
jderiso2 | 22:9e246a41abe8 | 432 | |
jderiso2 | 22:9e246a41abe8 | 433 | if( readLen == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 434 | //Last chunk |
jderiso2 | 22:9e246a41abe8 | 435 | break; |
jderiso2 | 22:9e246a41abe8 | 436 | } |
jderiso2 | 22:9e246a41abe8 | 437 | } else { |
jderiso2 | 22:9e246a41abe8 | 438 | readLen = recvContentLength; |
donatien | 0:2ccb9960a044 | 439 | } |
jderiso2 | 22:9e246a41abe8 | 440 | |
jderiso2 | 22:9e246a41abe8 | 441 | DBG("Retrieving %d bytes (%d bytes in buffer)", readLen, trfLen); |
jderiso2 | 22:9e246a41abe8 | 442 | if (readLen == 0) { |
jderiso2 | 22:9e246a41abe8 | 443 | m_sock.close(); |
jderiso2 | 22:9e246a41abe8 | 444 | DBG("Completed HTTP transaction"); |
jderiso2 | 22:9e246a41abe8 | 445 | |
jderiso2 | 22:9e246a41abe8 | 446 | return HTTP_OK; |
donatien | 0:2ccb9960a044 | 447 | } |
jderiso2 | 22:9e246a41abe8 | 448 | |
jderiso2 | 22:9e246a41abe8 | 449 | do { |
jderiso2 | 22:9e246a41abe8 | 450 | if(recvLengthUnknown ) { |
jderiso2 | 22:9e246a41abe8 | 451 | readLen = trfLen; |
jderiso2 | 22:9e246a41abe8 | 452 | } |
jderiso2 | 22:9e246a41abe8 | 453 | pDataIn->write(buf, MIN(trfLen, readLen)); |
jderiso2 | 22:9e246a41abe8 | 454 | if(!recvLengthUnknown) { |
jderiso2 | 22:9e246a41abe8 | 455 | if( trfLen > readLen ) { |
jderiso2 | 22:9e246a41abe8 | 456 | memmove(buf, &buf[readLen], trfLen - readLen); |
jderiso2 | 22:9e246a41abe8 | 457 | trfLen -= readLen; |
jderiso2 | 22:9e246a41abe8 | 458 | readLen = 0; |
jderiso2 | 22:9e246a41abe8 | 459 | } else { |
jderiso2 | 22:9e246a41abe8 | 460 | readLen -= trfLen; |
jderiso2 | 22:9e246a41abe8 | 461 | } |
jderiso2 | 22:9e246a41abe8 | 462 | } else { |
jderiso2 | 22:9e246a41abe8 | 463 | trfLen = 0; |
jderiso2 | 22:9e246a41abe8 | 464 | } |
donatien | 0:2ccb9960a044 | 465 | |
jderiso2 | 22:9e246a41abe8 | 466 | if(readLen || recvLengthUnknown) { |
jderiso2 | 22:9e246a41abe8 | 467 | ret = recv(buf, 1, CHUNK_SIZE - trfLen - 1, &trfLen); |
jderiso2 | 22:9e246a41abe8 | 468 | if(recvLengthUnknown && (ret == HTTP_CLOSED)) { |
jderiso2 | 22:9e246a41abe8 | 469 | //Write and exit |
jderiso2 | 22:9e246a41abe8 | 470 | pDataIn->write(buf, trfLen); |
jderiso2 | 22:9e246a41abe8 | 471 | break; |
jderiso2 | 22:9e246a41abe8 | 472 | } |
jderiso2 | 22:9e246a41abe8 | 473 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 474 | if(recvLengthUnknown && (trfLen == 0)) { |
jderiso2 | 22:9e246a41abe8 | 475 | break; |
jderiso2 | 22:9e246a41abe8 | 476 | } |
jderiso2 | 22:9e246a41abe8 | 477 | } |
jderiso2 | 22:9e246a41abe8 | 478 | } while(readLen || recvLengthUnknown); |
donatien | 0:2ccb9960a044 | 479 | |
jderiso2 | 22:9e246a41abe8 | 480 | if( recvChunked ) { |
jderiso2 | 22:9e246a41abe8 | 481 | if(trfLen < 2) { |
jderiso2 | 22:9e246a41abe8 | 482 | size_t newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 483 | //Read missing chars to find end of chunk |
jderiso2 | 22:9e246a41abe8 | 484 | ret = recv(buf + trfLen, 2 - trfLen, CHUNK_SIZE - trfLen - 1, &newTrfLen); |
jderiso2 | 22:9e246a41abe8 | 485 | CHECK_CONN_ERR(ret); |
jderiso2 | 22:9e246a41abe8 | 486 | trfLen += newTrfLen; |
jderiso2 | 22:9e246a41abe8 | 487 | } |
jderiso2 | 22:9e246a41abe8 | 488 | if( (buf[0] != '\r') || (buf[1] != '\n') ) { |
jderiso2 | 22:9e246a41abe8 | 489 | ERR("Format error"); |
jderiso2 | 22:9e246a41abe8 | 490 | PRTCL_ERR(); |
jderiso2 | 22:9e246a41abe8 | 491 | } |
jderiso2 | 22:9e246a41abe8 | 492 | memmove(buf, &buf[2], trfLen - 2); |
jderiso2 | 22:9e246a41abe8 | 493 | trfLen -= 2; |
jderiso2 | 22:9e246a41abe8 | 494 | } else { |
jderiso2 | 22:9e246a41abe8 | 495 | break; |
jderiso2 | 22:9e246a41abe8 | 496 | } |
jderiso2 | 22:9e246a41abe8 | 497 | |
donatien | 0:2ccb9960a044 | 498 | } |
donatien | 0:2ccb9960a044 | 499 | |
jderiso2 | 22:9e246a41abe8 | 500 | m_sock.close(); |
jderiso2 | 22:9e246a41abe8 | 501 | DBG("Completed HTTP transaction"); |
donatien | 0:2ccb9960a044 | 502 | |
jderiso2 | 22:9e246a41abe8 | 503 | return HTTP_OK; |
donatien | 0:2ccb9960a044 | 504 | } |
donatien | 0:2ccb9960a044 | 505 | |
donatien | 11:390362de8c3f | 506 | HTTPResult HTTPClient::recv(char* buf, size_t minLen, size_t maxLen, size_t* pReadLen) //0 on success, err code on failure |
donatien | 0:2ccb9960a044 | 507 | { |
jderiso2 | 22:9e246a41abe8 | 508 | DBG("Trying to read between %d and %d bytes", minLen, maxLen); |
jderiso2 | 22:9e246a41abe8 | 509 | size_t readLen = 0; |
jderiso2 | 22:9e246a41abe8 | 510 | |
jderiso2 | 22:9e246a41abe8 | 511 | if(!m_sock.is_connected()) { |
jderiso2 | 22:9e246a41abe8 | 512 | WARN("Connection was closed by server"); |
jderiso2 | 22:9e246a41abe8 | 513 | return HTTP_CLOSED; //Connection was closed by server |
donatien | 7:4e39864f7b15 | 514 | } |
jderiso2 | 22:9e246a41abe8 | 515 | |
jderiso2 | 22:9e246a41abe8 | 516 | int ret; |
jderiso2 | 22:9e246a41abe8 | 517 | while(readLen < maxLen) { |
jderiso2 | 22:9e246a41abe8 | 518 | if(readLen < minLen) { |
jderiso2 | 22:9e246a41abe8 | 519 | DBG("Trying to read at most %d bytes [Blocking]", minLen - readLen); |
jderiso2 | 22:9e246a41abe8 | 520 | m_sock.set_blocking(false, m_timeout); |
jderiso2 | 22:9e246a41abe8 | 521 | ret = m_sock.receive_all(buf + readLen, minLen - readLen); |
jderiso2 | 22:9e246a41abe8 | 522 | } else { |
jderiso2 | 22:9e246a41abe8 | 523 | DBG("Trying to read at most %d bytes [Not blocking]", maxLen - readLen); |
jderiso2 | 22:9e246a41abe8 | 524 | m_sock.set_blocking(false, 0); |
jderiso2 | 22:9e246a41abe8 | 525 | ret = m_sock.receive(buf + readLen, maxLen - readLen); |
jderiso2 | 22:9e246a41abe8 | 526 | } |
jderiso2 | 22:9e246a41abe8 | 527 | |
jderiso2 | 22:9e246a41abe8 | 528 | if( ret > 0) { |
jderiso2 | 22:9e246a41abe8 | 529 | readLen += ret; |
jderiso2 | 22:9e246a41abe8 | 530 | } else if( ret == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 531 | break; |
jderiso2 | 22:9e246a41abe8 | 532 | } else { |
jderiso2 | 22:9e246a41abe8 | 533 | if(!m_sock.is_connected()) { |
jderiso2 | 22:9e246a41abe8 | 534 | ERR("Connection error (recv returned %d)", ret); |
jderiso2 | 22:9e246a41abe8 | 535 | *pReadLen = readLen; |
jderiso2 | 22:9e246a41abe8 | 536 | return HTTP_CONN; |
jderiso2 | 22:9e246a41abe8 | 537 | } else { |
jderiso2 | 22:9e246a41abe8 | 538 | break; |
jderiso2 | 22:9e246a41abe8 | 539 | } |
jderiso2 | 22:9e246a41abe8 | 540 | } |
jderiso2 | 22:9e246a41abe8 | 541 | |
jderiso2 | 22:9e246a41abe8 | 542 | if(!m_sock.is_connected()) { |
jderiso2 | 22:9e246a41abe8 | 543 | break; |
jderiso2 | 22:9e246a41abe8 | 544 | } |
donatien | 7:4e39864f7b15 | 545 | } |
jderiso2 | 22:9e246a41abe8 | 546 | DBG("Read %d bytes", readLen); |
jderiso2 | 22:9e246a41abe8 | 547 | *pReadLen = readLen; |
jderiso2 | 22:9e246a41abe8 | 548 | return HTTP_OK; |
donatien | 7:4e39864f7b15 | 549 | } |
donatien | 7:4e39864f7b15 | 550 | |
donatien | 11:390362de8c3f | 551 | HTTPResult HTTPClient::send(char* buf, size_t len) //0 on success, err code on failure |
donatien | 7:4e39864f7b15 | 552 | { |
jderiso2 | 22:9e246a41abe8 | 553 | if(len == 0) { |
jderiso2 | 22:9e246a41abe8 | 554 | len = strlen(buf); |
jderiso2 | 22:9e246a41abe8 | 555 | } |
jderiso2 | 22:9e246a41abe8 | 556 | DBG("Trying to write %d bytes", len); |
jderiso2 | 22:9e246a41abe8 | 557 | size_t writtenLen = 0; |
jderiso2 | 22:9e246a41abe8 | 558 | |
jderiso2 | 22:9e246a41abe8 | 559 | if(!m_sock.is_connected()) { |
jderiso2 | 22:9e246a41abe8 | 560 | WARN("Connection was closed by server"); |
jderiso2 | 22:9e246a41abe8 | 561 | return HTTP_CLOSED; //Connection was closed by server |
jderiso2 | 22:9e246a41abe8 | 562 | } |
jderiso2 | 22:9e246a41abe8 | 563 | |
jderiso2 | 22:9e246a41abe8 | 564 | m_sock.set_blocking(false, m_timeout); |
jderiso2 | 22:9e246a41abe8 | 565 | int ret = m_sock.send_all(buf, len); |
jderiso2 | 22:9e246a41abe8 | 566 | if(ret > 0) { |
jderiso2 | 22:9e246a41abe8 | 567 | writtenLen += ret; |
jderiso2 | 22:9e246a41abe8 | 568 | } else if( ret == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 569 | WARN("Connection was closed by server"); |
jderiso2 | 22:9e246a41abe8 | 570 | return HTTP_CLOSED; //Connection was closed by server |
jderiso2 | 22:9e246a41abe8 | 571 | } else { |
jderiso2 | 22:9e246a41abe8 | 572 | ERR("Connection error (send returned %d)", ret); |
jderiso2 | 22:9e246a41abe8 | 573 | return HTTP_CONN; |
jderiso2 | 22:9e246a41abe8 | 574 | } |
jderiso2 | 22:9e246a41abe8 | 575 | |
jderiso2 | 22:9e246a41abe8 | 576 | DBG("Written %d bytes", writtenLen); |
jderiso2 | 22:9e246a41abe8 | 577 | return HTTP_OK; |
donatien | 0:2ccb9960a044 | 578 | } |
donatien | 0:2ccb9960a044 | 579 | |
donatien | 11:390362de8c3f | 580 | 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 | 581 | { |
jderiso2 | 22:9e246a41abe8 | 582 | char* schemePtr = (char*) url; |
jderiso2 | 22:9e246a41abe8 | 583 | char* hostPtr = (char*) strstr(url, "://"); |
donatien | 0:2ccb9960a044 | 584 | |
jderiso2 | 22:9e246a41abe8 | 585 | if(hostPtr == NULL) { |
jderiso2 | 22:9e246a41abe8 | 586 | WARN("Could not find host"); |
jderiso2 | 22:9e246a41abe8 | 587 | return HTTP_PARSE; //URL is invalid |
jderiso2 | 22:9e246a41abe8 | 588 | } |
donatien | 0:2ccb9960a044 | 589 | |
jderiso2 | 22:9e246a41abe8 | 590 | if( maxSchemeLen < hostPtr - schemePtr + 1 ) { //including NULL-terminating char |
jderiso2 | 22:9e246a41abe8 | 591 | WARN("Scheme str is too small (%d >= %d)", maxSchemeLen, hostPtr - schemePtr + 1); |
jderiso2 | 22:9e246a41abe8 | 592 | return HTTP_PARSE; |
donatien | 0:2ccb9960a044 | 593 | } |
jderiso2 | 22:9e246a41abe8 | 594 | memcpy(scheme, schemePtr, hostPtr - schemePtr); |
jderiso2 | 22:9e246a41abe8 | 595 | scheme[hostPtr - schemePtr] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 596 | |
jderiso2 | 22:9e246a41abe8 | 597 | hostPtr+=3; |
jderiso2 | 22:9e246a41abe8 | 598 | |
jderiso2 | 22:9e246a41abe8 | 599 | size_t hostLen = 0; |
donatien | 0:2ccb9960a044 | 600 | |
jderiso2 | 22:9e246a41abe8 | 601 | char* portPtr = strchr(hostPtr, ':'); |
jderiso2 | 22:9e246a41abe8 | 602 | if( portPtr != NULL ) { |
jderiso2 | 22:9e246a41abe8 | 603 | hostLen = portPtr - hostPtr; |
jderiso2 | 22:9e246a41abe8 | 604 | portPtr++; |
jderiso2 | 22:9e246a41abe8 | 605 | if( sscanf(portPtr, "%hu", port) != 1) { |
jderiso2 | 22:9e246a41abe8 | 606 | WARN("Could not find port"); |
jderiso2 | 22:9e246a41abe8 | 607 | printf("got: %s\n", portPtr); |
jderiso2 | 22:9e246a41abe8 | 608 | printf("host: %s]n", hostPtr); |
jderiso2 | 22:9e246a41abe8 | 609 | return HTTP_PARSE; |
jderiso2 | 22:9e246a41abe8 | 610 | } |
jderiso2 | 22:9e246a41abe8 | 611 | } else { |
jderiso2 | 22:9e246a41abe8 | 612 | *port=0; |
jderiso2 | 22:9e246a41abe8 | 613 | } |
jderiso2 | 22:9e246a41abe8 | 614 | char* pathPtr = strchr(hostPtr, '/'); |
jderiso2 | 22:9e246a41abe8 | 615 | if( hostLen == 0 ) { |
jderiso2 | 22:9e246a41abe8 | 616 | hostLen = pathPtr - hostPtr; |
jderiso2 | 22:9e246a41abe8 | 617 | } |
donatien | 0:2ccb9960a044 | 618 | |
jderiso2 | 22:9e246a41abe8 | 619 | if( maxHostLen < hostLen + 1 ) { //including NULL-terminating char |
jderiso2 | 22:9e246a41abe8 | 620 | WARN("Host str is too small (%d >= %d)", maxHostLen, hostLen + 1); |
jderiso2 | 22:9e246a41abe8 | 621 | return HTTP_PARSE; |
jderiso2 | 22:9e246a41abe8 | 622 | } |
jderiso2 | 22:9e246a41abe8 | 623 | memcpy(host, hostPtr, hostLen); |
jderiso2 | 22:9e246a41abe8 | 624 | host[hostLen] = '\0'; |
donatien | 0:2ccb9960a044 | 625 | |
jderiso2 | 22:9e246a41abe8 | 626 | size_t pathLen; |
jderiso2 | 22:9e246a41abe8 | 627 | char* fragmentPtr = NULL;//strchr(hostPtr, '#'); |
jderiso2 | 22:9e246a41abe8 | 628 | if(fragmentPtr != NULL) { |
jderiso2 | 22:9e246a41abe8 | 629 | pathLen = fragmentPtr - pathPtr; |
jderiso2 | 22:9e246a41abe8 | 630 | } else { |
jderiso2 | 22:9e246a41abe8 | 631 | pathLen = strlen(pathPtr); |
jderiso2 | 22:9e246a41abe8 | 632 | } |
donatien | 0:2ccb9960a044 | 633 | |
jderiso2 | 22:9e246a41abe8 | 634 | if( maxPathLen < pathLen + 1 ) { //including NULL-terminating char |
jderiso2 | 22:9e246a41abe8 | 635 | WARN("Path str is too small (%d >= %d)", maxPathLen, pathLen + 1); |
jderiso2 | 22:9e246a41abe8 | 636 | return HTTP_PARSE; |
jderiso2 | 22:9e246a41abe8 | 637 | } |
jderiso2 | 22:9e246a41abe8 | 638 | memcpy(path, pathPtr, pathLen); |
jderiso2 | 22:9e246a41abe8 | 639 | path[pathLen] = '\0'; |
jderiso2 | 22:9e246a41abe8 | 640 | |
jderiso2 | 22:9e246a41abe8 | 641 | return HTTP_OK; |
donatien | 0:2ccb9960a044 | 642 | } |