#include <string.h>
-static const char http_html_hdr_200[] = "HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n";
-static const char http_html_hdr_404[] = "HTTP/1.1 404 Not Found\r\nContent-type: text/html\r\n\r\n";
-static const char http_html_hdr_500[] = "HTTP/1.1 500 Internal Server Error\r\nContent-type: text/html\r\n\r\n";
+static const char http_html_hdr_200[] = "HTTP/1.0 200 OK\r\nContent-type: text/html\r\n\r\n";
+static const char http_html_hdr_404[] = "HTTP/1.0 404 Not Found\r\nContent-type: text/html\r\n\r\n";
+static const char http_html_hdr_500[] = "HTTP/1.0 500 Internal Server Error\r\nContent-type: text/html\r\n\r\n";
static HttpCGI *cgi_table;
static http_handler_t http_callback;
+static char decoded_str[80];
+/**
+ * Get key value from tokenized buffer
+ */
+int http_getValue(char *tolenized_buf, size_t tolenized_buf_len, const char *key, char *value, size_t len)
+{
+ if (!tolenized_buf || !key || !value)
+ return -1;
+
+ char *p = tolenized_buf;
+ size_t value_len = 0;
+
+ memset(value, 0, len);
+
+ for (size_t i = 0; i < tolenized_buf_len; i++)
+ {
+ size_t token_len = strlen(p);
+ http_decodeUrl(p, token_len, decoded_str, sizeof(decoded_str));
+
+ if (!strcmp(key, decoded_str))
+ {
+ /* skip key */
+ p += token_len + 1;
+
+ http_decodeUrl(p, strlen(p), decoded_str, sizeof(decoded_str));
+ value_len = strlen(decoded_str);
+
+ if (value_len >= len)
+ return -1;
+
+ strcpy(value, decoded_str);
+ break;
+ }
+ /* jump to next pair */
+ p += token_len + 1;
+ }
+
+ return value_len;
+}
+
+/**
+ * tokenize a buffer
+ */
+int http_tokenizeGetRequest(char *raw_buf, size_t raw_len)
+{
+ size_t token = 0;
+
+ for(size_t i = 0; (i < raw_len) && raw_buf; i++)
+ {
+ if (raw_buf[i] == '&')
+ {
+ token++;
+ raw_buf[i] = '\0';
+ }
+
+ if (raw_buf[i] == '=')
+ raw_buf[i] = '\0';
+ }
+
+ return token + 1;
+}
static char http_hexToAscii(char first, char second)
{
return strtol(hex, &stop, 16);
}
-void http_decodeUri(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len)
+void http_decodeUrl(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len)
{
+ ASSERT(decodec_buf);
+
char value;
+ memset(decodec_buf, 0, len);
+
for (size_t i = 0; i < raw_len; i++)
{
if (!len)
{
*decodec_buf++ = value;
len--;
+ /* decoded two digit of hex value, go to next value*/
i += 2;
continue;
}
}
}
- *decodec_buf++ = raw_buf[i];
+
+ /* Manage special case of '+', that it should be convert in space */
+ *decodec_buf++ = (raw_buf[i] == '+' ? ' ' : raw_buf[i]);
len--;
}
}
{
int i = 0;
bool str_ok = false;
-
- if (recv_buf && (recv_len > sizeof("GET /")))
+ const char *p = recv_buf;
+ if (p && (recv_len > sizeof("GET /")))
{
- if (*recv_buf++ == 'G' &&
- *recv_buf++ == 'E' && *recv_buf++ == 'T')
- {
- str_ok = true;
- /* skip the space and "/" */
- recv_buf += 2;
- }
+ if (*p++ == 'G' && *p++ == 'E' && *p++ == 'T')
+ {
+ str_ok = true;
+ /* skip the space and "/" */
+ p += 2;
+ }
}
if (str_ok)
{
while ((size_t)i < recv_len)
{
- char ch = *(recv_buf++);
+ char ch = *(p++);
if (ch == ' ' || ch == '\t' || ch == '\n')
break;
if((size_t)i == len - 1)