integgroll
diff --git a/‎libraries/ESP8266WiFi/examples/RangeExtender-NAPT/RangeExtender-NAPT.ino
Lines changed: 97 additions & 0 deletions b/‎libraries/ESP8266WiFi/examples/RangeExtender-NAPT/RangeExtender-NAPT.ino
Lines changed: 97 additions & 0 deletions
diff --git a/‎libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
Lines changed: 0 additions & 1 deletion b/‎libraries/ESP8266mDNS/src/LEAmDNS_Control.cpp
Lines changed: 0 additions & 1 deletion
diff --git a/‎tools/sdk/lib/liblwip2-1460-feat.a
66.6 KB b/‎tools/sdk/lib/liblwip2-1460-feat.a
66.6 KB
diff --git a/‎tools/sdk/lib/liblwip2-1460.a
4.38 KB b/‎tools/sdk/lib/liblwip2-1460.a
4.38 KB
diff --git a/‎tools/sdk/lib/liblwip2-536-feat.a
66.6 KB b/‎tools/sdk/lib/liblwip2-536-feat.a
66.6 KB
diff --git a/‎tools/sdk/lib/liblwip2-536.a
4.38 KB b/‎tools/sdk/lib/liblwip2-536.a
4.38 KB
diff --git a/‎tools/sdk/lib/liblwip6-1460-feat.a
8.83 KB b/‎tools/sdk/lib/liblwip6-1460-feat.a
8.83 KB
diff --git a/‎tools/sdk/lib/liblwip6-536-feat.a
8.83 KB b/‎tools/sdk/lib/liblwip6-536-feat.a
8.83 KB
diff --git a/‎tools/sdk/lwip2/builder b/‎tools/sdk/lwip2/builder
diff --git a/‎tools/sdk/lwip2/include/arch/cc.h
Lines changed: 6 additions & 4 deletions b/‎tools/sdk/lwip2/include/arch/cc.h
Lines changed: 6 additions & 4 deletions
@@ -0,0 +1,97 @@
+
+// NAPT example released to public domain
+
+#if LWIP_FEATURES && !LWIP_IPV6
+
+#define HAVE_NETDUMP 0
+
+#ifndef STASSID
+#define STASSID "mynetwork"
+#define STAPSK  "mynetworkpassword"
+#endif
+
+#include <ESP8266WiFi.h>
+#include <lwip/napt.h>
+#include <lwip/dns.h>
+#include <dhcpserver.h>
+
+#define NAPT 1000
+#define NAPT_PORT 10
+
+#if HAVE_NETDUMP
+
+#include <NetDump.h>
+
+void dump(int netif_idx, const char* data, size_t len, int out, int success) {
+  (void)success;
+  Serial.print(out ? F("out ") : F(" in "));
+  Serial.printf("%d ", netif_idx);
+
+  // optional filter example: if (netDump_is_ARP(data))
+  {
+    netDump(Serial, data, len);
+    //netDumpHex(Serial, data, len);
+  }
+}
+#endif
+
+void setup() {
+  Serial.begin(115200);
+  Serial.printf("\n\nNAPT Range extender\n");
+  Serial.printf("Heap on start: %d\n", ESP.getFreeHeap());
+
+#if HAVE_NETDUMP
+  phy_capture = dump;
+#endif
+
+  // first, connect to STA so we can get a proper local DNS server
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(STASSID, STAPSK);
+  while (WiFi.status() != WL_CONNECTED) {
+    Serial.print('.');
+    delay(500);
+  }
+  Serial.printf("\nSTA: %s (dns: %s / %s)\n",
+                WiFi.localIP().toString().c_str(),
+                WiFi.dnsIP(0).toString().c_str(),
+                WiFi.dnsIP(1).toString().c_str());
+
+  // give DNS servers to AP side
+  dhcps_set_dns(0, WiFi.dnsIP(0));
+  dhcps_set_dns(1, WiFi.dnsIP(1));
+ F438
+  WiFi.softAPConfig(  // enable AP, with android-compatible google domain
+    IPAddress(172, 217, 28, 254),
+    IPAddress(172, 217, 28, 254),
+    IPAddress(255, 255, 255, 0));
+  WiFi.softAP(STASSID "extender", STAPSK);
+  Serial.printf("AP: %s\n", WiFi.softAPIP().toString().c_str());
+
+  Serial.printf("Heap before: %d\n", ESP.getFreeHeap());
+  err_t ret = ip_napt_init(NAPT, NAPT_PORT);
+  Serial.printf("ip_napt_init(%d,%d): ret=%d (OK=%d)\n", NAPT, NAPT_PORT, (int)ret, (int)ERR_OK);
+  if (ret == ERR_OK) {
+    ret = ip_napt_enable_no(SOFTAP_IF, 1);
+    Serial.printf("ip_napt_enable_no(SOFTAP_IF): ret=%d (OK=%d)\n", (int)ret, (int)ERR_OK);
+    if (ret == ERR_OK) {
+      Serial.printf("WiFi Network '%s' with same password is now NATed behind '%s'\n", STASSID "extender", STASSID);
+    }
+  }
+  Serial.printf("Heap after napt init: %d\n", ESP.getFreeHeap());
+  if (ret != ERR_OK) {
+    Serial.printf("NAPT initialization failed\n");
+  }
+}
+
+#else
+
+void setup() {
+  Serial.begin(115200);
+  Serial.printf("\n\nNAPT not supported in this configuration\n");
+}
+
+#endif
+
+void loop() {
+}
+
@@ -22,7 +22,6 @@
  *
  */
 
-#include <arch/cc.h>
 #include <sys/time.h>
 #include <IPAddress.h>
 #include <AddrList.h>
 
@@ -58,10 +58,12 @@ void sntp_set_system_time (uint32_t t);
 
 #include "mem.h" // useful for os_malloc used in esp-arduino's mDNS
 
-typedef uint32_t sys_prot_t;	// not really used
-#define SYS_ARCH_DECL_PROTECT(lev)
-#define SYS_ARCH_PROTECT(lev) os_intr_lock()
-#define SYS_ARCH_UNPROTECT(lev) os_intr_unlock()
+#include "glue.h" // include assembly locking macro used below
+typedef uint32_t sys_prot_t;
+#define SYS_ARCH_DECL_PROTECT(lev) sys_prot_t lev
+#define SYS_ARCH_PROTECT(lev) lev = lwip_xt_rsil(15)
+#define SYS_ARCH_UNPROTECT(lev) lwip_xt_wsr_ps(lev)
+
 #define LWIP_NO_CTYPE_H 1
 
 ///////////////////////////////
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`*`
`23`	`23`	`*/`
`24`	`24`
`25`		`-#include <arch/cc.h>`
`26`	`25`	`#include <sys/time.h>`
`27`	`26`	`#include <IPAddress.h>`
`28`	`27`	`#include <AddrList.h>`