Big-arse structure change: readying esphttpd for a split into a library and an usage example

libesphttpd/include/auth.h

@@ -0,0 +1,22 @@
+#ifndef AUTH_H
+#define AUTH_H
+
+#include "httpd.h"
+
+#ifndef HTTP_AUTH_REALM
+#define HTTP_AUTH_REALM "Protected"
+#endif
+
+#define HTTPD_AUTH_SINGLE 0
+#define HTTPD_AUTH_CALLBACK 1
+
+#define AUTH_MAX_USER_LEN 32
+#define AUTH_MAX_PASS_LEN 32
+
+//Parameter given to authWhatever functions. This callback returns the usernames/passwords the device
+//has.
+typedef int (* AuthGetUserPw)(HttpdConnData *connData, int no, char *user, int userLen, char *pass, int passLen);
+
+int ICACHE_FLASH_ATTR authBasic(HttpdConnData *connData);
+
+#endif

libesphttpd/include/captdns.h

@@ -0,0 +1,5 @@
+#ifndef CAPTDNS_H
+#define CAPTDNS_H
+void ICACHE_FLASH_ATTR captdnsInit(void);
+
+#endif

libesphttpd/include/cgiflash.h

@@ -0,0 +1,9 @@
+#ifndef CGIFLASH_H
+#define CGIFLASH_H
+
+#include "httpd.h"
+
+int cgiReadFlash(HttpdConnData *connData);
+int cgiUploadEspfs(HttpdConnData *connData);
+
+#endif

libesphttpd/include/cgiwifi.h

@@ -0,0 +1,13 @@
+#ifndef CGIWIFI_H
+#define CGIWIFI_H
+
+#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);
+
+#endif

libesphttpd/include/esp8266.h

@@ -0,0 +1,18 @@
+// Combined include file for esp8266
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <c_types.h>
+#include <ip_addr.h>
+#include <espconn.h>
+#include <ets_sys.h>
+#include <gpio.h>
+#include <mem.h>
+#include <osapi.h>
+#include <user_interface.h>
+
+#include "espmissingincludes.h"
+

libesphttpd/include/espfs.h

@@ -0,0 +1,23 @@
+#ifndef ESPFS_H
+#define ESPFS_H
+
+// This define is done in Makefile. If you do not use default Makefile, uncomment
+// to be able to use Heatshrink-compressed espfs images.
+//#define ESPFS_HEATSHRINK
+
+typedef enum {
+	ESPFS_INIT_RESULT_OK,
+	ESPFS_INIT_RESULT_NO_IMAGE,
+	ESPFS_INIT_RESULT_BAD_ALIGN,
+} EspFsInitResult;
+
+typedef struct EspFsFile EspFsFile;
+
+EspFsInitResult espFsInit(void *flashAddress);
+EspFsFile *espFsOpen(char *fileName);
+int espFsFlags(EspFsFile *fh);
+int espFsRead(EspFsFile *fh, char *buff, int len);
+void espFsClose(EspFsFile *fh);
+
+
+#endif

libesphttpd/include/espmissingincludes.h

