Added support for editing settings.

Added an lwIP patch.

Author: sysprogs

.gitignore

@@ -1,3 +1,5 @@
 .visualgdb
 .vs
 build
+*.user
+CMakeLists.txt.old

PicoHTTPServer/CMakeLists.txt

@@ -16,7 +16,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 function(add_resource_folder target name path)
 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}.fs ${CMAKE_CURRENT_BINARY_DIR}/__rerun_${name}.fs 
-		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/SimpleFSBuilder/SimpleFSBuilder
+		COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../tools/SimpleFSBuilder/SimpleFSBuilder
 		ARGS ${path} ${CMAKE_CURRENT_BINARY_DIR}/${name}.fs
 		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
 		COMMENT "Generating ${name}.fs")

PicoHTTPServer/PicoHTTPServer.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.3.32811.315
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "PicoHTTPServer", "PicoHTTPServer.vgdbproj", "{ACC40D02-2301-4CA2-816D-2DC4079047DF}"
 EndProject
-Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "SimpleFSBuilder", "tools\SimpleFSBuilder\SimpleFSBuilder.vgdbcmake", "{74B44ADD-7CE6-4F55-929C-FE4C5CEFB6A6}"
+Project("{803FD0C6-D64E-4E16-9DC3-1DAEC859A3D2}") = "SimpleFSBuilder", "..\tools\SimpleFSBuilder\SimpleFSBuilder.vgdbcmake", "{74B44ADD-7CE6-4F55-929C-FE4C5CEFB6A6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

PicoHTTPServer/PicoHTTPServer.vgdbproj

@@ -75,7 +75,12 @@
             <string>com.sysprogs.embedded.semihosting_and_profiler</string>
           </IDs>
           <Config>
-            <Entries />
+            <Entries>
+              <KeyValue>
+                <Key>com.sysprogs.efp.profiling.debugger_check</Key>
+                <Value>SYSPROGS_PROFILER_DEBUGGER_CHECK_MODE=1</Value>
+              </KeyValue>
+            </Entries>
           </Config>
         </ReferencedFrameworks>
       </Extension>

PicoHTTPServer/httpserver.c

@@ -28,6 +28,13 @@ struct _http_connection
 	http_server_instance server;
 	int socket;
 	size_t buffered_size;
+	struct
+	{
+		int buffer_used, buffer_pos;
+		int remaining_input_len;
+		int offset_from_main_buffer;
+	} post;
+	
 	char buffer[1];
 };
 
@@ -52,7 +59,7 @@ static int recv_line(int socket, char *buffer, int buffer_size)
 
 //Read next line using the buffer (multiple lines can be buffered at once).
 //If the line was too long to fit into the buffer, returned length will be negative, but the next line will still get found correctly.
-static char *recv_next_line_buffered(int socket, char *buffer, int buffer_size, int *buffer_used, int *offset, int *len)
+static char *recv_next_line_buffered(int socket, char *buffer, int buffer_size, int *buffer_used, int *offset, int *len, int *recv_limit)
 {
 	int skipped_len = 0;
 	if (*offset > *buffer_used)
@@ -91,10 +98,20 @@ static char *recv_next_line_buffered(int socket, char *buffer, int buffer_size,
 			*offset = 0;
 		}
 
-		int done = recv(socket, buffer + *buffer_used, buffer_size - *buffer_used, 0);
+		int buffer_avail = buffer_size - *buffer_used;
+		if (recv_limit)
+			buffer_avail = MIN(buffer_avail, *recv_limit);
+		
+		if (buffer_avail <= 0)
+			return NULL;
+		
+		int done = recv(socket, buffer + *buffer_used, buffer_avail, 0);
 		if (done <= 0)
 			return NULL;
 
+		if (recv_limit)
+			*recv_limit -= done;
+		
 		*buffer_used += done;		
 	}
 }
@@ -164,6 +181,8 @@ static void parse_and_handle_http_request(http_connection ctx)
 	int header_buf_size = 0, header_buf_pos = 0, header_buf_used = 0;
 	char host[32];
 	host[0] = 0;
