Check if the return buffer is biggest enough.

[bertos.git] / bertos / net / http.c

diff --git a/bertos/net/http.c b/bertos/net/http.c
index 8941105232539e0afcebfab0cdef99d9b0f7aaab..dd4ee4fd22ffdcdda57f3efba7174f47b39c06d5 100644 (file)
--- a/bertos/net/http.c
+++ b/bertos/net/http.c
@@ -55,6 +55,7 @@
 #include <cfg/log.h>
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 
@@ -65,47 +66,59 @@ static const char http_html_hdr_500[] = "HTTP/1.1 500 Internal Server Error\r\nC
 static HttpCGI *cgi_table;
 static http_handler_t http_callback;
 
-/**
- * Send on \param client socket
- * the 200 Ok http header
- */
-void http_sendOk(struct netconn *client)
-{
-       netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY);
-}
 
-
-/**
- * Send on \param client socket
- * the 404 File not found http header
- */
-void http_sendFileNotFound(struct netconn *client)
+static char http_hexToAscii(char first, char second)
 {
-       netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY);
+       char hex[5], *stop;
+       hex[0] = '0';
+       hex[1] = 'x';
+       hex[2] = first;
+       hex[3] = second;
+       hex[4] = 0;
+       return strtol(hex, &stop, 16);
 }
 
-/**
- * Send on \param client socket
- * the 500 internal server error http header
- */
-void http_sendInternalErr(struct netconn *client)
+void http_decodeUri(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len)
 {
-       netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY);
+       char value;
+       for (size_t i = 0; i < raw_len; i++)
+       {
+               if (!len)
+                       return;
+
+               if (raw_buf[i] == '%')
+               {
+                       if (i + 2 < raw_len)
+                       {
+                               /* convert hex value after % */
+                               value = http_hexToAscii(raw_buf[i + 1], raw_buf[i + 2]);
+                               if (value)
+                               {
+                                       *decodec_buf++ = value;
+                                       len--;
+                                       i += 2;
+                                       continue;
+                               }
+                       }
+               }
+               *decodec_buf++ = raw_buf[i];
+               len--;
+       }
 }
 
-void http_getPageName(const char *revc_buf, size_t recv_len, char *page_name, size_t len)
+void http_getPageName(const char *recv_buf, size_t recv_len, char *page_name, size_t len)
 {
        int i = 0;
        bool str_ok = false;
 
-       if (revc_buf && (recv_len > sizeof("GET /")))
+       if (recv_buf && (recv_len > sizeof("GET /")))
        {
-               if (*revc_buf++ == 'G' &&
-                       *revc_buf++ == 'E' && *revc_buf++ == 'T')
+               if (*recv_buf++ == 'G' &&
+                       *recv_buf++ == 'E' && *recv_buf++ == 'T')
                        {
                                str_ok = true;
                                /* skip the space and "/" */
-                               revc_buf += 2;
+                               recv_buf += 2;
                        }
        }
 
@@ -113,7 +126,7 @@ void http_getPageName(const char *revc_buf, size_t recv_len, char *page_name, si
        {
                while ((size_t)i < recv_len)
                {
-                       char ch = *(revc_buf++);
+                       char ch = *(recv_buf++);
                        if (ch == ' ' || ch == '\t' || ch == '\n')
                                break;
                        if((size_t)i == len - 1)
@@ -134,6 +147,35 @@ INLINE const char *get_ext(const char *name)
        return NULL;
 }
 
+
+/**
+ * Send on \param client socket
+ * the 200 Ok http header
+ */
+void http_sendOk(struct netconn *client)
+{
+       netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY);
+}
+
+
+/**
+ * Send on \param client socket
+ * the 404 File not found http header
+ */
+void http_sendFileNotFound(struct netconn *client)
+{
+       netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY);
+}
+
+/**
+ * Send on \param client socket
+ * the 500 internal server error http header
+ */
+void http_sendInternalErr(struct netconn *client)
+{
+       netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY);
+}
+
 static http_handler_t cgi_search(const char *name,  HttpCGI *table)
 {
        if (!table)