Captive portal: use softap-specific hostname redirect

pull/30/head
Jeroen Domburg 10 years ago
parent d628633ed4
commit d8eeeb2a30
  1. 3
      .gitmodules
  2. 2
      libesphttpd
  3. 11
      user/user_main.c

3
.gitmodules vendored

@ -1,3 +1,4 @@
[submodule "libesphttpd"] [submodule "libesphttpd"]
path = libesphttpd path = libesphttpd
url = http://git.spritesserver.nl/libesphttpd.git/ # url = http://git.spritesserver.nl/libesphttpd.git/
url = ssh://git@spritesmods.com:/opt/git/libesphttpd.git

@ -1 +1 @@
Subproject commit 0912a7e354579c78f12e191d30d24ee73f7873a0 Subproject commit 2864a9dca31c93376718fed76da914ff977566a4

@ -29,10 +29,6 @@ some pictures of cats.
//The example can print out the heap use every 3 seconds. You can use this to catch memory leaks. //The example can print out the heap use every 3 seconds. You can use this to catch memory leaks.
//#define SHOW_HEAP_USE //#define SHOW_HEAP_USE
//The example can act as a captive portal, that is, if someone connects their phone to the access
//point, it will automatically load up the main page on most phones/tablets.
#define CAPTIVE_PORTAL
//Function that tells the authentication system what users/passwords live on the system. //Function that tells the authentication system what users/passwords live on the system.
//This is disabled in the default build; if you want to try it, enable the authBasic line in //This is disabled in the default build; if you want to try it, enable the authBasic line in
//the builtInUrls below. //the builtInUrls below.
@ -68,9 +64,7 @@ general ones. Authorization things (like authBasic) act as a 'barrier' and
should be placed above the URLs they protect. should be placed above the URLs they protect.
*/ */
HttpdBuiltInUrl builtInUrls[]={ HttpdBuiltInUrl builtInUrls[]={
#ifdef CAPTIVE_PORTAL {"*", cgiRedirectApClientToHostname, "esp8266.local"},
{"*", cgiCheckHostname, "esp8266.local"},
#endif
{"/", cgiRedirect, "/index.tpl"}, {"/", cgiRedirect, "/index.tpl"},
{"/flash.bin", cgiReadFlash, NULL}, {"/flash.bin", cgiReadFlash, NULL},
{"/led.tpl", cgiEspFsTemplate, tplLed}, {"/led.tpl", cgiEspFsTemplate, tplLed},
@ -109,9 +103,8 @@ static void ICACHE_FLASH_ATTR prHeapTimerCb(void *arg) {
void user_init(void) { void user_init(void) {
stdoutInit(); stdoutInit();
ioInit(); ioInit();
#ifdef CAPTIVE_PORTAL
captdnsInit(); captdnsInit();
#endif
// 0x40200000 is the base address for spi flash memory mapping, ESPFS_POS is the position // 0x40200000 is the base address for spi flash memory mapping, ESPFS_POS is the position
// where image is written in flash that is defined in Makefile. // where image is written in flash that is defined in Makefile.
#ifdef ESPFS_POS #ifdef ESPFS_POS

Loading…
Cancel
Save