+	enum http_request_type reqtype = HTTP_GET;
+	ctx->post.remaining_input_len = ctx->post.buffer_used = ctx->post.buffer_pos = 0;
 
 	if (len)
 	{
@@ -172,6 +191,9 @@ static void parse_and_handle_http_request(http_connection ctx)
 		if (p1)
 			p2 = strchr(++p1, ' ');
 
+		if (!strncasecmp(ctx->buffer, "POST ", 5))
+			reqtype = HTTP_POST;
+		
 		if (p2)
 			p3 = strstr(p2, "\r\n");
 
@@ -195,7 +217,7 @@ static void parse_and_handle_http_request(http_connection ctx)
 
 	for (;;)
 	{
-		char *line = recv_next_line_buffered(ctx->socket, header_buf, header_buf_size, &header_buf_used, &header_buf_pos, &len);
+		char *line = recv_next_line_buffered(ctx->socket, header_buf, header_buf_size, &header_buf_used, &header_buf_pos, &len, NULL);
 		if (!line)
 		{
 			debug_printf("HTTP: unexpected end of headers");
@@ -210,6 +232,18 @@ static void parse_and_handle_http_request(http_connection ctx)
 			memcpy(host, line + 6, len - 6);
 			host[len - 6] = 0;
 		}
+		else if (!strncasecmp(line, "Content-length: ", 16))
+		{
+			ctx->post.remaining_input_len = atoi(line + 16);
+		}
+	}
+	
+	if (reqtype == HTTP_POST && ctx->post.remaining_input_len)
+	{
+		ctx->post.buffer_pos = header_buf_pos;
+		ctx->post.buffer_used = header_buf_used;
+		ctx->post.remaining_input_len -= (header_buf_used - header_buf_pos);
+		ctx->post.offset_from_main_buffer = header_buf - ctx->buffer;
 	}
 
 	debug_printf("HTTP: %s%s\n", host, path);
@@ -248,7 +282,7 @@ static void parse_and_handle_http_request(http_connection ctx)
 				while (path[off] == '/')
 					off++;
 
-				if (zone->handler(ctx, path + off, zone->context))
+				if (zone->handler(ctx, reqtype, path + off, zone->context))
 					return;
 			}
 		}
@@ -412,3 +446,28 @@ void http_server_end_write_reply(http_write_handle handle, const char *footer)
 
 	conn->buffered_size = 0;
 }
+
+char *http_server_read_post_line(http_connection conn)
+{
+	if (conn->post.remaining_input_len <= 0 && conn->post.buffer_pos >= conn->post.buffer_used)
+		return NULL;
+	
+	int len = 0;
+	char *result = recv_next_line_buffered(conn->socket, 
+		conn->buffer + conn->post.offset_from_main_buffer,
+		conn->server->buffer_size - conn->post.offset_from_main_buffer,
+		&conn->post.buffer_used,
+		&conn->post.buffer_pos, 
+		&len,
+		&conn->post.remaining_input_len);
+	
+	if (!result)
+		return NULL;
+	
+	if (len < 0)
+		return NULL;	//Too long line got truncated
+	
+	result[len] = 0;
+	
+	return result;
+}

PicoHTTPServer/httpserver.h

@@ -3,7 +3,13 @@
 typedef struct _http_server_instance *http_server_instance;
 typedef struct _http_connection *http_connection, *http_write_handle;
 
