/* skip key */
p += token_len + 1;
- http_decodeUrl(p, strlen(p), decoded_str, sizeof(decoded_str));
- value_len = strlen(decoded_str);
+ value_len = http_decodeUrl(p, strlen(p), decoded_str, sizeof(decoded_str));
if (value_len >= len)
return -1;
return strtol(hex, &stop, 16);
}
-void http_decodeUrl(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len)
+size_t http_decodeUrl(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len)
{
ASSERT(decodec_buf);
char value;
+ size_t i;
memset(decodec_buf, 0, len);
- for (size_t i = 0; i < raw_len; i++)
+ for (i = 0; i < raw_len; i++)
{
- if (!len)
- return;
+ if (len <= 1)
+ return i;
if (raw_buf[i] == '%')
{
*decodec_buf++ = (raw_buf[i] == '+' ? ' ' : raw_buf[i]);
len--;
}
+
+ return i;
}
void http_getPageName(const char *recv_buf, size_t recv_len, char *page_name, size_t len)
INLINE const char *get_ext(const char *name)
{
const char *ext = strstr(name, ".");
- if(ext && (ext + 1))
+ if(ext != NULL && ext[1] != '\0')
return (ext + 1);
return NULL;
{
ASSERT(content_type < HTTP_CONTENT_CNT);
- netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_COPY);
+ netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY);
netconn_write(client, http_content_type[content_type].content,
- strlen(http_content_type[content_type].content), NETCONN_COPY);
+ strlen(http_content_type[content_type].content), NETCONN_NOCOPY);
}
{
ASSERT(content_type < HTTP_CONTENT_CNT);
- netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_COPY);
+ netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY);
netconn_write(client, http_content_type[content_type].content,
- strlen(http_content_type[content_type].content), NETCONN_COPY);
+ strlen(http_content_type[content_type].content), NETCONN_NOCOPY);
}
/**
{
ASSERT(content_type < HTTP_CONTENT_CNT);
- netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_COPY);
+ netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY);
netconn_write(client, http_content_type[content_type].content,
- strlen(http_content_type[content_type].content), NETCONN_COPY);
+ strlen(http_content_type[content_type].content), NETCONN_NOCOPY);
}
static http_handler_t cgi_search(const char *name, HttpCGI *table)
if (!strcmp(table[i].name, ext))
{
- LOG_INFO("Match all ext %s\n", ext);
+ LOG_INFO("Match ext: %s\n", ext);
break;
}
}
if (strstr(name, table[i].name) != NULL)
{
- LOG_INFO("Match all name %s\n", name);
+ LOG_INFO("Match string: %s\n", name);
break;
}
}
if (!strcmp(table[i].name, name))
{
- LOG_INFO("Match all word %s\n", name);
+ LOG_INFO("Word match: %s\n", name);
break;
}
}
memset(req_string, 0, sizeof(req_string));
http_getPageName(rx_buf, len, req_string, sizeof(req_string));
- LOG_INFO("Search %s\n", req_string);
if (req_string[0] == '\0')
strcpy(req_string, HTTP_DEFAULT_PAGE);