Some fix and simple optimizations.

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

diff --git a/bertos/net/http.h b/bertos/net/http.h
index 497012953239ba9a6c4ef54e7067a3b563a83d10..15c3035b43deb72c2be59e23f940b7b7f55bea69 100644 (file)
--- a/bertos/net/http.h
+++ b/bertos/net/http.h
@@ -43,33 +43,52 @@
 #ifndef NET_HTTP_H
 #define NET_HTTP_H
 
-
-#include <netif/ethernetif.h>
-
-#include <lwip/ip.h>
-#include <lwip/ip_addr.h>
-#include <lwip/netif.h>
 #include <lwip/tcpip.h>
-#include <lwip/dhcp.h>
+#include <lwip/api.h>
 
 typedef int (*http_handler_t)(struct netconn *client, const char *name, char *revc_buf, size_t revc_len);
 
 typedef struct HttpCGI
 {
-       unsigned type;
-       const char *name;
-       http_handler_t handler;
+       unsigned type;          ///< Strategy to find string in the cgi table.
+       const char *name;       ///< Request string from GET request
+       http_handler_t handler; ///< Callback to process the special request
 } HttpCGI;
 
+enum
+{
+       HTTP_CONTENT_JSON = 0,
+       HTTP_CONTENT_HTML,
+       HTTP_CONTENT_CSS,
+       HTTP_CONTENT_JS,
+       HTTP_CONTENT_PNG,
+       HTTP_CONTENT_JPEG,
+       HTTP_CONTENT_GIF,
+       HTTP_CONTENT_PLAIN,
+
+       HTTP_CONTENT_CNT
+};
+
 #define CGI_MATCH_NONE   0
-#define CGI_MATCH_NAME   1
-#define CGI_MATCH_EXT    2
+#define CGI_MATCH_WORD   1  ///< Select item in table only if string match
+#define CGI_MATCH_EXT    2  ///< Select item in table if the extention match
+#define CGI_MATCH_NAME   3  ///< Select item in table if the string is content
+
+int http_getValue(char *tolenized_buf, size_t tolenized_buf_len, const char *key, char *value, size_t len);
+int http_tokenizeGetRequest(char *raw_buf, size_t raw_len);
+void http_getPageName(const char *recv_buf, size_t recv_len, char *page_name, size_t len);
+size_t http_decodeUrl(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len);
+int http_searchContentType(const char *name);
 
-void http_sendOk(struct netconn *client);
-void http_sendFileNotFound(struct netconn *client);
-void http_sendInternalErr(struct netconn *client);
+void http_sendOk(struct netconn *client, int content_type);
+void http_sendFileNotFound(struct netconn *client, int content_type);
+void http_sendInternalErr(struct netconn *client, int content_type);
 
 void http_poll(struct netconn *server);
 void http_init(http_handler_t default_callback, struct HttpCGI *table);
 
+int http_testSetup(void);
+int http_testRun(void);
+int http_testTearDown(void);
+
 #endif /* NET_HTTP_H */