@@ -0,0 +1,60 @@
+#ifndef ESPMISSINGINCLUDES_H
+#define ESPMISSINGINCLUDES_H
+
+#include <stdint.h>
+#include <c_types.h>
+#include <ets_sys.h>
+#include <eagle_soc.h>
+
+//Missing function prototypes in include folders. Gcc will warn on these if we don't define 'em anywhere.
+//MOST OF THESE ARE GUESSED! but they seem to swork and shut up the compiler.
+typedef struct espconn espconn;
+
+int atoi(const char *nptr);
+void ets_install_putc1(void *routine);
+void ets_isr_attach(int intr, void *handler, void *arg);
+void ets_isr_mask(unsigned intr);
+void ets_isr_unmask(unsigned intr);
+int ets_memcmp(const void *s1, const void *s2, size_t n);
+void *ets_memcpy(void *dest, const void *src, size_t n);
+void *ets_memset(void *s, int c, size_t n);
+int ets_sprintf(char *str, const char *format, ...)  __attribute__ ((format (printf, 2, 3)));
+int ets_str2macaddr(void *, void *);
+int ets_strcmp(const char *s1, const char *s2);
+char *ets_strcpy(char *dest, const char *src);
+size_t ets_strlen(const char *s);
+int ets_strncmp(const char *s1, const char *s2, int len);
+char *ets_strncpy(char *dest, const char *src, size_t n);
+char *ets_strstr(const char *haystack, const char *needle);
+void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
+void ets_timer_disarm(ETSTimer *a);
+void ets_timer_setfn(ETSTimer *t, ETSTimerFunc *fn, void *parg);
+void ets_update_cpu_frequency(int freqmhz);
+int os_printf(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
+int os_snprintf(char *str, size_t size, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
+int os_printf_plus(const char *format, ...)  __attribute__ ((format (printf, 1, 2)));
+void pvPortFree(void *ptr);
+void *pvPortMalloc(size_t xWantedSize);
+void *pvPortZalloc(size_t);
+void uart_div_modify(int no, unsigned int freq);
+void vPortFree(void *ptr);
+void *vPortMalloc(size_t xWantedSize);
+uint8 wifi_get_opmode(void);
+uint32 system_get_time();
+int rand(void);
+void ets_bzero(void *s, size_t n);
+void ets_delay_us(int ms);
+
+
+//Standard PIN_FUNC_SELECT gives a warning. Replace by a non-warning one.
+#ifdef PIN_FUNC_SELECT
+#undef PIN_FUNC_SELECT
+#define PIN_FUNC_SELECT(PIN_NAME, FUNC)  do { \
+    WRITE_PERI_REG(PIN_NAME,   \
+                                (READ_PERI_REG(PIN_NAME) \
+                                     &  (~(PERIPHS_IO_MUX_FUNC<<PERIPHS_IO_MUX_FUNC_S)))  \
+                                     |( (((FUNC&BIT2)<<2)|(FUNC&0x3))<<PERIPHS_IO_MUX_FUNC_S) );  \
+    } while (0)
+#endif
+
+#endif

libesphttpd/include/httpd.h

@@ -0,0 +1,67 @@
+#ifndef HTTPD_H
+#define HTTPD_H
+
+#define HTTPDVER "0.3"
+
+#define HTTPD_CGI_MORE 0
+#define HTTPD_CGI_DONE 1
+#define HTTPD_CGI_NOTFOUND 2
+#define HTTPD_CGI_AUTHENTICATED 3
+
+#define HTTPD_METHOD_GET 1
+#define HTTPD_METHOD_POST 2
+
+
+typedef struct HttpdPriv HttpdPriv;
+typedef struct HttpdConnData HttpdConnData;
+typedef struct HttpdPostData HttpdPostData;
+
+typedef int (* cgiSendCallback)(HttpdConnData *connData);
+
+//A struct describing a http connection. This gets passed to cgi functions.
+struct HttpdConnData {
+	struct espconn *conn;
+	char requestType;
+	char *url;
+	char *getArgs;
+	const void *cgiArg;
+	void *cgiData;
+	void *cgiPrivData; // Used for streaming handlers storing state between requests
+	char *hostName;
+	HttpdPriv *priv;
+	cgiSendCallback cgi;
+	HttpdPostData *post;
+};
+
+//A struct describing the POST data sent inside the http connection.  This is used by the CGI functions
+struct HttpdPostData {
+	int len; // POST Content-Length
+	int buffSize; // The maximum length of the post buffer
+	int buffLen; // The amount of bytes in the current post buffer
+	int received; // The total amount of bytes received so far
+	char *buff; // Actual POST data buffer
+	char *multipartBoundary;
+};
+
+//A struct describing an url. This is the main struct that's used to send different URL requests to
+//different routines.
+typedef struct {
+	const char *url;
+	cgiSendCallback cgiCb;
+	const void *cgiArg;
+} HttpdBuiltInUrl;
+
+int ICACHE_FLASH_ATTR cgiRedirect(HttpdConnData *connData);
+int ICACHE_FLASH_ATTR cgiCheckHostname(HttpdConnData *connData);
+void ICACHE_FLASH_ATTR httpdRedirect(HttpdConnData *conn, char *newUrl);
+int httpdUrlDecode(char *val, int valLen, char *ret, int retLen);
+int ICACHE_FLASH_ATTR httpdFindArg(char *line, char *arg, char *buff, int buffLen);
+void ICACHE_FLASH_ATTR httpdInit(HttpdBuiltInUrl *fixedUrls, int port);
+const char *httpdGetMimetype(char *url);
+void ICACHE_FLASH_ATTR httpdStartResponse(HttpdConnData *conn, int code);
+void ICACHE_FLASH_ATTR httpdHeader(HttpdConnData *conn, const char *field, const char *val);
+void ICACHE_FLASH_ATTR httpdEndHeaders(HttpdConnData *conn);
+int ICACHE_FLASH_ATTR httpdGetHeader(HttpdConnData *conn, char *header, char *ret, int retLen);
+int ICACHE_FLASH_ATTR httpdSend(HttpdConnData *conn, const char *data, int len);
+
+#endif

libesphttpd/include/httpdespfs.h

@@ -0,0 +1,9 @@
+#ifndef HTTPDESPFS_H
+#define HTTPDESPFS_H
+
+#include "httpd.h"
+
+int cgiEspFsHook(HttpdConnData *connData);
+int ICACHE_FLASH_ATTR cgiEspFsTemplate(HttpdConnData *connData);
+
+#endif

libesphttpd/include/user_config.h

@@ -0,0 +1 @@
+