Fork of wolfSSL's HTTPClient fork. Fork!
Dependents: exosite_http_example exosite_http_example
Fork of HTTPClient by
data/HTTPMap.cpp@32:7716672463b9, 2015-01-20 (annotated)
- Committer:
- PBarrett
- Date:
- Tue Jan 20 19:40:15 2015 +0000
- Revision:
- 32:7716672463b9
- Parent:
- 16:1f743885e7de
added IHTTPDataIn support to HTTPMap, remove previous content-type hack
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
donatien | 0:2ccb9960a044 | 1 | /* HTTPMap.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 | 0:2ccb9960a044 | 20 | #include "HTTPMap.h" |
donatien | 0:2ccb9960a044 | 21 | |
donatien | 0:2ccb9960a044 | 22 | #include <cstring> |
donatien | 0:2ccb9960a044 | 23 | |
donatien | 0:2ccb9960a044 | 24 | #include <cctype> |
donatien | 0:2ccb9960a044 | 25 | |
donatien | 13:be61104f4e91 | 26 | #define OK 0 |
donatien | 13:be61104f4e91 | 27 | |
PBarrett | 32:7716672463b9 | 28 | #define MIN(x,y) (((x)<(y))?(x):(y)) |
PBarrett | 32:7716672463b9 | 29 | #define MAX(x,y) (((x)>(y))?(x):(y)) |
PBarrett | 32:7716672463b9 | 30 | |
donatien | 13:be61104f4e91 | 31 | using std::strncpy; |
PBarrett | 32:7716672463b9 | 32 | using std::memcpy; |
PBarrett | 32:7716672463b9 | 33 | using std::strcmp; |
PBarrett | 32:7716672463b9 | 34 | using std::strlen; |
PBarrett | 32:7716672463b9 | 35 | |
PBarrett | 32:7716672463b9 | 36 | static char UrlDecode(char* str, size_t& offset); |
PBarrett | 32:7716672463b9 | 37 | static char HexDecode(char c); |
donatien | 13:be61104f4e91 | 38 | |
donatien | 0:2ccb9960a044 | 39 | HTTPMap::HTTPMap() : m_pos(0), m_count(0) |
donatien | 0:2ccb9960a044 | 40 | { |
donatien | 0:2ccb9960a044 | 41 | |
donatien | 0:2ccb9960a044 | 42 | } |
donatien | 0:2ccb9960a044 | 43 | |
PBarrett | 32:7716672463b9 | 44 | HTTPMap::HTTPMap(char* str, size_t size) : m_str(str), m_size(size), m_pos(0), m_read_pos(0) |
PBarrett | 32:7716672463b9 | 45 | { |
PBarrett | 32:7716672463b9 | 46 | |
PBarrett | 32:7716672463b9 | 47 | } |
PBarrett | 32:7716672463b9 | 48 | |
donatien | 0:2ccb9960a044 | 49 | void HTTPMap::put(const char* key, const char* value) |
donatien | 0:2ccb9960a044 | 50 | { |
donatien | 0:2ccb9960a044 | 51 | if(m_count >= HTTPMAP_TABLE_SIZE) |
donatien | 0:2ccb9960a044 | 52 | { |
donatien | 0:2ccb9960a044 | 53 | return; |
donatien | 0:2ccb9960a044 | 54 | } |
donatien | 0:2ccb9960a044 | 55 | m_keys[m_count] = key; |
donatien | 0:2ccb9960a044 | 56 | m_values[m_count] = value; |
donatien | 0:2ccb9960a044 | 57 | m_count++; |
donatien | 0:2ccb9960a044 | 58 | } |
donatien | 0:2ccb9960a044 | 59 | |
donatien | 0:2ccb9960a044 | 60 | void HTTPMap::clear() |
donatien | 0:2ccb9960a044 | 61 | { |
donatien | 0:2ccb9960a044 | 62 | m_count = 0; |
donatien | 0:2ccb9960a044 | 63 | m_pos = 0; |
donatien | 0:2ccb9960a044 | 64 | } |
donatien | 0:2ccb9960a044 | 65 | |
donatien | 16:1f743885e7de | 66 | /*virtual*/ void HTTPMap::readReset() |
donatien | 16:1f743885e7de | 67 | { |
donatien | 16:1f743885e7de | 68 | m_pos = 0; |
donatien | 16:1f743885e7de | 69 | } |
donatien | 0:2ccb9960a044 | 70 | |
donatien | 0:2ccb9960a044 | 71 | /*virtual*/ int HTTPMap::read(char* buf, size_t len, size_t* pReadLen) |
donatien | 0:2ccb9960a044 | 72 | { |
donatien | 0:2ccb9960a044 | 73 | if(m_pos >= m_count) |
donatien | 0:2ccb9960a044 | 74 | { |
donatien | 0:2ccb9960a044 | 75 | *pReadLen = 0; |
donatien | 0:2ccb9960a044 | 76 | m_pos = 0; |
donatien | 0:2ccb9960a044 | 77 | return OK; |
donatien | 0:2ccb9960a044 | 78 | } |
donatien | 0:2ccb9960a044 | 79 | |
donatien | 0:2ccb9960a044 | 80 | //URL encode |
donatien | 0:2ccb9960a044 | 81 | char* out = buf; |
donatien | 0:2ccb9960a044 | 82 | const char* in = m_keys[m_pos]; |
donatien | 0:2ccb9960a044 | 83 | if( (m_pos != 0) && (out - buf < len - 1) ) |
donatien | 0:2ccb9960a044 | 84 | { |
donatien | 0:2ccb9960a044 | 85 | *out='&'; |
donatien | 0:2ccb9960a044 | 86 | out++; |
donatien | 0:2ccb9960a044 | 87 | } |
donatien | 0:2ccb9960a044 | 88 | |
donatien | 0:2ccb9960a044 | 89 | while( (*in != '\0') && (out - buf < len - 3) ) |
donatien | 0:2ccb9960a044 | 90 | { |
donatien | 0:2ccb9960a044 | 91 | if (std::isalnum(*in) || *in == '-' || *in == '_' || *in == '.' || *in == '~') |
donatien | 0:2ccb9960a044 | 92 | { |
donatien | 0:2ccb9960a044 | 93 | *out = *in; |
donatien | 0:2ccb9960a044 | 94 | out++; |
donatien | 0:2ccb9960a044 | 95 | } |
donatien | 0:2ccb9960a044 | 96 | else if( *in == ' ' ) |
donatien | 0:2ccb9960a044 | 97 | { |
donatien | 0:2ccb9960a044 | 98 | *out='+'; |
donatien | 0:2ccb9960a044 | 99 | out++; |
donatien | 0:2ccb9960a044 | 100 | } |
donatien | 0:2ccb9960a044 | 101 | else |
donatien | 0:2ccb9960a044 | 102 | { |
donatien | 0:2ccb9960a044 | 103 | char hex[] = "0123456789abcdef"; |
donatien | 0:2ccb9960a044 | 104 | *out='%'; |
donatien | 0:2ccb9960a044 | 105 | out++; |
donatien | 0:2ccb9960a044 | 106 | *out=hex[(*in>>4)&0xf]; |
donatien | 0:2ccb9960a044 | 107 | out++; |
donatien | 0:2ccb9960a044 | 108 | *out=hex[(*in)&0xf]; |
donatien | 0:2ccb9960a044 | 109 | out++; |
donatien | 0:2ccb9960a044 | 110 | } |
donatien | 0:2ccb9960a044 | 111 | in++; |
donatien | 0:2ccb9960a044 | 112 | } |
donatien | 0:2ccb9960a044 | 113 | |
donatien | 0:2ccb9960a044 | 114 | if( out - buf < len - 1 ) |
donatien | 0:2ccb9960a044 | 115 | { |
donatien | 0:2ccb9960a044 | 116 | *out='='; |
donatien | 0:2ccb9960a044 | 117 | out++; |
donatien | 0:2ccb9960a044 | 118 | } |
donatien | 0:2ccb9960a044 | 119 | |
donatien | 0:2ccb9960a044 | 120 | in = m_values[m_pos]; |
donatien | 0:2ccb9960a044 | 121 | while( (*in != '\0') && (out - buf < len - 3) ) |
donatien | 0:2ccb9960a044 | 122 | { |
donatien | 0:2ccb9960a044 | 123 | if (std::isalnum(*in) || *in == '-' || *in == '_' || *in == '.' || *in == '~') |
donatien | 0:2ccb9960a044 | 124 | { |
donatien | 0:2ccb9960a044 | 125 | *out = *in; |
donatien | 0:2ccb9960a044 | 126 | out++; |
donatien | 0:2ccb9960a044 | 127 | } |
donatien | 0:2ccb9960a044 | 128 | else if( *in == ' ' ) |
donatien | 0:2ccb9960a044 | 129 | { |
donatien | 0:2ccb9960a044 | 130 | *out='+'; |
donatien | 0:2ccb9960a044 | 131 | out++; |
donatien | 0:2ccb9960a044 | 132 | } |
donatien | 0:2ccb9960a044 | 133 | else |
donatien | 0:2ccb9960a044 | 134 | { |
donatien | 0:2ccb9960a044 | 135 | char hex[] = "0123456789abcdef"; |
donatien | 0:2ccb9960a044 | 136 | *out='%'; |
donatien | 0:2ccb9960a044 | 137 | out++; |
donatien | 0:2ccb9960a044 | 138 | *out=hex[(*in>>4)&0xf]; |
donatien | 0:2ccb9960a044 | 139 | out++; |
donatien | 0:2ccb9960a044 | 140 | *out=hex[(*in)&0xf]; |
donatien | 0:2ccb9960a044 | 141 | out++; |
donatien | 0:2ccb9960a044 | 142 | } |
donatien | 0:2ccb9960a044 | 143 | in++; |
donatien | 0:2ccb9960a044 | 144 | } |
donatien | 0:2ccb9960a044 | 145 | |
donatien | 0:2ccb9960a044 | 146 | *pReadLen = out - buf; |
donatien | 0:2ccb9960a044 | 147 | |
donatien | 0:2ccb9960a044 | 148 | m_pos++; |
donatien | 0:2ccb9960a044 | 149 | return OK; |
donatien | 0:2ccb9960a044 | 150 | } |
donatien | 0:2ccb9960a044 | 151 | |
donatien | 0:2ccb9960a044 | 152 | /*virtual*/ int HTTPMap::getDataType(char* type, size_t maxTypeLen) //Internet media type for Content-Type header |
donatien | 0:2ccb9960a044 | 153 | { |
donatien | 0:2ccb9960a044 | 154 | strncpy(type, "application/x-www-form-urlencoded", maxTypeLen-1); |
donatien | 0:2ccb9960a044 | 155 | type[maxTypeLen-1] = '\0'; |
donatien | 0:2ccb9960a044 | 156 | return OK; |
donatien | 0:2ccb9960a044 | 157 | } |
donatien | 0:2ccb9960a044 | 158 | |
donatien | 0:2ccb9960a044 | 159 | /*virtual*/ bool HTTPMap::getIsChunked() //For Transfer-Encoding header |
donatien | 0:2ccb9960a044 | 160 | { |
donatien | 0:2ccb9960a044 | 161 | return false; ////Data is computed one key/value pair at a time |
donatien | 0:2ccb9960a044 | 162 | } |
donatien | 0:2ccb9960a044 | 163 | |
donatien | 0:2ccb9960a044 | 164 | /*virtual*/ size_t HTTPMap::getDataLen() //For Content-Length header |
donatien | 0:2ccb9960a044 | 165 | { |
donatien | 0:2ccb9960a044 | 166 | size_t count = 0; |
donatien | 0:2ccb9960a044 | 167 | for(size_t i = 0; i< m_count; i++) |
donatien | 0:2ccb9960a044 | 168 | { |
donatien | 0:2ccb9960a044 | 169 | //URL encode |
donatien | 0:2ccb9960a044 | 170 | const char* in = m_keys[i]; |
donatien | 0:2ccb9960a044 | 171 | if( i != 0 ) |
donatien | 0:2ccb9960a044 | 172 | { |
donatien | 0:2ccb9960a044 | 173 | count++; |
donatien | 0:2ccb9960a044 | 174 | } |
donatien | 0:2ccb9960a044 | 175 | |
donatien | 0:2ccb9960a044 | 176 | while( (*in != '\0') ) |
donatien | 0:2ccb9960a044 | 177 | { |
donatien | 0:2ccb9960a044 | 178 | if (std::isalnum(*in) || *in == '-' || *in == '_' || *in == '.' || *in == '~') |
donatien | 0:2ccb9960a044 | 179 | { |
donatien | 0:2ccb9960a044 | 180 | count++; |
donatien | 0:2ccb9960a044 | 181 | } |
donatien | 0:2ccb9960a044 | 182 | else if( *in == ' ' ) |
donatien | 0:2ccb9960a044 | 183 | { |
donatien | 0:2ccb9960a044 | 184 | count++; |
donatien | 0:2ccb9960a044 | 185 | } |
donatien | 0:2ccb9960a044 | 186 | else |
donatien | 0:2ccb9960a044 | 187 | { |
donatien | 0:2ccb9960a044 | 188 | count+=3; |
donatien | 0:2ccb9960a044 | 189 | } |
donatien | 0:2ccb9960a044 | 190 | in++; |
donatien | 0:2ccb9960a044 | 191 | } |
donatien | 0:2ccb9960a044 | 192 | |
donatien | 0:2ccb9960a044 | 193 | count ++; |
donatien | 0:2ccb9960a044 | 194 | |
donatien | 0:2ccb9960a044 | 195 | in = m_values[i]; |
donatien | 0:2ccb9960a044 | 196 | while( (*in != '\0') ) |
donatien | 0:2ccb9960a044 | 197 | { |
donatien | 0:2ccb9960a044 | 198 | if (std::isalnum(*in) || *in == '-' || *in == '_' || *in == '.' || *in == '~') |
donatien | 0:2ccb9960a044 | 199 | { |
donatien | 0:2ccb9960a044 | 200 | count++; |
donatien | 0:2ccb9960a044 | 201 | } |
donatien | 0:2ccb9960a044 | 202 | else if( *in == ' ' ) |
donatien | 0:2ccb9960a044 | 203 | { |
donatien | 0:2ccb9960a044 | 204 | count++; |
donatien | 0:2ccb9960a044 | 205 | } |
donatien | 0:2ccb9960a044 | 206 | else |
donatien | 0:2ccb9960a044 | 207 | { |
donatien | 0:2ccb9960a044 | 208 | count+=3; |
donatien | 0:2ccb9960a044 | 209 | } |
donatien | 0:2ccb9960a044 | 210 | in++; |
donatien | 0:2ccb9960a044 | 211 | } |
donatien | 0:2ccb9960a044 | 212 | } |
donatien | 0:2ccb9960a044 | 213 | return count; |
donatien | 0:2ccb9960a044 | 214 | } |
PBarrett | 32:7716672463b9 | 215 | |
PBarrett | 32:7716672463b9 | 216 | |
PBarrett | 32:7716672463b9 | 217 | /*virtual*/ void HTTPMap::writeReset() |
PBarrett | 32:7716672463b9 | 218 | { |
PBarrett | 32:7716672463b9 | 219 | m_pos = 0; |
PBarrett | 32:7716672463b9 | 220 | } |
PBarrett | 32:7716672463b9 | 221 | |
PBarrett | 32:7716672463b9 | 222 | /*virtual*/ int HTTPMap::write(const char* buf, size_t len) |
PBarrett | 32:7716672463b9 | 223 | { |
PBarrett | 32:7716672463b9 | 224 | size_t writeLen = MIN(len, m_size - 1 - m_pos); |
PBarrett | 32:7716672463b9 | 225 | memcpy(m_str + m_pos, buf, writeLen); |
PBarrett | 32:7716672463b9 | 226 | m_pos += writeLen; |
PBarrett | 32:7716672463b9 | 227 | m_str[m_pos] = '\0'; |
PBarrett | 32:7716672463b9 | 228 | return OK; |
PBarrett | 32:7716672463b9 | 229 | } |
PBarrett | 32:7716672463b9 | 230 | |
PBarrett | 32:7716672463b9 | 231 | /*virtual*/ void HTTPMap::setDataType(const char* type) //Internet media type from Content-Type header |
PBarrett | 32:7716672463b9 | 232 | { |
PBarrett | 32:7716672463b9 | 233 | |
PBarrett | 32:7716672463b9 | 234 | } |
PBarrett | 32:7716672463b9 | 235 | |
PBarrett | 32:7716672463b9 | 236 | /*virtual*/ void HTTPMap::setIsChunked(bool chunked) //From Transfer-Encoding header |
PBarrett | 32:7716672463b9 | 237 | { |
PBarrett | 32:7716672463b9 | 238 | |
PBarrett | 32:7716672463b9 | 239 | } |
PBarrett | 32:7716672463b9 | 240 | |
PBarrett | 32:7716672463b9 | 241 | /*virtual*/ void HTTPMap::setDataLen(size_t len) //From Content-Length header, or if the transfer is chunked, next chunk length |
PBarrett | 32:7716672463b9 | 242 | { |
PBarrett | 32:7716672463b9 | 243 | |
PBarrett | 32:7716672463b9 | 244 | } |
PBarrett | 32:7716672463b9 | 245 | |
PBarrett | 32:7716672463b9 | 246 | |
PBarrett | 32:7716672463b9 | 247 | bool HTTPMap::pop(char*& key, char*& value) |
PBarrett | 32:7716672463b9 | 248 | { |
PBarrett | 32:7716672463b9 | 249 | size_t j = m_read_pos; |
PBarrett | 32:7716672463b9 | 250 | |
PBarrett | 32:7716672463b9 | 251 | key = &m_str[m_read_pos]; |
PBarrett | 32:7716672463b9 | 252 | while(m_read_pos < m_size && m_str[m_read_pos] != '=' && m_str[m_read_pos] != '\0') |
PBarrett | 32:7716672463b9 | 253 | { |
PBarrett | 32:7716672463b9 | 254 | m_str[j++] = UrlDecode(m_str, m_read_pos); |
PBarrett | 32:7716672463b9 | 255 | m_read_pos++; |
PBarrett | 32:7716672463b9 | 256 | } |
PBarrett | 32:7716672463b9 | 257 | |
PBarrett | 32:7716672463b9 | 258 | if(m_read_pos >= m_size || m_str[m_read_pos] == '\0') |
PBarrett | 32:7716672463b9 | 259 | { |
PBarrett | 32:7716672463b9 | 260 | key = NULL; |
PBarrett | 32:7716672463b9 | 261 | value = NULL; |
PBarrett | 32:7716672463b9 | 262 | return false; |
PBarrett | 32:7716672463b9 | 263 | } |
PBarrett | 32:7716672463b9 | 264 | |
PBarrett | 32:7716672463b9 | 265 | m_str[j++] = '\0'; |
PBarrett | 32:7716672463b9 | 266 | j = ++m_read_pos; |
PBarrett | 32:7716672463b9 | 267 | value = &m_str[m_read_pos]; |
PBarrett | 32:7716672463b9 | 268 | |
PBarrett | 32:7716672463b9 | 269 | while(m_read_pos < m_size-1 && m_str[m_read_pos] != '&' && m_str[m_read_pos] != '\0') |
PBarrett | 32:7716672463b9 | 270 | { |
PBarrett | 32:7716672463b9 | 271 | m_str[j++] = UrlDecode(m_str, m_read_pos); |
PBarrett | 32:7716672463b9 | 272 | m_read_pos++; |
PBarrett | 32:7716672463b9 | 273 | } |
PBarrett | 32:7716672463b9 | 274 | |
PBarrett | 32:7716672463b9 | 275 | m_str[j++] = '\0'; |
PBarrett | 32:7716672463b9 | 276 | |
PBarrett | 32:7716672463b9 | 277 | return true; |
PBarrett | 32:7716672463b9 | 278 | } |
PBarrett | 32:7716672463b9 | 279 | |
PBarrett | 32:7716672463b9 | 280 | |
PBarrett | 32:7716672463b9 | 281 | bool HTTPMap::get(const char* key, char* val_buf, const size_t max) |
PBarrett | 32:7716672463b9 | 282 | { |
PBarrett | 32:7716672463b9 | 283 | size_t i, j = m_read_pos; |
PBarrett | 32:7716672463b9 | 284 | |
PBarrett | 32:7716672463b9 | 285 | while(j < m_size && m_str[j] != '\0') |
PBarrett | 32:7716672463b9 | 286 | { |
PBarrett | 32:7716672463b9 | 287 | i = 0; |
PBarrett | 32:7716672463b9 | 288 | while(key[i] == m_str[j] && j < m_size && m_str[j] != '=' && m_str[j] != '\0') |
PBarrett | 32:7716672463b9 | 289 | { |
PBarrett | 32:7716672463b9 | 290 | i++; |
PBarrett | 32:7716672463b9 | 291 | j++; |
PBarrett | 32:7716672463b9 | 292 | } |
PBarrett | 32:7716672463b9 | 293 | |
PBarrett | 32:7716672463b9 | 294 | if(m_str[j] == '=') |
PBarrett | 32:7716672463b9 | 295 | { |
PBarrett | 32:7716672463b9 | 296 | j++; |
PBarrett | 32:7716672463b9 | 297 | i = 0; |
PBarrett | 32:7716672463b9 | 298 | while(i < max-1 && j < m_size && m_str[j] != '&' && m_str[j] != '\0') |
PBarrett | 32:7716672463b9 | 299 | { |
PBarrett | 32:7716672463b9 | 300 | val_buf[i++] = UrlDecode(m_str, j); |
PBarrett | 32:7716672463b9 | 301 | j++; |
PBarrett | 32:7716672463b9 | 302 | } |
PBarrett | 32:7716672463b9 | 303 | |
PBarrett | 32:7716672463b9 | 304 | val_buf[i] = '\0'; |
PBarrett | 32:7716672463b9 | 305 | |
PBarrett | 32:7716672463b9 | 306 | return true; |
PBarrett | 32:7716672463b9 | 307 | } |
PBarrett | 32:7716672463b9 | 308 | |
PBarrett | 32:7716672463b9 | 309 | while(j < m_size && m_str[j] != '&' && m_str[j] != '\0') |
PBarrett | 32:7716672463b9 | 310 | { |
PBarrett | 32:7716672463b9 | 311 | val_buf[i++] = UrlDecode(m_str, j); |
PBarrett | 32:7716672463b9 | 312 | j++; |
PBarrett | 32:7716672463b9 | 313 | } |
PBarrett | 32:7716672463b9 | 314 | |
PBarrett | 32:7716672463b9 | 315 | if(m_str[j] == '&') |
PBarrett | 32:7716672463b9 | 316 | j++; |
PBarrett | 32:7716672463b9 | 317 | |
PBarrett | 32:7716672463b9 | 318 | } |
PBarrett | 32:7716672463b9 | 319 | |
PBarrett | 32:7716672463b9 | 320 | return false; |
PBarrett | 32:7716672463b9 | 321 | } |
PBarrett | 32:7716672463b9 | 322 | |
PBarrett | 32:7716672463b9 | 323 | static char UrlDecode(char* str, size_t& offset) |
PBarrett | 32:7716672463b9 | 324 | { |
PBarrett | 32:7716672463b9 | 325 | char c; |
PBarrett | 32:7716672463b9 | 326 | |
PBarrett | 32:7716672463b9 | 327 | if(str[offset] == '%') |
PBarrett | 32:7716672463b9 | 328 | { |
PBarrett | 32:7716672463b9 | 329 | c = HexDecode(str[offset+2]) | (HexDecode(str[offset+1]) << 4); |
PBarrett | 32:7716672463b9 | 330 | offset+=2; |
PBarrett | 32:7716672463b9 | 331 | |
PBarrett | 32:7716672463b9 | 332 | if (c == 0) |
PBarrett | 32:7716672463b9 | 333 | { |
PBarrett | 32:7716672463b9 | 334 | return 0x1A; // SUB |
PBarrett | 32:7716672463b9 | 335 | } |
PBarrett | 32:7716672463b9 | 336 | |
PBarrett | 32:7716672463b9 | 337 | return c; |
PBarrett | 32:7716672463b9 | 338 | } |
PBarrett | 32:7716672463b9 | 339 | else if(str[offset] == '+') |
PBarrett | 32:7716672463b9 | 340 | { |
PBarrett | 32:7716672463b9 | 341 | return ' '; |
PBarrett | 32:7716672463b9 | 342 | } |
PBarrett | 32:7716672463b9 | 343 | else |
PBarrett | 32:7716672463b9 | 344 | { |
PBarrett | 32:7716672463b9 | 345 | return str[offset]; |
PBarrett | 32:7716672463b9 | 346 | } |
PBarrett | 32:7716672463b9 | 347 | } |
PBarrett | 32:7716672463b9 | 348 | static char HexDecode(char c) |
PBarrett | 32:7716672463b9 | 349 | { |
PBarrett | 32:7716672463b9 | 350 | if(c >= '0' && c <= '9') |
PBarrett | 32:7716672463b9 | 351 | { |
PBarrett | 32:7716672463b9 | 352 | return c - '0'; |
PBarrett | 32:7716672463b9 | 353 | } |
PBarrett | 32:7716672463b9 | 354 | else if(c >= 'A' && c <= 'F') |
PBarrett | 32:7716672463b9 | 355 | { |
PBarrett | 32:7716672463b9 | 356 | return(c - ('A' - 0xA)); |
PBarrett | 32:7716672463b9 | 357 | } |
PBarrett | 32:7716672463b9 | 358 | else if(c >= 'a' && c <= 'f') |
PBarrett | 32:7716672463b9 | 359 | { |
PBarrett | 32:7716672463b9 | 360 | return(c - ('a' - 0xA)); |
PBarrett | 32:7716672463b9 | 361 | } |
PBarrett | 32:7716672463b9 | 362 | else |
PBarrett | 32:7716672463b9 | 363 | { |
PBarrett | 32:7716672463b9 | 364 | return 0x00; |
PBarrett | 32:7716672463b9 | 365 | } |
PBarrett | 32:7716672463b9 | 366 | } |