-typedef bool(*http_request_handler)(http_connection conn, char *path, void *context);
+enum http_request_type
+{
+	HTTP_GET  = 0,
+	HTTP_POST = 1,
+};
+
+typedef bool(*http_request_handler)(http_connection conn, enum http_request_type type, char *path, void *context);
 
 typedef struct http_zone
 {
@@ -19,6 +25,10 @@ http_server_instance http_server_create(const char *main_host, const char *main_
 void http_server_add_zone(http_server_instance server, http_zone *instance, const char *prefix, http_request_handler handler, void *context);
 void http_server_send_reply(http_connection conn, const char *code, const char *contentType, const char *content, int size);
 
+/* Reads a single line from the POST request using the internal connection buffer. Returns NULL when the entire request has been read. */
+char *http_server_read_post_line(http_connection conn);
+
+
 http_write_handle http_server_begin_write_reply(http_connection conn, const char *code, const char *contentType);
 void http_server_write_reply(http_write_handle handle, const char *format, ...);
 void http_server_end_write_reply(http_write_handle handle, const char *footer);

PicoHTTPServer/main.c

@@ -1,6 +1,7 @@
 #include <stdarg.h>
 #include <pico/cyw43_arch.h>
 #include <pico/stdlib.h>
+#include <hardware/watchdog.h>
 
 #include <lwip/ip4_addr.h>
 #include <lwip/netif.h>
@@ -13,7 +14,7 @@
 #include "dns/dnsserver.h"
 #include "server_settings.h"
 #include "httpserver.h"
-#include "tools/SimpleFSBuilder/SimpleFS.h"
+#include "../tools/SimpleFSBuilder/SimpleFS.h"
 
 #define TEST_TASK_PRIORITY (tskIDLE_PRIORITY + 2UL)
 
@@ -35,7 +36,7 @@ bool simplefs_init(struct SimpleFSContext *ctx, void *data)
 	return true;
 }
 
-static bool do_retrieve_file(http_connection conn, char *path, void *context)
+static bool do_retrieve_file(http_connection conn, enum http_request_type type, char *path, void *context)
 {
 	for (int i = 0; i < s_SimpleFS.header->EntryCount; i++)
 	{
@@ -53,7 +54,94 @@ static bool do_retrieve_file(http_connection conn, char *path, void *context)
 	return false;
 }
 
-static bool do_handle_api_call(http_connection conn, char *path, void *context)
+static char *parse_server_settings(http_connection conn, pico_server_settings *settings)
+{
+	bool has_password = false, use_domain = false, use_second_ip = false;
+	bool bad_password = false, bad_domain = false;
+	
+	for (;;)
+	{
+		char *line = http_server_read_post_line(conn);
+		if (!line)
+			break;
+				
+		char *p = strchr(line, '=');
+		if (!p)
+			continue;
+		*p++ = 0;
+		if (!strcasecmp(line, "has_password")) 
+			has_password = !strcasecmp(p, "true") || p[0] == '1';
+		else if (!strcasecmp(line, "use_domain")) 
+			use_domain = !strcasecmp(p, "true") || p[0] == '1';
+		else if (!strcasecmp(line, "use_second_ip")) 
+			use_second_ip = !strcasecmp(p, "true") || p[0] == '1';
+		else if (!strcasecmp(line, "ssid")) 
+		{
+			if (strlen(p) >= sizeof(settings->network_name))
+				return "SSID too long";
+			if (!p[0])
+				return "missing SSID";
+			strcpy(settings->network_name, p);
+		}
+		else if (!strcasecmp(line, "password")) 
+		{
+			if (strlen(p) >= sizeof(settings->network_password))
+				bad_password = true;
+			else
+				strcpy(settings->network_password, p);
+		}
+		else if (!strcasecmp(line, "hostname")) 
+		{
+			if (strlen(p) >= sizeof(settings->hostname))
+				return "hostname too long";
+			if (!p[0])
+				return "missing hostname";
+			strcpy(settings->hostname, p);
+		}
+		else if (!strcasecmp(line, "domain")) 
+		{
+			if (strlen(p) >= sizeof(settings->domain_name))
+				bad_domain = true;
+			else
+				strcpy(settings->domain_name, p);
+		}
+		else if (!strcasecmp(line, "ipaddr")) 
+		{
+			settings->ip_address = ipaddr_addr(p);
+			if (!settings->ip_address || settings->ip_address == -1)
+				return "invalid IP address";
+		}
+		else if (!strcasecmp(line, "netmask")) 
+		{
+			settings->network_mask = ipaddr_addr(p);
+			if (!settings->network_mask || settings->network_mask == -1)
+				return "invalid network mask";
+		}
+		else if (!strcasecmp(line, "ipaddr2")) 
+		{
+			settings->secondary_address = ipaddr_addr(p);
+		}
+	}
+	
+	if (!has_password)
+		memset(settings->network_password, 0, sizeof(settings->network_password));
+	else if (bad_password)
+		return "password too long";
+	
+	if (!use_domain)
+		memset(settings->domain_name, 0, sizeof(settings->domain_name));
+	else if (bad_domain)
+		return "domain too long";
+	
+	if (!use_second_ip)
+		settings->secondary_address = 0;
+	else if (!settings->secondary_address || settings->secondary_address == -1)
+		return "invalid secondary IP address";
+	
+	return NULL;
+}
+
+static bool do_handle_api_call(http_connection conn, enum http_request_type type, char *path, void *context)
 {
 	static int s_InitializedMask = 0;
 
@@ -116,13 +204,63 @@ static bool do_handle_api_call(http_connection conn, char *path, void *context)
 			return true;
 		}
 	}
+	else if (!strcmp(path, "settings"))
+	{
+		if (type == HTTP_POST)
+		{
+			static pico_server_settings settings;
+			settings = *get_pico_server_settings();
+
+			char *err = parse_server_settings(conn, &settings);
+			if (err)
+			{
+				http_server_send_reply(conn, "200 OK", "text/plain", err, -1);
+				return true;
+			}
+			
+			write_pico_server_settings(&settings);
+			http_server_send_reply(conn, "200 OK", "text/plain", "OK", -1);
+			watchdog_reboot(0, SRAM_END, 500);			
+			return true;
+		}
+		else
+		{
+			const pico_server_settings *settings = get_pico_server_settings();
+			http_write_handle reply = http_server_begin_write_reply(conn, "200 OK", "text/json");
+			http_server_write_reply(reply, "{\"ssid\": \"%s\"", settings->network_name);
+			http_server_write_reply(reply, ",\"has_password\": %d, \"password\" : \"%s\"", settings->network_password[0] != 0, settings->network_password);
+			http_server_write_reply(reply, ",\"hostname\" : \"%s\"", settings->hostname);
+			http_server_write_reply(reply, ",\"use_domain\": %d, \"domain\" : \"%s\"", settings->domain_name[0] != 0, settings->domain_name);
+			http_server_write_reply(reply, ",\"ipaddr\" : \"%d.%d.%d.%d\"", (settings->ip_address >> 0) & 0xFF, (settings->ip_address >> 8) & 0xFF, (settings->ip_address >> 16) & 0xFF, (settings->ip_address >> 24) & 0xFF);
+			http_server_write_reply(reply, ",\"netmask\" : \"%d.%d.%d.%d\"", (settings->network_mask >> 0) & 0xFF, (settings->network_mask >> 8) & 0xFF, (settings->network_mask >> 16) & 0xFF, (settings->network_mask >> 24) & 0xFF);
+			http_server_write_reply(reply, ",\"use_second_ip\": %d", settings->secondary_address != 0);
+			http_server_write_reply(reply, ",\"ipaddr2\" : \"%d.%d.%d.%d\"", (settings->secondary_address >> 0) & 0xFF, (settings->secondary_address >> 8) & 0xFF, (settings->secondary_address >> 16) & 0xFF, (settings->secondary_address >> 24) & 0xFF);
+
+			http_server_end_write_reply(reply, "}");
+			return true;
+		}
+	}
 
 	return false;
 }
 
 
