work on the reporting

Former-commit-id: 22df0fb4780da583ee956c45441fc15e9283eab1

libesphttpd/include/cgiflash.h

@@ -14,9 +14,9 @@ typedef struct {
 	char *tagName;
 } CgiUploadFlashDef;
 
-int cgiReadFlash(HttpdConnData *connData);
-int cgiGetFirmwareNext(HttpdConnData *connData);
-int cgiUploadFirmware(HttpdConnData *connData);
-int cgiRebootFirmware(HttpdConnData *connData);
+httpd_cgi_state cgiReadFlash(HttpdConnData *connData);
+httpd_cgi_state cgiGetFirmwareNext(HttpdConnData *connData);
+httpd_cgi_state cgiUploadFirmware(HttpdConnData *connData);
+httpd_cgi_state cgiRebootFirmware(HttpdConnData *connData);
 
 #endif

libesphttpd/include/cgiwebsocket.h

@@ -27,11 +27,12 @@ struct Websock {
 	WebsockPriv *priv;
 };
 
-int ICACHE_FLASH_ATTR cgiWebsocket(HttpdConnData *connData);
+httpd_cgi_state cgiWebsocket(HttpdConnData *connData);
 int ICACHE_FLASH_ATTR cgiWebsocketSend(Websock *ws, char *data, int len, int flags);
 void ICACHE_FLASH_ATTR cgiWebsocketClose(Websock *ws, int reason);
-int ICACHE_FLASH_ATTR cgiWebSocketRecv(HttpdConnData *connData, char *data, int len);
-int ICACHE_FLASH_ATTR cgiWebsockBroadcast(char *resource, char *data, int len, int flags);
+httpd_cgi_state cgiWebSocketRecv(HttpdConnData *connData, char *data, int len);
+
+//int ICACHE_FLASH_ATTR cgiWebsockBroadcast(char *resource, char *data, int len, int flags);
 
 
-#endif
+#endif

libesphttpd/include/cgiwifi.h

@@ -3,11 +3,11 @@
 
 #include "httpd.h"
 
-int cgiWiFiScan(HttpdConnData *connData);
-int tplWlan(HttpdConnData *connData, char *token, void **arg);
-int cgiWiFi(HttpdConnData *connData);
-int cgiWiFiConnect(HttpdConnData *connData);
-int cgiWiFiSetMode(HttpdConnData *connData);
-int cgiWiFiConnStatus(HttpdConnData *connData);
+httpd_cgi_state cgiWiFiScan(HttpdConnData *connData);
+httpd_cgi_state tplWlan(HttpdConnData *connData, char *token, void **arg);
+httpd_cgi_state cgiWiFi(HttpdConnData *connData);
+httpd_cgi_state cgiWiFiConnect(HttpdConnData *connData);
+httpd_cgi_state cgiWiFiSetMode(HttpdConnData *connData);
+httpd_cgi_state cgiWiFiConnStatus(HttpdConnData *connData);
 
-#endif
+#endif

libesphttpd/include/httpd.h

@@ -5,26 +5,34 @@
 
 #define HTTPDVER "0.4-based"
 
-#define HTTPD_CGI_MORE 0
-#define HTTPD_CGI_DONE 1
-#define HTTPD_CGI_NOTFOUND 2
-#define HTTPD_CGI_AUTHENTICATED 3
+typedef enum {
+	HTTPD_CGI_MORE = 0,
+	HTTPD_CGI_DONE = 1,
+	HTTPD_CGI_NOTFOUND = 2,
+	HTTPD_CGI_AUTHENTICATED = 3,
+} httpd_cgi_state;
 
-#define HTTPD_METHOD_GET 1
-#define HTTPD_METHOD_POST 2
-#define HTTPD_METHOD_OPTIONS 3
+typedef enum {
+	HTTPD_METHOD_GET = 1,
+	HTTPD_METHOD_POST = 2,
+	HTTPD_METHOD_OPTIONS = 3,
+	HTTPD_METHOD_PUT = 4,
+	HTTPD_METHOD_DELETE = 5,
+	HTTPD_METHOD_PATCH = 6,
+	HTTPD_METHOD_HEAD = 7,
+} http_method;
 
 typedef struct HttpdPriv HttpdPriv;
 typedef struct HttpdConnData HttpdConnData;
 typedef struct HttpdPostData HttpdPostData;
 
-typedef int (* cgiSendCallback)(HttpdConnData *connData);
-typedef int (* cgiRecvHandler)(HttpdConnData *connData, char *data, int len);
+typedef httpd_cgi_state (* cgiSendCallback)(HttpdConnData *connData);
+typedef httpd_cgi_state (* cgiRecvHandler)(HttpdConnData *connData, char *data, int len);
 
 //A struct describing a http connection. This gets passed to cgi functions.
 struct HttpdConnData {
 	ConnTypePtr conn;		// The TCP connection. Exact type depends on the platform.
-	char requestType;		// One of the HTTPD_METHOD_* values
+	http_method requestType; // method type
 	char *url;				// The URL requested, without hostname or GET arguments
 	char *getArgs;			// The GET arguments for this request, if any.
 
@@ -89,9 +97,10 @@ typedef struct {
 
 
 
-int cgiRedirect(HttpdConnData *connData);
-int cgiRedirectToHostname(HttpdConnData *connData);
-int cgiRedirectApClientToHostname(HttpdConnData *connData);
+httpd_cgi_state cgiRedirect(HttpdConnData *connData);
+httpd_cgi_state cgiRedirectToHostname(HttpdConnData *connData);
+httpd_cgi_state cgiRedirectApClientToHostname(HttpdConnData *connData);
+
 void httpdRedirect(HttpdConnData *conn, char *newUrl);
 int httpdUrlDecode(char *val, int valLen, char *ret, int retLen);
 int httpdFindArg(char *line, char *arg, char *buff, int buffLen);

libesphttpd/include/httpdespfs.h

@@ -4,12 +4,12 @@
 #include "httpd.h"
 
 /** Catch-all, use in '*' routes */
-int cgiEspFsHook(HttpdConnData *connData);
+httpd_cgi_state cgiEspFsHook(HttpdConnData *connData);
 
 /** Template route */
-int ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData);
+httpd_cgi_state ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData);
 
 /** Static file route with the file as the first arg. */
-int ICACHE_FLASH_ATTR cgiEspFsFile(HttpdConnData *connData);
+httpd_cgi_state ICACHE_FLASH_ATTR cgiEspFsFile(HttpdConnData *connData);
 
 #endif