MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
nodemcu-firmware/app/modules/enduser_setup.c

1542 lines
49 KiB
C
Raw Normal View History

Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
/*
* Copyright 2015 Robert Foss. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the copyright holders nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*
* @author Robert Foss <dev@robertfoss.se>
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
*
* Additions & fixes: Johny Mattsson <jmattsson@dius.com.au>
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
*/
Reworked module registration, removed modules.h Module creation & registration now made a lot simpler. In essence, each module file is now self-contained and only needs a NODEMCU_MODULE(MYNAME, "myname", myname_map, luaopen_myname); line to both be automatically recognised by the Lua initialization as well as honor the LUA_USE_MODULES_MYNAME #define.
2015-12-16 06:04:58 +01:00
#include "module.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#include "lauxlib.h"
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
#include "lmem.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#include "platform.h"
#include "c_stdlib.h"
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
#include "c_stdio.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#include "c_string.h"
Enable -std=gnu11 for modules dir. Plus boat-load of fixes to actually make that build.
2016-01-20 09:37:03 +01:00
#include "ctype.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#include "user_interface.h"
#include "espconn.h"
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
#include "lwip/tcp.h"
#include "lwip/pbuf.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#include "flash_fs.h"
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
#include "task/task.h"
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
#define LITLEN(strliteral) (sizeof (strliteral) -1)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
#define ENDUSER_SETUP_ERR_FATAL (1 << 0)
#define ENDUSER_SETUP_ERR_NONFATAL (1 << 1)
#define ENDUSER_SETUP_ERR_NO_RETURN (1 << 2)
#define ENDUSER_SETUP_ERR_OUT_OF_MEMORY 1
#define ENDUSER_SETUP_ERR_CONNECTION_NOT_FOUND 2
#define ENDUSER_SETUP_ERR_UNKOWN_ERROR 3
#define ENDUSER_SETUP_ERR_SOCKET_ALREADY_OPEN 4
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
/**
* DNS Response Packet:
*
* |DNS ID - 16 bits|
* |dns_header|
* |QNAME|
* |dns_body|
* |ip - 32 bits|
*
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
* DNS Header Part | FLAGS | | Q COUNT | | A CNT | |AUTH CNT| | ADD CNT| */
static const char dns_header[] = { 0x80, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 };
/* DNS Query Part | Q TYPE | | Q CLASS| */
static const char dns_body[] = { 0x00, 0x01, 0x00, 0x01,
/* DNS Answer Part |LBL OFFS| | TYPE | | CLASS | | TTL | | RD LEN | */
0xC0, 0x0C, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x78, 0x00, 0x04 };
Change index.html to eus-index.html
2016-03-29 17:25:05 +02:00
static const char http_html_filename[] = "enduser_setup.html";
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
static const char http_header_200[] = "HTTP/1.1 200 OK\r\nCache-control:no-cache\r\nContent-Type: text/html\r\n"; /* Note single \r\n here! */
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static const char http_header_204[] = "HTTP/1.1 204 No Content\r\n\r\n";
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
static const char http_header_302[] = "HTTP/1.1 302 Moved\r\nLocation: /\r\n\r\n";
static const char http_header_401[] = "HTTP/1.1 401 Bad request\r\n\r\n";
static const char http_header_404[] = "HTTP/1.1 404 Not found\r\n\r\n";
static const char http_header_500[] = "HTTP/1.1 500 Internal Error\r\n\r\n";
/* The below is the un-minified version of the http_html_backup[] string.
* Minified using https://kangax.github.io/html-minifier/
* Note: using method="get" due to iOS not always sending body in same
* packet as the HTTP header, and us thus missing it in that case
*/
#if 0
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta charset="utf-8">
<meta name="viewport" content="width=380">
<title>WiFi Login</title>
<style media="screen" type="text/css">
*{margin:0;padding:0}
html{height:100%;background:linear-gradient(rgba(196,102,0,.2),rgba(155,89,182,.2)),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAA8AgMAAACm+SSwAAAADFBMVEVBR1FFS1VHTlg8Q0zU/YXIAAADVElEQVQ4yy1TTYvTUBQ9GTKiYNoodsCF4MK6U4TZChOhiguFWHyBFzqlLl4hoeNvEBeCrlrhBVKq1EUKLTP+hvi1GyguXqBdiZCBzGqg20K8L3hDQnK55+OeJNguHx6UujYl3dL5ALn4JOIUluAqeAWciyGaSdvngOWzNT+G0UyGUOxVOAdqkjXDCbBiUyjZ5QzYEbGadYAi6kHxth+kthXNVNCDofwhGv1D4QGGiM9iAjbCHgr2iUUpDJbs+VPQ4xAr2fX7KXbkOJMdok965Ksb+6lrjdkem8AshIuHm9Nyu19uTunYlOXDTQqi8VgeH0kBXH2xq/ouiMZPzuMukymutrBmulUTovC6HqNFW2ZOiqlpSXZOTvSUeUPxChjxol8BLbRy4gJuhV7OR4LRVBs3WQ9VVAU7SXgK2HeUrOj7bC8YsUgr3lEV/TXB7hK90EBnxaeg1Ov15bY80M736ekCGesGAaGvG0Ct4WRkVQVHIgIM9xJgvSFfPay8Q6GNv7VpR7xUnkvhnMQCJDYkYOtNLihV70tCU1Sk+BQrpoP+HLHUrJkuta40C6LP5GvBv+Hqo10ATxxFrTPvNdPr7XwgQud6RvQN/sXjBGzqbU27wcj9cgsyvSTrpyXV8gKpXeNJU3aFl7MOdldzV4+HfO19jBa5f2IjWwx1OLHIvFHkqbBj20ro1g7nDfY1DpScvDRUNARgjMMVO0zoMjKxJ6uWCPP+YRAWbGoaN8kXYHmLjB9FXLGOazfFVCvOgqzfnicNPrHtPKlex2ye824gMza0cTZ2sS2Xm7Qst/UfFw8O6vVtmUKxZy9xFgzMys5cJ5fxZw4y37Ufk1Dsfb8MqOjYxE3ZMWxiDcO0PYUaD2ys+8OW1pbB7/e3sfZeGVCL0Q2aMjjPdm2sxADuejZxHJAd8dO9DSUdA0V8/NggRRanDkBrANn8yHlEQOn/MmwoQfQF7xgmKDnv520bS/pgylP67vf3y2V5sCwfoCEMkZClgOfJAFX9eXefR2RpnmRs4CDVPceaRfoFzCkJVJX27vWZnoqyvmtXU3+dW1EIXIu8Qg5Qta4Zlv7drUCoWe8/8MXzaEwux7ESE9h6qnHj3mIO0/D9RvzfxPmjWiQ1vbeSk4rrHwhAre35EEVaAAAAAElFTkSuQmCC)}
body{font-family:arial,verdana}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
div{position:absolute;margin:auto;top:-150px;right:0;bottom:0;left:0;width:320px;height:304px}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
form{width:320px;text-align:center;position:relative}
form fieldset{background:#fff;border:0 none;border-radius:5px;box-shadow:0 0 15px 1px rgba(0,0,0,.4);padding:20px 30px;box-sizing:border-box}
form input{padding:15px;border:1px solid #ccc;border-radius:3px;margin-bottom:10px;width:100%;box-sizing:border-box;font-family:montserrat;color:#2C3E50;font-size:13px}
form .action-button{border:0 none;border-radius:3px;cursor:pointer;}
#msform .submit:focus,form .action-button:hover{box-shadow:0 0 0 2px #fff,0 0 0 3px #27AE60;}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
#formFrame{display: none;}
#aplist{display: block;}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
select{width:100%;margin-bottom: 20px;padding: 10px 5px; border:1px solid #ccc;display:none;}
.fs-title{font-size:15px;text-transform:uppercase;color:#2C3E50;margin-bottom:10px}
.fs-subtitle{font-weight:400;font-size:13px;color:#666;margin-bottom:20px}
.fs-status{font-weight:400;font-size:13px;color:#666;margin-bottom:10px;padding-top:20px; border-top:1px solid #ccc}
.submit{width:100px;background: #27AE60; color: #fff;font-weight:700;margin:10px 5px; padding: 10px 5px; }
</style>
</head>
<body>
<div>
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
<form id="credentialsForm" method="get" action="/update" target="formFrame">
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
<fieldset>
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
<iframe id="formFrame" src="" name="formFrame"></iframe> <!-- Used to submit data, needed to prevent re-direction after submission -->
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
<h2 class="fs-title">WiFi Login</h2>
<h3 class="fs-subtitle">Connect gadget to your WiFi network</h3>
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
<input id="wifi_ssid" autocorrect="off" autocapitalize="none" name="wifi_ssid" placeholder="WiFi Name">
<select id="aplist" name="aplist" size="1" disabled>
<option>Scanning for networks...</option>
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
</select>
<input name="wifi_password" placeholder="Password" type="password">
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
<input type=submit name=save class="action-button submit" value="Save">
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
<h3 class="fs-status">Status: <span id="status">Updating...</span></h3>
</fieldset>
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
<h3 id="dbg"></h3>
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
</form>
</div>
<script>
function fetch(url, method, callback)
{
var xhr = new XMLHttpRequest();
xhr.onreadystatechange=check_ready;
function check_ready()
{
if (xhr.readyState === 4)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
callback(xhr.status === 200 ? xhr.responseText : null);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
xhr.open(method, url, true);
xhr.send();
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
function new_status(stat)
{
if (stat)
{
var e = document.getElementById("status");
e.innerHTML = stat;
}
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
function new_status_repeat(stat)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
new_status(stat);
setTimeout(refresh_status, 750);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
function new_ap_list(json)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
if (json)
{
var list = JSON.parse(json);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
list.sort(function(a, b){ return b.rssi - a.rssi; });
var ssids = list.map(function(a) { return a.ssid; }).filter(function(item, pos, self) { return self.indexOf(item)==pos; });
var sel = document.getElementById("aplist");
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
sel.innerHTML = "";
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
sel.setAttribute("size", Math.max(Math.min(3, list.length), 1));
sel.removeAttribute("disabled");
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
for (var i = 0; i < ssids.length; ++i)
{
var o = document.createElement("option");
o.innerHTML = ssids[i];
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
sel.options.add(o);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
sel.style.display = 'block';
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
function new_ap_list_repeat(json)
{
new_ap_list(json);
setTimeout(refresh_ap_list, 3000);
}
function refresh_status()
{
fetch('/status','GET', new_status_repeat);
}
function refresh_ap_list()
{
fetch('/aplist','GET', new_ap_list_repeat);
}
Fix SSID selection box when aplist only has one entry.
2016-03-30 16:57:30 +02:00
function set_ssid_field() {
var sel = document.getElementById("aplist");
document.getElementById("wifi_ssid").value = sel.value;
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
window.onload = function()
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
refresh_status();
refresh_ap_list();
Fix SSID selection box when aplist only has one entry.
2016-03-30 16:57:30 +02:00
document.getElementById("aplist").onclick = set_ssid_field;
Improve previous EUS JS select fix to work better on mobile UIs.
2016-04-01 03:26:22 +02:00
document.getElementById("aplist").onchange = set_ssid_field;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
document.getElementById("credentialsForm").addEventListener("submit", function(){
fetch('/status','GET', new_status);
});
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
</script>
</body>
</html>
#endif
static const char http_html_backup[] =
Improve previous EUS JS select fix to work better on mobile UIs.
2016-04-01 03:26:22 +02:00
"<!DOCTYPE html><meta http-equiv=content-type content='text/html; charset=UTF-8'><meta charset=utf-8><meta name=viewport content='width=380'><title>WiFi Login</title><style media=screen type=text/css>*{margin:0;padding:0}html{height:100%;background:linear-gradient(rgba(196,102,0,.2),rgba(155,89,182,.2)),url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAA8AgMAAACm+SSwAAAADFBMVEVBR1FFS1VHTlg8Q0zU/YXIAAADVElEQVQ4yy1TTYvTUBQ9GTKiYNoodsCF4MK6U4TZChOhiguFWHyBFzqlLl4hoeNvEBeCrlrhBVKq1EUKLTP+hvi1GyguXqBdiZCBzGqg20K8L3hDQnK55+OeJNguHx6UujYl3dL5ALn4JOIUluAqeAWciyGaSdvngOWzNT+G0UyGUOxVOAdqkjXDCbBiUyjZ5QzYEbGadYAi6kHxth+kthXNVNCDofwhGv1D4QGGiM9iAjbCHgr2iUUpDJbs+VPQ4xAr2fX7KXbkOJMdok965Ksb+6lrjdkem8AshIuHm9Nyu19uTunYlOXDTQqi8VgeH0kBXH2xq/ouiMZPzuMukymutrBmulUTovC6HqNFW2ZOiqlpSXZOTvSUeUPxChjxol8BLbRy4gJuhV7OR4LRVBs3WQ9VVAU7SXgK2HeUrOj7bC8YsUgr3lEV/TXB7hK90EBnxaeg1Ov15bY80M736ekCGesGAaGvG0Ct4WRkVQVHIgIM9xJgvSFfPay8Q6GNv7VpR7xUnkvhnMQCJDYkYOtNLihV70tCU1Sk+BQrpoP+HLHUrJkuta40C6LP5GvBv+Hqo10ATxxFrTPvNdPr7XwgQud6RvQN/sXjBGzqbU27wcj9cgsyvSTrpyXV8gKpXeNJU3aFl7MOdldzV4+HfO19jBa5f2IjWwx1OLHIvFHkqbBj20ro1g7nDfY1DpScvDRUNARgjMMVO0zoMjKxJ6uWCPP+YRAWbGoaN8kXYHmLjB9FXLGOazfFVCvOgqzfnicNPrHtPKlex2ye824gMza0cTZ2sS2Xm7Qst/UfFw8O6vVtmUKxZy9xFgzMys5cJ5fxZw4y37Ufk1Dsfb8MqOjYxE3ZMWxiDcO0PYUaD2ys+8OW1pbB7/e3sfZeGVCL0Q2aMjjPdm2sxADuejZxHJAd8dO9DSUdA0V8/NggRRanDkBrANn8yHlEQOn/MmwoQfQF7xgmKDnv520bS/pgylP67vf3y2V5sCwfoCEMkZClgOfJAFX9eXefR2RpnmRs4CDVPceaRfoFzCkJVJX27vWZnoqyvmtXU3+dW1EIXIu8Qg5Qta4Zlv7drUCoWe8/8MXzaEwux7ESE9h6qnHj3mIO0/D9RvzfxPmjWiQ1vbeSk4rrHwhAre35EEVaAAAAAElFTkSuQmCC)}body{font-family:arial,verdana}div{position:absolute;margin:auto;top:-150px;right:0;bottom:0;left:0;width:320px;height:304px}form{width:320px;text-align:center;position:relative}form fieldset{background:#fff;border:0 none;border-radius:5px;box-shadow:0 0 15px 1px rgba(0,0,0,.4);padding:20px 30px;box-sizing:border-box}form input{padding:15px;border:1px solid #ccc;border-radius:3px;margin-bottom:10px;width:100%;box-sizing:border-box;font-family:montserrat;color:#2C3E50;font-size:13px}form .action-button{border:0 none;border-radius:3px;cursor:pointer}#msform .submit:focus,form .action-button:hover{box-shadow:0 0 0 2px #fff,0 0 0 3px #27AE60}#formFrame{display:none}#aplist{display:block}select{width:100%;margin-bottom:20px;padding:10px 5px;border:1px solid #ccc;display:none}.fs-title{font-size:15px;text-transform:uppercase;color:#2C3E50;margin-bottom:10px}.fs-subtitle{font-weight:400;font-size:13px;color:#666;margin-bottom:20px}.fs-status{font-weight:400;font-size:13px;color:#666;margin-bottom:10px;padding-top:20px;border-top:1px solid #ccc}.submit{width:100px;background:#27AE60;color:#fff;font-weight:700;margin:10px 5px;padding:10px 5px}</style><div><form id=credentialsForm action=/update target=formFrame><fieldset><iframe id=formFrame src=''name=formFrame></iframe><h2 class=fs-title>WiFi Login</h2><h3 class=fs-subtitle>Connect gadget to your WiFi network</h3><input id=wifi_ssid autocorrect=off autocapitalize=none name=wifi_ssid placeholder='WiFi Name'><select id=aplist name=aplist size=1 disabled><option>Scanning for networks...</select><input name=wifi_password placeholder=Password type=password> <input type=submit name=save class='action-button submit'value=Save><h3 class=fs-status>Status: <span id=status>Updating...</span></h3></fieldset><h3 id=dbg></h3></form></div><script>function fetch(t,e,n){function s(){4===i.readyState&&n(200===i.status?i.responseText:null)}var i=new XMLHttpRequest;i.onreadystatechange=s,i.open(e,t,!0),i.send()}function new_status(t){if(t){var e=document.getElementById('status');e.innerHTML=t}}function new_status_repeat(t){new_status(t),setTimeout(refresh_status,750)}function new_ap_list(t){if(t){var e=JSON.parse(t);e.sort(function(t,e){return e.rssi-t.rssi});var n=e.map(function(t){return t.ssid}).filter(function(t,e,n){return n.indexOf(t)==e}),s=document.getElementById('aplist');s.innerHTML='',s.setAttribute('size',Math.max(Math.min(3,e.length),1)),s.removeAttribute('disabled');for(var i=0;i<n.length;++i){var a=document.createElement('option');a.in
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
typedef struct scan_listener
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
struct tcp_pcb *conn;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
struct scan_listener *next;
} scan_listener_t;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
typedef struct
{
struct espconn *espconn_dns_udp;
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
struct tcp_pcb *http_pcb;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
char *http_payload_data;
uint32_t http_payload_len;
os_timer_t check_station_timer;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
os_timer_t shutdown_timer;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
int lua_connected_cb_ref;
int lua_err_cb_ref;
int lua_dbg_cb_ref;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
scan_listener_t *scan_listeners;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
} enduser_setup_state_t;
static enduser_setup_state_t *state;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
static bool manual = false;
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
static task_handle_t do_station_cfg_handle;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static int enduser_setup_manual(lua_State* L);
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static int enduser_setup_start(lua_State* L);
static int enduser_setup_stop(lua_State* L);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static void enduser_setup_stop_callback(void *ptr);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static void enduser_setup_station_start(void);
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_ap_start(void);
static void enduser_setup_ap_stop(void);
Enable -std=gnu11 for modules dir. Plus boat-load of fixes to actually make that build.
2016-01-20 09:37:03 +01:00
static void enduser_setup_check_station(void *p);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static void enduser_setup_debug(int line, const char *str);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
#define ENDUSER_SETUP_DEBUG_ENABLE 0
#if ENDUSER_SETUP_DEBUG_ENABLE
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
#define ENDUSER_SETUP_DEBUG(str) enduser_setup_debug(__LINE__, str)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
#else
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
#define ENDUSER_SETUP_DEBUG(str) do {} while(0)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
#endif
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
#define ENDUSER_SETUP_ERROR(str, err, err_severity) \
do { \
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG(str); \
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (err_severity & ENDUSER_SETUP_ERR_FATAL) enduser_setup_stop(lua_getstate());\
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_error(__LINE__, str, err);\
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!(err_severity & ENDUSER_SETUP_ERR_NO_RETURN)) \
return err; \
} while (0)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
#define ENDUSER_SETUP_ERROR_VOID(str, err, err_severity) \
do { \
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG(str); \
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (err_severity & ENDUSER_SETUP_ERR_FATAL) enduser_setup_stop(lua_getstate());\
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_error(__LINE__, str, err);\
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!(err_severity & ENDUSER_SETUP_ERR_NO_RETURN)) \
return; \
} while (0)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static void enduser_setup_debug(int line, const char *str)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
lua_State *L = lua_getstate();
if(state != NULL && state->lua_dbg_cb_ref != LUA_NOREF)
{
lua_rawgeti(L, LUA_REGISTRYINDEX, state->lua_dbg_cb_ref);
lua_pushfstring(L, "%d: \t%s", line, str);
lua_call(L, 1, 0);
}
}
static void enduser_setup_error(int line, const char *str, int err)
{
ENDUSER_SETUP_DEBUG("enduser_setup_error");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
lua_State *L = lua_getstate();
if (state != NULL && state->lua_err_cb_ref != LUA_NOREF)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
{
lua_rawgeti (L, LUA_REGISTRYINDEX, state->lua_err_cb_ref);
lua_pushnumber(L, err);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
lua_pushfstring(L, "%d: \t%s", line, str);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
lua_call (L, 2, 0);
}
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static void enduser_setup_connected_callback()
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_connected_callback");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
lua_State *L = lua_getstate();
if (state != NULL && state->lua_connected_cb_ref != LUA_NOREF)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
{
lua_rawgeti(L, LUA_REGISTRYINDEX, state->lua_connected_cb_ref);
lua_call(L, 0, 0);
}
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_check_station_start(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_check_station_start");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
os_timer_setfn(&(state->check_station_timer), enduser_setup_check_station, NULL);
os_timer_arm(&(state->check_station_timer), 1*1000, TRUE);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_check_station_stop(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_check_station_stop");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fix fatal crash if enduser_setup.stop() called twice.
2016-03-01 08:33:11 +01:00
if (state != NULL)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fix fatal crash if enduser_setup.stop() called twice.
2016-03-01 08:33:11 +01:00
os_timer_disarm(&(state->check_station_timer));
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
/**
* Check Station
*
* Check that we've successfully entered station mode.
*/
Enable -std=gnu11 for modules dir. Plus boat-load of fixes to actually make that build.
2016-01-20 09:37:03 +01:00
static void enduser_setup_check_station(void *p)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_check_station");
Enable -std=gnu11 for modules dir. Plus boat-load of fixes to actually make that build.
2016-01-20 09:37:03 +01:00
(void)p;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
struct ip_info ip;
c_memset(&ip, 0, sizeof(struct ip_info));
wifi_get_ip_info(STATION_IF, &ip);
int i;
char has_ip = 0;
for (i = 0; i < sizeof(struct ip_info); ++i)
{
has_ip |= ((char *) &ip)[i];
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (has_ip == 0)
{
return;
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_check_station_stop();
enduser_setup_connected_callback();
/* Trigger shutdown, but allow time for HTTP client to fetch last status. */
if (!manual)
{
os_timer_setfn(&(state->shutdown_timer), enduser_setup_stop_callback, NULL);
os_timer_arm(&(state->shutdown_timer), 10*1000, FALSE);
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
/* --- Connection closing handling ----------------------------------------- */
/* It is far more memory efficient to let the other end close the connection
* first and respond to that, than us initiating the closing. The latter
* seems to leave the pcb in a fin_wait state for a long time, which can
* starve us of memory over time.
*
* By instead using the poll function to schedule a hard abort a few seconds
* from now we achieve a deadline close. The downside is a (very) slight
* risk of dropping the connection early, but in this application that's
* hidden by the retries on the JavaScript side anyway.
*/
/* Callback on timeout to hard-close a connection */
static err_t force_abort (void *arg, struct tcp_pcb *pcb)
{
(void)arg;
tcp_poll (pcb, 0, 0);
tcp_abort (pcb);
return ERR_ABRT;
}
/* Callback to detect a remote-close of a connection */
static err_t handle_remote_close (void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
{
(void)arg; (void)err;
if (p) /* server sent us data, just ACK and move on */
{
tcp_recved (pcb, p->tot_len);
pbuf_free (p);
}
else /* hey, remote end closed, we can do a soft close safely, yay! */
{
tcp_recv (pcb, 0);
tcp_poll (pcb, 0, 0);
tcp_close (pcb);
}
return ERR_OK;
}
/* Set up a deferred close of a connection, as discussed above. */
static inline void deferred_close (struct tcp_pcb *pcb)
{
tcp_poll (pcb, force_abort, 15); /* ~3sec from now */
tcp_recv (pcb, handle_remote_close);
tcp_sent (pcb, 0);
}
/* Convenience function to queue up a close-after-send. */
static err_t close_once_sent (void *arg, struct tcp_pcb *pcb, u16_t len)
{
(void)arg; (void)len;
deferred_close (pcb);
return ERR_OK;
}
/* ------------------------------------------------------------------------- */
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
/**
* Search String
*
* Search string for first occurance of any char in srch_str.
*
* @return -1 iff no occurance of char was found.
*/
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static int enduser_setup_srch_str(const char *str, const char *srch_str)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
char *found = strpbrk (str, srch_str);
if (!found)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return -1;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
else
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
return found - str;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
/**
* Load HTTP Payload
*
* @return - 0 iff payload loaded successfully
* 1 iff backup html was loaded
* 2 iff out of memory
*/
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static int enduser_setup_http_load_payload(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
int f = fs_open(http_html_filename, fs_mode2flag("r"));
int err = fs_seek(f, 0, FS_SEEK_END);
int file_len = (int) fs_tell(f);
int err2 = fs_seek(f, 0, FS_SEEK_SET);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
const char cl_hdr[] = "Content-length:%5d\r\n\r\n";
const size_t cl_len = LITLEN(cl_hdr) + 3; /* room to expand %4d */
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (f == 0 || err == -1 || err2 == -1)
{
Change index.html to eus-index.html
2016-03-29 17:25:05 +02:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_load_payload unable to load file enduser_setup.html, loading backup HTML.");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
int payload_len = LITLEN(http_header_200) + cl_len + LITLEN(http_html_backup);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
state->http_payload_len = payload_len;
state->http_payload_data = (char *) c_malloc(payload_len);
if (state->http_payload_data == NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
return 2;
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
int offset = 0;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
c_memcpy(&(state->http_payload_data[offset]), &(http_header_200), LITLEN(http_header_200));
offset += LITLEN(http_header_200);
offset += c_sprintf(state->http_payload_data + offset, cl_hdr, LITLEN(http_html_backup));
c_memcpy(&(state->http_payload_data[offset]), &(http_html_backup), LITLEN(http_html_backup));
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 1;
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
int payload_len = LITLEN(http_header_200) + cl_len + file_len;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
state->http_payload_len = payload_len;
state->http_payload_data = (char *) c_malloc(payload_len);
if (state->http_payload_data == NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
return 2;
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
int offset = 0;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
c_memcpy(&(state->http_payload_data[offset]), &(http_header_200), LITLEN(http_header_200));
offset += LITLEN(http_header_200);
offset += c_sprintf(state->http_payload_data + offset, cl_hdr, file_len);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
fs_read(f, &(state->http_payload_data[offset]), file_len);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 0;
}
/**
* De-escape URL data
*
* Parse escaped and form encoded data of request.
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
*
* @return - return 0 iff the HTTP parameter is decoded into a valid string.
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
*/
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static int enduser_setup_http_urldecode(char *dst, const char *src, int src_len, int dst_len)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_urldecode");
char *dst_start = dst;
Fixed EUS password/ssid decoding.
2016-03-31 08:46:03 +02:00
char *dst_last = dst + dst_len - 1; /* -1 to reserve space for last \0 */
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
char a, b;
int i;
Fixed EUS password/ssid decoding.
2016-03-31 08:46:03 +02:00
for (i = 0; i < src_len && *src && dst < dst_last; ++i)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
if ((*src == '%') && ((a = src[1]) && (b = src[2])) && (isxdigit(a) && isxdigit(b)))
{
if (a >= 'a')
{
a -= 'a'-'A';
}
if (a >= 'A')
{
a -= ('A' - 10);
}
else
{
a -= '0';
}
if (b >= 'a')
{
b -= 'a'-'A';
}
if (b >= 'A')
{
b -= ('A' - 10);
}
else
{
b -= '0';
}
*dst++ = 16 * a + b;
src += 3;
i += 2;
} else {
char c = *src++;
if (c == '+')
{
c = ' ';
}
*dst++ = c;
}
}
*dst++ = '\0';
Fixed EUS password/ssid decoding.
2016-03-31 08:46:03 +02:00
return (i < src_len); /* did we fail to process all the input? */
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
/**
* Task to do the actual station configuration.
* This config *cannot* be done in the network receive callback or serious
* issues like memory corruption occur.
*/
static void do_station_cfg (task_param_t param, uint8_t prio)
{
struct station_config *cnf = (struct station_config *)param;
(void)prio;
/* Best-effort disconnect-reconfig-reconnect. If the device is currently
* connected, the disconnect will work but the connect will report failure
* (though it will actually start connecting). If the devices is not
* connected, the disconnect may fail but the connect will succeed. A
* solid head-in-the-sand approach seems to be the best tradeoff on
* functionality-vs-code-size.
* TODO: maybe use an error callback to at least report if the set config
* call fails.
*/
wifi_station_disconnect ();
wifi_station_set_config (cnf);
wifi_station_connect ();
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
luaM_free(lua_getstate(), cnf);
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
/**
* Handle HTTP Credentials
*
* @return - return 0 iff credentials are found and handled successfully
* return 1 iff credentials aren't found
* return 2 iff an error occured
*/
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static int enduser_setup_http_handle_credentials(char *data, unsigned short data_len)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_handle_credentials");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
char *name_str = (char *) ((uint32_t)strstr(&(data[6]), "wifi_ssid="));
char *pwd_str = (char *) ((uint32_t)strstr(&(data[6]), "wifi_password="));
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (name_str == NULL || pwd_str == NULL)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("Password or SSID string not found");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 1;
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
int name_field_len = LITLEN("wifi_ssid=");
int pwd_field_len = LITLEN("wifi_password=");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
char *name_str_start = name_str + name_field_len;
char *pwd_str_start = pwd_str + pwd_field_len;
int name_str_len = enduser_setup_srch_str(name_str_start, "& ");
int pwd_str_len = enduser_setup_srch_str(pwd_str_start, "& ");
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
if (name_str_len == -1 || pwd_str_len == -1)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("Password or SSID HTTP paramter divider not found");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 1;
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
struct station_config *cnf = luaM_malloc(lua_getstate(), sizeof(struct station_config));
c_memset(cnf, 0, sizeof(struct station_config));
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
int err;
Fixed EUS password/ssid decoding.
2016-03-31 08:46:03 +02:00
err = enduser_setup_http_urldecode(cnf->ssid, name_str_start, name_str_len, sizeof(cnf->ssid));
err |= enduser_setup_http_urldecode(cnf->password, pwd_str_start, pwd_str_len, sizeof(cnf->password));
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
if (err != 0)
{
ENDUSER_SETUP_DEBUG("Unable to decode HTTP parameter to valid password or SSID");
return 1;
}
ENDUSER_SETUP_DEBUG("");
ENDUSER_SETUP_DEBUG("WiFi Credentials Stored");
ENDUSER_SETUP_DEBUG("-----------------------");
ENDUSER_SETUP_DEBUG("name: ");
ENDUSER_SETUP_DEBUG(cnf->ssid);
ENDUSER_SETUP_DEBUG("pass: ");
ENDUSER_SETUP_DEBUG(cnf->password);
ENDUSER_SETUP_DEBUG("-----------------------");
ENDUSER_SETUP_DEBUG("");
task_post_medium(do_station_cfg_handle, (task_param_t) cnf);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 0;
}
/**
* Serve HTML
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
*
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
* @return - return 0 iff html was served successfully
*/
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static int enduser_setup_http_serve_header(struct tcp_pcb *http_client, const char *header, uint32_t header_len)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_serve_header");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
err_t err = tcp_write (http_client, header, header_len, TCP_WRITE_FLAG_COPY);
if (err != ERR_OK)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
deferred_close (http_client);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_serve_header failed on tcp_write", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_NONFATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
return 0;
}
static err_t streamout_sent (void *arg, struct tcp_pcb *pcb, u16_t len)
{
(void)len;
unsigned offs = (unsigned)arg;
if (!state || !state->http_payload_data)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_abort (pcb);
return ERR_ABRT;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
unsigned wanted_len = state->http_payload_len - offs;
unsigned buf_free = tcp_sndbuf (pcb);
if (buf_free < wanted_len)
wanted_len = buf_free;
/* no-copy write */
err_t err = tcp_write (pcb, state->http_payload_data + offs, wanted_len, 0);
if (err != ERR_OK)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_DEBUG("streaming out html failed");
tcp_abort (pcb);
return ERR_ABRT;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
offs += wanted_len;
if (offs >= state->http_payload_len)
{
tcp_sent (pcb, 0);
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
deferred_close (pcb);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
}
else
tcp_arg (pcb, (void *)offs);
return ERR_OK;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
/**
* Serve HTML
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
*
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
* @return - return 0 iff html was served successfully
*/
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static int enduser_setup_http_serve_html(struct tcp_pcb *http_client)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_serve_html");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state->http_payload_data == NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
enduser_setup_http_load_payload();
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
unsigned chunklen = tcp_sndbuf (http_client);
tcp_arg (http_client, (void *)chunklen);
tcp_recv (http_client, 0); /* avoid confusion about the tcp_arg */
tcp_sent (http_client, streamout_sent);
/* Begin the no-copy stream-out here */
err_t err = tcp_write (http_client, state->http_payload_data, chunklen, 0);
if (err != 0)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_serve_html failed. tcp_write failed", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_NONFATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 0;
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static void serve_status(struct tcp_pcb *conn)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_serve_status");
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
const char fmt[] =
"HTTP/1.1 200 OK\r\n"
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
"Cache-control:no-cache\r\n"
"Connection:close\r\n"
"Content-type:text/plain\r\n"
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
"Content-length: %d\r\n"
"\r\n"
Include the SSID in enduser_setup status message. For more userfriendly feedback.
2016-03-01 07:55:45 +01:00
"%s%s";
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
const char *state[] =
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
"Idle.",
"Connecting to \"%s\".",
"Failed to connect to \"%s\" - Wrong password.",
"Failed to connect to \"%s\" - Network not found.",
"Failed to connect.",
EUS: add assigned IP address (#1313) This change shows the assigned IP address when connected using EUS
2016-06-04 00:21:18 +02:00
"Connected to \"%s\" (%s)."
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
};
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
const size_t num_states = sizeof(state)/sizeof(state[0]);
uint8_t curr_state = wifi_station_get_connect_status ();
if (curr_state < num_states)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
switch (curr_state)
{
case STATION_CONNECTING:
case STATION_WRONG_PASSWORD:
case STATION_NO_AP_FOUND:
case STATION_GOT_IP:
{
const char *s = state[curr_state];
struct station_config config;
wifi_station_get_config(&config);
config.ssid[31] = '\0';
EUS: add assigned IP address (#1313) This change shows the assigned IP address when connected using EUS
2016-06-04 00:21:18 +02:00
struct ip_info ip_info;
wifi_get_ip_info(STATION_IF , &ip_info);
char ip_addr[16];
ip_addr[0] = '\0';
if (curr_state == STATION_GOT_IP)
{
c_sprintf (ip_addr, "%d.%d.%d.%d", IP2STR(&ip_info.ip.addr));
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
int state_len = c_strlen(s);
EUS: add assigned IP address (#1313) This change shows the assigned IP address when connected using EUS
2016-06-04 00:21:18 +02:00
int ip_len = c_strlen(ip_addr);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
int ssid_len = c_strlen(config.ssid);
EUS: add assigned IP address (#1313) This change shows the assigned IP address when connected using EUS
2016-06-04 00:21:18 +02:00
int status_len = state_len + ssid_len + ip_len + 1;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
char status_buf[status_len];
memset(status_buf, 0, status_len);
EUS: add assigned IP address (#1313) This change shows the assigned IP address when connected using EUS
2016-06-04 00:21:18 +02:00
status_len = c_sprintf(status_buf, s, config.ssid, ip_addr);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
int buf_len = sizeof(fmt) + status_len + 10; //10 = (9+1), 1 byte is '\0' and 9 are reserved for length field
char buf[buf_len];
memset(buf, 0, buf_len);
int output_len = c_sprintf(buf, fmt, status_len, status_buf);
enduser_setup_http_serve_header(conn, buf, output_len);
}
break;
/* Handle non-formatted strings */
default:
{
const char *s = state[curr_state];
int status_len = c_strlen(s);
int buf_len = sizeof(fmt) + status_len + 10; //10 = (9+1), 1 byte is '\0' and 9 are reserved for length field
char buf[buf_len];
memset(buf, 0, buf_len);
int output_len = c_sprintf(buf, fmt, status_len, s);
enduser_setup_http_serve_header(conn, buf, output_len);
}
break;
}
Include the SSID in enduser_setup status message. For more userfriendly feedback.
2016-03-01 07:55:45 +01:00
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
else
Include the SSID in enduser_setup status message. For more userfriendly feedback.
2016-03-01 07:55:45 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_http_serve_header(conn, http_header_500, LITLEN(http_header_500));
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
/* --- WiFi AP scanning support -------------------------------------------- */
static void free_scan_listeners (void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!state || !state->scan_listeners)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
return;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
scan_listener_t *l = state->scan_listeners , *next = 0;
while (l)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
next = l->next;
c_free (l);
l = next;
}
state->scan_listeners = 0;
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static void remove_scan_listener (scan_listener_t *l)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (state)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
scan_listener_t **sl = &state->scan_listeners;
while (*sl)
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
/* Remove any and all references to the closed conn from the scan list */
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (*sl == l)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
*sl = l->next;
c_free (l);
/* No early exit to guard against multi-entry on list */
}
else
sl = &(*sl)->next;
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
static char *escape_ssid (char *dst, const char *src)
{
for (int i = 0; i < 32 && src[i]; ++i)
{
if (src[i] == '\\' || src[i] == '"')
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
*dst++ = '\\';
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
*dst++ = src[i];
}
return dst;
}
static void notify_scan_listeners (const char *payload, size_t sz)
{
if (!state)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
return;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
for (scan_listener_t *l = state->scan_listeners; l; l = l->next)
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (tcp_write (l->conn, payload, sz, TCP_WRITE_FLAG_COPY) != ERR_OK)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
ENDUSER_SETUP_DEBUG("failed to send wifi list");
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
tcp_abort (l->conn);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
else
tcp_sent (l->conn, close_once_sent); /* TODO: time-out sends? */
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
l->conn = 0;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
free_scan_listeners ();
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
static void on_scan_done (void *arg, STATUS status)
{
if (!state || !state->scan_listeners)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
return;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (status == OK)
{
unsigned num_nets = 0;
for (struct bss_info *wn = arg; wn; wn = wn->next.stqe_next)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
++num_nets;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
const char header_fmt[] =
"HTTP/1.1 200 OK\r\n"
"Connection:close\r\n"
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
"Cache-control:no-cache\r\n"
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
"Content-type:application/json\r\n"
"Content-length:%4d\r\n"
"\r\n";
const size_t hdr_sz = sizeof (header_fmt) +1 -1; /* +expand %4d, -\0 */
/* To be able to safely escape a pathological SSID, we need 2*32 bytes */
const size_t max_entry_sz = sizeof("{\"ssid\":\"\",\"rssi\":},") + 2*32 + 6;
const size_t alloc_sz = hdr_sz + num_nets * max_entry_sz + 3;
char *http = os_zalloc (alloc_sz);
if (!http)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
goto serve_500;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
char *p = http + hdr_sz; /* start body where we know it will be */
/* p[0] will be clobbered when we print the header, so fill it in last */
++p;
for (struct bss_info *wn = arg; wn; wn = wn->next.stqe_next)
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (wn != arg)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
*p++ = ',';
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
const char entry_start[] = "{\"ssid\":\"";
strcpy (p, entry_start);
p += sizeof (entry_start) -1;
p = escape_ssid (p, wn->ssid);
const char entry_mid[] = "\",\"rssi\":";
strcpy (p, entry_mid);
p += sizeof (entry_mid) -1;
p += c_sprintf (p, "%d", wn->rssi);
*p++ = '}';
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
*p++ = ']';
size_t body_sz = (p - http) - hdr_sz;
c_sprintf (http, header_fmt, body_sz);
http[hdr_sz] = '['; /* Rewrite the \0 with the correct start of body */
notify_scan_listeners (http, hdr_sz + body_sz);
c_free (http);
return;
}
serve_500:
notify_scan_listeners (http_header_500, LITLEN(http_header_500));
}
/* ---- end WiFi AP scan support ------------------------------------------- */
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static err_t enduser_setup_http_recvcb(void *arg, struct tcp_pcb *http_client, struct pbuf *p, err_t err)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_recvcb");
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (!state || err != ERR_OK)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (!state)
ENDUSER_SETUP_DEBUG("ignoring received data while stopped");
tcp_abort (http_client);
return ERR_ABRT;
}
if (!p) /* remote side closed, close our end too */
{
ENDUSER_SETUP_DEBUG("connection closed");
scan_listener_t *l = arg; /* if it's waiting for scan, we have a ptr here */
if (l)
remove_scan_listener (l);
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
deferred_close (http_client);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
return ERR_OK;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
char *data = os_zalloc (p->tot_len + 1);
if (!data)
return ERR_MEM;
unsigned data_len = pbuf_copy_partial (p, data, p->tot_len, 0);
tcp_recved (http_client, p->tot_len);
pbuf_free (p);
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
err_t ret = ERR_OK;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (c_strncmp(data, "GET ", 4) == 0)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (c_strncmp(data + 4, "/ ", 2) == 0)
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (enduser_setup_http_serve_html(http_client) != 0)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_recvcb failed. Unable to send HTML.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_NONFATAL);
}
else
{
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
goto free_out; /* streaming now in progress */
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
else if (c_strncmp(data + 4, "/aplist ", 8) == 0)
{
scan_listener_t *l = os_malloc (sizeof (scan_listener_t));
if (!l)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("out of memory", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_NONFATAL);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
bool already = (state->scan_listeners != NULL);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_arg (http_client, l);
/* TODO: check if also need a tcp_err() cb, or if recv() is enough */
l->conn = http_client;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
l->next = state->scan_listeners;
state->scan_listeners = l;
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!already)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
if (!wifi_station_scan(NULL, on_scan_done))
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_http_serve_header(http_client, http_header_500, LITLEN(http_header_500));
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
deferred_close (l->conn);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
l->conn = 0;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
free_scan_listeners();
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
}
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
goto free_out; /* request queued */
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
else if (c_strncmp(data + 4, "/status ", 8) == 0)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
serve_status(http_client);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
}
else if (c_strncmp(data + 4, "/update?", 8) == 0)
{
switch (enduser_setup_http_handle_credentials(data, data_len))
{
case 0:
enduser_setup_http_serve_header(http_client, http_header_302, LITLEN(http_header_302));
break;
case 1:
enduser_setup_http_serve_header(http_client, http_header_401, LITLEN(http_header_401));
break;
default:
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_recvcb failed. Failed to handle wifi credentials.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_NONFATAL);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
break;
}
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
else if (c_strncmp(data + 4, "/generate_204 ", 14) == 0)
{
Change index.html to eus-index.html
2016-03-29 17:25:05 +02:00
/* Convince Android devices that they have internet access to avoid pesky dialogues. */
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_http_serve_header(http_client, http_header_204, LITLEN(http_header_204));
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
else
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("serving 404");
ENDUSER_SETUP_DEBUG(data + 4);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
enduser_setup_http_serve_header(http_client, http_header_404, LITLEN(http_header_404));
Fixed previous POST patch. Also cleaned up HTTP request handling.
2015-10-01 20:22:45 +02:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
else /* not GET */
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
enduser_setup_http_serve_header(http_client, http_header_401, LITLEN(http_header_401));
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
deferred_close (http_client);
free_out:
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
os_free (data);
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
return ret;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
static err_t enduser_setup_http_connectcb(void *arg, struct tcp_pcb *pcb, err_t err)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_connectcb");
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (!state)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_DEBUG("connect callback but no state?!");
tcp_abort (pcb);
return ERR_ABRT;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_accepted (state->http_pcb);
tcp_recv (pcb, enduser_setup_http_recvcb);
enduser_setup: Fixed missing status update. Due to the hard-close, the status message did not get sent out reliably. Connection closing logic now reworked to be nicer, while still avoiding the problem of lots of connections lingering in fin_wait.
2016-03-29 08:27:55 +02:00
tcp_nagle_disable (pcb);
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
return ERR_OK;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static int enduser_setup_http_start(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_start");
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
struct tcp_pcb *pcb = tcp_new ();
if (pcb == NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_start failed. Memory allocation failed (http_pcb == NULL).", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (tcp_bind (pcb, IP_ADDR_ANY, 80) != ERR_OK)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
ENDUSER_SETUP_ERROR("http_start bind failed", ENDUSER_SETUP_ERR_SOCKET_ALREADY_OPEN, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
state->http_pcb = tcp_listen (pcb);
if (!state->http_pcb)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_abort(pcb); /* original wasn't freed for us */
ENDUSER_SETUP_ERROR("http_start listen failed", ENDUSER_SETUP_ERR_SOCKET_ALREADY_OPEN, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_accept (state->http_pcb, enduser_setup_http_connectcb);
/* TODO: check lwip tcp timeouts */
#if 0
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
err = espconn_regist_time(state->espconn_http_tcp, 2, 0);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (err == ESPCONN_ARG)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("http_start failed. Unable to set TCP timeout.", ENDUSER_SETUP_ERR_CONNECTION_NOT_FOUND, ENDUSER_SETUP_ERR_NONFATAL | ENDUSER_SETUP_ERR_NO_RETURN);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
#endif
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
int err = enduser_setup_http_load_payload();
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (err == 1)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_start info. Loaded backup HTML.");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
else if (err == 2)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("http_start failed. Unable to allocate memory for HTTP payload.", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
return 0;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_http_stop(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_http_stop");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
if (state && state->http_pcb)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Switch enduser_setup_module to LWIP raw API. Shutting down an espconn server safely is impossible, and currently would include at least one use-after-free. Even with that patched, at best this would change things from impossible to "very tricky". The native LWIP API does not have those issues, and is still quite easy to work with.
2016-03-24 09:25:49 +01:00
tcp_close (state->http_pcb); /* cannot fail for listening sockets */
state->http_pcb = 0;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_ap_stop(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_station_stop");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
wifi_set_opmode(~SOFTAP_MODE & wifi_get_opmode());
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_ap_start(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_ap_start");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
struct softap_config cnf;
Changed SSID to be suffixed by MAC.
2015-09-27 20:02:25 +02:00
c_memset(&(cnf), 0, sizeof(struct softap_config));
Fixed compilation error when the enduser_setup module is disabled yet requires ENDUSER_SETUP_AP_SSID to be defined.
2015-12-21 04:50:36 +01:00
#ifndef ENDUSER_SETUP_AP_SSID
#define ENDUSER_SETUP_AP_SSID "SetupGadget"
#endif
Changed SSID to be suffixed by MAC.
2015-09-27 20:02:25 +02:00
char ssid[] = ENDUSER_SETUP_AP_SSID;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
int ssid_name_len = c_strlen(ssid);
Changed SSID to be suffixed by MAC.
2015-09-27 20:02:25 +02:00
c_memcpy(&(cnf.ssid), ssid, ssid_name_len);
uint8_t mac[6];
wifi_get_macaddr(SOFTAP_IF, mac);
cnf.ssid[ssid_name_len] = '_';
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
c_sprintf(cnf.ssid + ssid_name_len + 1, "%02X%02X%02X", mac[3], mac[4], mac[5]);
cnf.ssid_len = ssid_name_len + 7;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
cnf.channel = 1;
cnf.authmode = AUTH_OPEN;
cnf.ssid_hidden = 0;
cnf.max_connection = 5;
cnf.beacon_interval = 100;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
wifi_set_opmode(STATIONAP_MODE);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
wifi_softap_set_config(&cnf);
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_dns_recv_callback(void *arg, char *recv_data, unsigned short recv_len)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_dns_recv_callback.");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
struct espconn *callback_espconn = arg;
struct ip_info ip_info;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
uint32_t qname_len = c_strlen(&(recv_data[12])) + 1; // \0=1byte
uint32_t dns_reply_static_len = (uint32_t) sizeof(dns_header) + (uint32_t) sizeof(dns_body) + 2 + 4; // dns_id=2bytes, ip=4bytes
uint32_t dns_reply_len = dns_reply_static_len + qname_len;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
uint8_t if_mode = wifi_get_opmode();
if ((if_mode & SOFTAP_MODE) == 0)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Interface mode not supported.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
uint8_t if_index = (if_mode == STATION_MODE? STATION_IF : SOFTAP_IF);
if (wifi_get_ip_info(if_index , &ip_info) == false)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Unable to get interface IP.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
char *dns_reply = (char *) c_malloc(dns_reply_len);
if (dns_reply == NULL)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Failed to allocate memory.", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_NONFATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
uint32_t insert_byte = 0;
c_memcpy(&(dns_reply[insert_byte]), recv_data, 2);
insert_byte += 2;
c_memcpy(&(dns_reply[insert_byte]), dns_header, sizeof(dns_header));
insert_byte += (uint32_t) sizeof(dns_header);
c_memcpy(&(dns_reply[insert_byte]), &(recv_data[12]), qname_len);
insert_byte += qname_len;
c_memcpy(&(dns_reply[insert_byte]), dns_body, sizeof(dns_body));
insert_byte += (uint32_t) sizeof(dns_body);
c_memcpy(&(dns_reply[insert_byte]), &(ip_info.ip), 4);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Added fix from #750, to access the IP of a sender of a UDP packet, to fix SDK 1.4.0 compability.
2015-11-12 05:46:26 +01:00
// SDK 1.4.0 changed behaviour, for UDP server need to look up remote ip/port
remot_info *pr = 0;
if (espconn_get_connection_info(callback_espconn, &pr, 0) != ESPCONN_OK)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Unable to get IP of UDP sender.", ENDUSER_SETUP_ERR_CONNECTION_NOT_FOUND, ENDUSER_SETUP_ERR_FATAL);
Added fix from #750, to access the IP of a sender of a UDP packet, to fix SDK 1.4.0 compability.
2015-11-12 05:46:26 +01:00
}
callback_espconn->proto.udp->remote_port = pr->remote_port;
os_memmove(callback_espconn->proto.udp->remote_ip, pr->remote_ip, 4);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
int8_t err;
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
err = espconn_send(callback_espconn, dns_reply, dns_reply_len);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
c_free(dns_reply);
if (err == ESPCONN_MEM)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Failed to allocate memory for send.", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
else if (err == ESPCONN_ARG)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. Can't execute transmission.", ENDUSER_SETUP_ERR_CONNECTION_NOT_FOUND, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
else if (err != 0)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR_VOID("dns_recv_callback failed. espconn_send failed", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static void enduser_setup_free(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_free");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state == NULL)
{
return;
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
/* Make sure no running timers are left. */
os_timer_disarm(&(state->check_station_timer));
os_timer_disarm(&(state->shutdown_timer));
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state->espconn_dns_udp != NULL)
{
if (state->espconn_dns_udp->proto.udp != NULL)
{
c_free(state->espconn_dns_udp->proto.udp);
}
c_free(state->espconn_dns_udp);
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
c_free(state->http_payload_data);
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
free_scan_listeners ();
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
c_free(state);
state = NULL;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static int enduser_setup_dns_start(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_dns_start");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state->espconn_dns_udp != NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Appears to already be started (espconn_dns_udp != NULL).", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
state->espconn_dns_udp = (struct espconn *) c_malloc(sizeof(struct espconn));
if (state->espconn_dns_udp == NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Memory allocation failed (espconn_dns_udp == NULL).", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
esp_udp *esp_udp_data = (esp_udp *) c_malloc(sizeof(esp_udp));
if (esp_udp_data == NULL)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Memory allocation failed (esp_udp == NULL).", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
c_memset(state->espconn_dns_udp, 0, sizeof(struct espconn));
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
c_memset(esp_udp_data, 0, sizeof(esp_udp));
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
state->espconn_dns_udp->proto.udp = esp_udp_data;
state->espconn_dns_udp->type = ESPCONN_UDP;
state->espconn_dns_udp->state = ESPCONN_NONE;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
esp_udp_data->local_port = 53;
int8_t err;
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
err = espconn_regist_recvcb(state->espconn_dns_udp, enduser_setup_dns_recv_callback);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (err != 0)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Couldn't add receive callback, unknown error.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
err = espconn_create(state->espconn_dns_udp);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
if (err == ESPCONN_ISCONN)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Couldn't create connection, already listening for that connection.", ENDUSER_SETUP_ERR_SOCKET_ALREADY_OPEN, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
else if (err == ESPCONN_MEM)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Couldn't create connection, out of memory.", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
else if (err != 0)
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
ENDUSER_SETUP_ERROR("dns_start failed. Couldn't create connection, unknown error.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
return 0;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static void enduser_setup_dns_stop(void)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_dns_stop");
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Fix fatal crash if enduser_setup.stop() called twice.
2016-03-01 08:33:11 +01:00
if (state != NULL && state->espconn_dns_udp != NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
espconn_delete(state->espconn_dns_udp);
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static int enduser_setup_init(lua_State *L)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_init");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state != NULL)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_ERROR("init failed. Appears to already be started.", ENDUSER_SETUP_ERR_UNKOWN_ERROR, ENDUSER_SETUP_ERR_FATAL);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
return ENDUSER_SETUP_ERR_UNKOWN_ERROR;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
state = (enduser_setup_state_t *) os_zalloc(sizeof(enduser_setup_state_t));
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if (state == NULL)
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_ERROR("init failed. Unable to allocate memory.", ENDUSER_SETUP_ERR_OUT_OF_MEMORY, ENDUSER_SETUP_ERR_FATAL);
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
return ENDUSER_SETUP_ERR_OUT_OF_MEMORY;
}
c_memset(state, 0, sizeof(enduser_setup_state_t));
state->lua_connected_cb_ref = LUA_NOREF;
state->lua_err_cb_ref = LUA_NOREF;
state->lua_dbg_cb_ref = LUA_NOREF;
if (!lua_isnoneornil(L, 1))
{
lua_pushvalue(L, 1);
state->lua_connected_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else
{
state->lua_connected_cb_ref = LUA_NOREF;
}
if (!lua_isnoneornil(L, 2))
{
lua_pushvalue (L, 2);
state->lua_err_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else
{
state->lua_err_cb_ref = LUA_NOREF;
}
if (!lua_isnoneornil(L, 3))
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
lua_pushvalue (L, 3);
state->lua_dbg_cb_ref = luaL_ref(L, LUA_REGISTRYINDEX);
}
else
{
state->lua_dbg_cb_ref = LUA_NOREF;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
return 0;
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
static int enduser_setup_manual(lua_State *L)
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{
if (!lua_isnoneornil (L, 1))
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
manual = lua_toboolean (L, 1);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
lua_pushboolean (L, manual);
return 1;
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
static int enduser_setup_start(lua_State *L)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_start");
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
if (!do_station_cfg_handle)
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
do_station_cfg_handle = task_get_id(do_station_cfg);
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fix nasty case of memory corruption by enduser_setup. Turns out that running wifi_station_config() from a network callback can be a Really Really Bad Idea(tm).
2016-03-01 07:54:10 +01:00
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if(enduser_setup_init(L))
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
goto failed;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_check_station_start();
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!manual)
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
enduser_setup_ap_start();
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
}
if(enduser_setup_dns_start())
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
goto failed;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
if(enduser_setup_http_start())
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
{
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
goto failed;
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
}
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
goto out;
Removed #define for forcing storage on flash
2015-09-16 14:56:44 +02:00
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
failed:
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
enduser_setup_stop(lua_getstate());
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
out:
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 0;
}
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
/**
* A wrapper needed for type-reasons strictness reasons.
*/
static void enduser_setup_stop_callback(void *ptr)
{
enduser_setup_stop(lua_getstate());
}
Moved CONST data to occupy flash, and remove storage instructions for functions.
2015-09-12 18:07:53 +02:00
static int enduser_setup_stop(lua_State* L)
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{
Improved overall enduser_setup user experience. A single bug is fixed, a few features are added and overall the codebase has been worked through. - Added support for calls to /generate_204 that let's android know that the internet is accessible. - Added 10 second delay to the shutdown call to allow a final status update to be fetched by the client. - Added iframe to html to avoid having a form submission change the page. - Added support for dynamic /status responses. - Improved HTML appearance by removing AP-list button. - Improved CSS to center form, even when list of access points have loaded. - Improved debug prints to contain line numbers and not require lua_State*. - Fixed broken failure check when calling wifi_station_connect(). - Fixed unguarded malloc().
2016-03-08 22:55:53 +01:00
ENDUSER_SETUP_DEBUG("enduser_setup_stop");
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
if (!manual)
{
enduser_setup_ap_stop();
}
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
enduser_setup_dns_stop();
enduser_setup_http_stop();
Added support for connected, error and debug callbacks.
2015-09-19 21:06:56 +02:00
enduser_setup_free();
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
return 0;
}
Reworked module registration, removed modules.h Module creation & registration now made a lot simpler. In essence, each module file is now self-contained and only needs a NODEMCU_MODULE(MYNAME, "myname", myname_map, luaopen_myname); line to both be automatically recognised by the Lua initialization as well as honor the LUA_USE_MODULES_MYNAME #define.
2015-12-16 06:04:58 +01:00
static const LUA_REG_TYPE enduser_setup_map[] = {
Fixes and enchancements for enduser_setup module. Fixes: * Removed spurious \0 bytes being sent to the client in many cases. * Properly terminated 404 header. * Now including Content-length: header for index.html (including built-in). Clients otherwise had to wait for their own timeout before considering the page load complete, which resulting in an unpleasant sluggish experience. * Switched form submission to GET, as iOS sometimes does not include the body in the same packet as the POST header, which led to the module not finding the form values. * Added redirect after form submission to avoid blank-page-in-browser. * Moved common "enduser_setup" prefix to a lua_pushfstring() to reduce string literal overhead. * Replaced cached lua_State* with calls to lua_getstate(), as in other modules. * Fixed broken appending of MAC to the SSID. * Fixed up macro definitions to not break `if` clauses unintentionally. Enhancements: * Support for scanning for available WiFi networks, and picking from the list. * Support for retrieving the current WiFi station status. * Added "manual" mode, where the module does not (re)configure the AP setup, nor shut down automatically. Default is still automatic, as before. * Updated docs for new `enduser_setup.manual()` function.
2016-01-28 06:52:09 +01:00
{ LSTRKEY( "manual" ), LFUNCVAL( enduser_setup_manual )},
Added ENDUSER_SETUP module. The module will start a SoftAP, DNS, HTTP server acting as a captive portal. The portal will have the SSID SetupGadget and will serve a website where credentials for the end users WLAN can be submitted. Once valid credentials have been submitted and used to connect to the local WLAN this module will stop. This module requires USE_DNS to enabled in dhcpserver.h
2015-09-02 14:41:27 +02:00
{ LSTRKEY( "start" ), LFUNCVAL( enduser_setup_start )},
{ LSTRKEY( "stop" ), LFUNCVAL( enduser_setup_stop )},
{ LNILKEY, LNILVAL}
};
Reworked module registration, removed modules.h Module creation & registration now made a lot simpler. In essence, each module file is now self-contained and only needs a NODEMCU_MODULE(MYNAME, "myname", myname_map, luaopen_myname); line to both be automatically recognised by the Lua initialization as well as honor the LUA_USE_MODULES_MYNAME #define.
2015-12-16 06:04:58 +01:00
NODEMCU_MODULE(ENDUSER_SETUP, "enduser_setup", enduser_setup_map, NULL);