+static void set_secondary_ip_address(int address)
+{
+	/************************************ !!! WARNING !!! ************************************
+	 * If you get an 'undefined reference to ip4_secondary_ip_address' error here,			 *
+	 * you need to patch your lwIP using the lwip_patch/lwip.patch file from this repository.*
+	 * This ensures that this device can pretend to be a router redirecting requests to		 *
+	 * external IPs to its login page, so the OS can automatically navigate there.			 *
+	 *****************************************************************************************/
+	
+	extern int ip4_secondary_ip_address;
+	ip4_secondary_ip_address = address;
+}
+
 static void main_task(__unused void *params)
 {
+	
 	if (cyw43_arch_init())
 	{
 		printf("failed to initialise\n");
@@ -149,6 +287,7 @@ static void main_task(__unused void *params)
 	static dhcp_server_t dhcp_server;
 	dhcp_server_init(&dhcp_server, &netif->ip_addr, &netif->netmask, settings->domain_name);
 	dns_server_init(netif->ip_addr.addr, settings->secondary_address, settings->hostname, settings->domain_name);
+	set_secondary_ip_address(settings->secondary_address);
 	http_server_instance server = http_server_create(settings->hostname, settings->domain_name, 4, 4096);
 	static http_zone zone1, zone2;
 	http_server_add_zone(server, &zone1, "", do_retrieve_file, NULL);