Merge remote-tracking branch 'esp8266/master'

Author: Me No Dev

cores/esp8266/core_esp8266_main.cpp

@@ -127,6 +127,9 @@ static void do_global_ctors(void) {
 extern "C" void __gdb_init() {}
 extern "C" void gdb_init(void) __attribute__ ((weak, alias("__gdb_init")));
 
+extern "C" void __gdb_do_break(){}
+extern "C" void gdb_do_break(void) __attribute__ ((weak, alias("__gdb_do_break")));
+
 void init_done() {
     system_set_os_print(1);
     gdb_init();

cores/esp8266/core_esp8266_postmortem.c

@@ -29,6 +29,8 @@
 #include "cont.h"
 
 extern void __real_system_restart_local();
+extern void gdb_do_break();
+
 extern cont_t g_cont;
 
 static const char* s_panic_file = 0;
@@ -184,11 +186,14 @@ void __assert_func(const char *file, int line, const char *func, const char *wha
     s_panic_file = file;
     s_panic_line = line;
     s_panic_func = func;
+    gdb_do_break();
 }
 
 void __panic_func(const char* file, int line, const char* func) {
     s_panic_file = file;
     s_panic_line = line;
     s_panic_func = func;
+    gdb_do_break();
     abort();
 }
+

cores/esp8266/umm_malloc/umm_malloc.c

@@ -841,13 +841,15 @@ static int check_poison_block( umm_block *pblock ) {
 
     pc_cur = pc + sizeof(UMM_POISONED_BLOCK_LEN_TYPE);
     if (!check_poison(pc_cur, UMM_POISON_SIZE_BEFORE, "before")) {
+      printf("block start: %08x\n", pc + sizeof(UMM_POISONED_BLOCK_LEN_TYPE) + UMM_POISON_SIZE_BEFORE);
       UMM_HEAP_CORRUPTION_CB();
       ok = 0;
       goto clean;
     }
 
     pc_cur = pc + *((UMM_POISONED_BLOCK_LEN_TYPE *)pc) - UMM_POISON_SIZE_AFTER;
     if (!check_poison(pc_cur, UMM_POISON_SIZE_AFTER, "after")) {
+	  printf("block start: %08x\n", pc + sizeof(UMM_POISONED_BLOCK_LEN_TYPE) + UMM_POISON_SIZE_BEFORE);
       UMM_HEAP_CORRUPTION_CB();
       ok = 0;
       goto clean;

doc/changes.md

@@ -4,6 +4,40 @@ title: Change Log
 
 ## Current version
 
+### Core
+- Fix NMI interrupt handler alignment
+- Update SDK to 1.5.3
+- umm_malloc: print block start address before heap corruption callback is triggered
+- If GDBStub library is used, break into gdb on assert and panic
+
+### Libraries
+
+- SNI support in WiFiClientSecure (#1285)
+- Update axTLS to 139914f
+- HTTPClient: return error when HTTPClient::begin is called with HTTPS URL without certificate fingerprint (#1941)
+- HTTPClient: fix default port not being set
+- HTTPClient: fix handling of chunked transfer encoding (#1975)
+- ESP8266SSDP: switch SSDP send arguments around
+- ESP8266WiFi: fix UdpContext::peek to return int (#1946)
+- ESP8266WiFi: fix WiFiSleepType_t values to match SDK ones
+- LwIP: use gcc-built LwIP by default (#1926)
+- LwIP: fix crash in igmp_start_timer (#1826)
+- HTTPClient: include non-standard ports in Host: header
+- ESP8266WiFi: Prevent WiFi config corruption (#1997 #1856 #1699 #1675)
+- GDBStub: fix section attribute for core gdbstub functions
+
+### Tools
+
+- Python 3 compatibility for get.py
+- Device side test library and test runner
+- Fix ARM toolchain files permissions (#2004)
+
+
+## 2.2.0
+April 18, 2016
+
+Package link: `http://arduino.esp8266.com/versions/2.2.0/package_esp8266com_index.json`.
+
 ### Core
 - Leverage realloc() in String::changeBuffer()
 - Clean up core files
@@ -25,7 +59,6 @@ title: Change Log
 - Don't set RF mode on boot unless it was overridden
 - Change build.board property for boards which renumber pins like NodeMCU (#1878)
 - Fix Exception 2 when using printf or vprintf
-- Add ARM tools (#269)
 
 ### Libraries
 - Update axTLS to 5b4be7d
@@ -55,6 +88,7 @@ title: Change Log
 
 
 ### Tools
+- Add ARM tools (#269)
 
 ---
 ## 2.1.0

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -844,8 +844,13 @@ bool HTTPClient::sendHeader(const char * type)
         header += "1";
     }
 
-    header += String(F("\r\nHost: ")) + _host +
-              F("\r\nUser-Agent: ") + _userAgent +
+    header += String(F("\r\nHost: ")) + _host;
+    if (_port != 80 && _port != 443)
+    {
+        header += ':';
+        header += String(_port);
+    }
+    header += String(F("\r\nUser-Agent: ")) + _userAgent +
               F("\r\nConnection: ");
 
     if(_reuse) {

libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp

@@ -140,6 +140,11 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
     ETS_UART_INTR_DISABLE();
 
     if(WiFi._persistent) {
+        // workaround for #1997: make sure the value of ap_number is updated and written to flash
+        // to be removed after SDK update
+        wifi_station_ap_number_set(2);
+        wifi_station_ap_number_set(1);
+
         wifi_station_set_config(&conf);
     } else {
         wifi_station_set_config_current(&conf);

libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

@@ -66,7 +66,7 @@ class SSLContext {
 public:
     SSLContext() {
         if (_ssl_ctx_refcnt == 0) {
-            _ssl_ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER | SSL_DEBUG_OPTS | SSL_CONNECT_IN_PARTS, 0);
+            _ssl_ctx = ssl_ctx_new(SSL_SERVER_VERIFY_LATER | SSL_DEBUG_OPTS | SSL_CONNECT_IN_PARTS | SSL_READ_BLOCKING, 0);
         }
         ++_ssl_ctx_refcnt;
     }
@@ -592,3 +592,7 @@ extern "C" void* ax_port_realloc(void* ptr, size_t size, const char* file, int l
 extern "C" void ax_port_free(void* ptr) {
     free(ptr);
 }
+
+extern "C" void ax_wdt_feed() {
+    optimistic_yield(10000);
+}

libraries/ESP8266WiFi/src/include/ssl.h

@@ -85,6 +85,7 @@ typedef struct SSL_ SSL;
 #define SSL_DISPLAY_CERTS                       0x00200000
 #define SSL_DISPLAY_RSA                         0x00400000
 #define SSL_CONNECT_IN_PARTS                    0x00800000
+#define SSL_READ_BLOCKING                       0x01000000
 
 /* errors that can be generated */
 #define SSL_OK                                  0

libraries/GDBStub/src/internal/gdbstub-cfg.h

@@ -56,6 +56,6 @@ are called when the flash is disabled (eg due to a Ctrl-C at the wrong time), th
 likely crash.
 */
 #define ATTR_GDBINIT	ICACHE_FLASH_ATTR
-#define ATTR_GDBFN
+#define ATTR_GDBFN		ICACHE_RAM_ATTR
 
 #endif

libraries/GDBStub/src/internal/gdbstub.c

@@ -787,4 +787,9 @@ void ATTR_GDBINIT gdbstub_init() {
 #endif
 }
 
+void ATTR_GDBFN gdbstub_do_break_wrapper() {
+	gdbstub_do_break();
+}
+
+extern void gdb_do_break() __attribute__((weak, alias("gdbstub_do_break_wrapper")));
 extern void gdb_init() __attribute__((weak, alias("gdbstub_init")));

package/package_esp8266com_index.template.json

@@ -177,8 +177,8 @@
             },
             {
               "host": "arm-linux-gnueabihf",
-              "url": "http://arduino.esp8266.com/linuxarm-xtensa-lx106-elf-g46f160f.tar.gz",
-              "archiveFileName": "linuxarm-xtensa-lx106-elf-g46f160f.tar.gz",
+              "url": "http://arduino.esp8266.com/linuxarm-xtensa-lx106-elf-g46f160f-2.tar.gz",
+              "archiveFileName": "linuxarm-xtensa-lx106-elf-g46f160f-2.tar.gz",
               "checksum": "SHA-256:1ac752bac7fff6be95ce10f56689f155fefea09e4ef710dbd75cb573798ff9c0",
               "size": "34929527"
             }

tests/device/Makefile

@@ -71,7 +71,8 @@ ifneq ("$(NO_RUN)","1")
 			$(RUNNER_DEBUG_FLAG) \
 			-p $(UPLOAD_PORT) \
 			-n $(basename $(notdir $@)) \
-			-o $(LOCAL_BUILD_DIR)/test_result.xml
+			-o $(LOCAL_BUILD_DIR)/test_result.xml \
+			`test -f $(addsuffix .py, $(basename $@)) && echo "-m $(addsuffix .py, $(basename $@))" || echo ""`
 endif
 
 $(BUILD_DIR):

tests/device/libraries/BSTest/mock_decorators.py

@@ -0,0 +1,28 @@
+
+env = dict()
+
+def setup(test_name):
+	global env
+	if not test_name in env:
+		env[test_name] = dict()
+	func_env = env[test_name]
+	def decorator(func):
+		def func_wrapper():
+			return func(env[test_name])
+		func_env['setup'] = func_wrapper
+		return func_wrapper
+	return decorator
+
+
+
+def teardown(test_name):
+	global env
+	if not test_name in env:
+		env[test_name] = dict()
+	func_env = env[test_name]
+	def decorator(func):
+		def func_wrapper():
+			return func(env[test_name])
+		func_env['teardown'] = func_wrapper
+		return func_wrapper
+	return decorator

tests/device/libraries/BSTest/requirements.txt

@@ -1,6 +1,12 @@
+Flask==0.10.1
+itsdangerous==0.24
+Jinja2==2.8
 junit-xml==1.6
+MarkupSafe==0.23
 pexpect==4.0.1
 ptyprocess==0.5.1
 pyserial==3.0.1
+PyYAML==3.11
 six==1.10.0
-wheel==0.24.0
+Werkzeug==0.11.9
+wheel==0.24.0

tests/device/libraries/BSTest/runner.py

@@ -8,15 +8,19 @@
 import argparse
 import serial
 import subprocess
+import imp
 from urlparse import urlparse
 from junit_xml import TestSuite, TestCase
 try:
     from cStringIO import StringIO
 except:
     from StringIO import StringIO
+import mock_decorators
 
 debug = False
 
+sys.path.append(os.path.abspath(__file__))
+
 def debug_print(*args, **kwargs):
     if not debug:
         return
@@ -29,17 +33,18 @@ class BSTestRunner(object):
     TIMEOUT = 2
     CRASH = 3
 
-    def __init__(self, spawn_obj, name):
+    def __init__(self, spawn_obj, name, mocks):
         self.sp = spawn_obj
         self.tests = []
         self.reset_timeout = 2
         self.name = name
+        self.mocks = mocks
 
     def get_test_list(self):
         self.sp.sendline('-1')
         timeout = 10
         while timeout > 0:
-            res = self.sp.expect(['>>>>>bs_test_menu_begin', EOF])
+            res = self.sp.expect(['>>>>>bs_test_menu_begin', EOF, TIMEOUT])
             if res == 0:
                 break
             timeout-=1
@@ -49,15 +54,15 @@ def get_test_list(self):
         while True:
             res = self.sp.expect(['>>>>>bs_test_item id\=(\d+) name\="([^\"]*?)" desc="([^"]*?)"',
                                   '>>>>>bs_test_menu_end',
-                                  EOF])
+                                  EOF, TIMEOUT])
             if res == 0:
                 m = self.sp.match
                 t = {'id': m.group(1), 'name': m.group(2), 'desc': m.group(3)}
                 self.tests.append(t)
                 debug_print('added test', t)
             elif res == 1:
                 break
-            elif res == 2:
+            elif res >= 2:
                 time.sleep(0.1)
 
         debug_print('got {} tests'.format(len(self.tests)))
@@ -75,8 +80,14 @@ def run_tests(self):
             else:
                 test_output = StringIO()
                 self.sp.logfile = test_output
+                if name in self.mocks:
+                    print('setting up mocks')
+                    self.mocks[name]['setup']()
                 t_start = time.time()
                 result = self.run_test(index)
+                if name in self.mocks:
+                    print('tearing down mocks')
+                    self.mocks[name]['teardown']()
                 t_stop = time.time()
                 self.sp.logfile = None
                 test_case.elapsed_sec = t_stop - t_start
@@ -96,7 +107,7 @@ def run_test(self, index):
         self.sp.sendline('{}'.format(index))
         timeout = 10
         while timeout > 0:
-            res = self.sp.expect(['>>>>>bs_test_start', EOF])
+            res = self.sp.expect(['>>>>>bs_test_start', EOF, TIMEOUT])
             if res == 0:
                 break
             time.sleep(0.1)
@@ -147,8 +158,8 @@ def spawn_port(port_name, baudrate=115200):
 def spawn_exec(name):
     return pexpect.spawn(name, timeout=0)
 
-def run_tests(spawn, name):
-    tw = BSTestRunner(spawn, name)
+def run_tests(spawn, name, mocks):
+    tw = BSTestRunner(spawn, name, mocks)
     tw.get_test_list()
     return tw.run_tests()
 
@@ -159,6 +170,7 @@ def parse_args():
     parser.add_argument('-e', '--executable', help='Talk to the test executable')
     parser.add_argument('-n', '--name', help='Test run name')
     parser.add_argument('-o', '--output', help='Output JUnit format test report')
+    parser.add_argument('-m', '--mock', help='Set python script to use for mocking purposes')
     return parser.parse_args()
 
 def main():
@@ -178,8 +190,12 @@ def main():
     if spawn_func is None:
         debug_print("Please specify port or executable", file=sys.stderr)
         return 1
+    mocks = {}
+    if args.mock is not None:
+        mocks_mod = imp.load_source('mocks', args.mock)
+        mocks = mock_decorators.env
     with spawn_func(spawn_arg) as sp:
-        ts = run_tests(sp, name)
+        ts = run_tests(sp, name, mocks)
         if args.output:
             with open(args.output, "w") as f:
                 TestSuite.to_file(f, [ts])

tests/device/test_FS/test_FS.ino

@@ -90,7 +90,7 @@ TEST_CASE("files can be renamed", "[fs]")
     }
 }
 
-TEST_CASE("FS::info works")
+TEST_CASE("FS::info works","[fs]")
 {
     REQUIRE(SPIFFS.begin());
     FSInfo info;

tests/device/test_http_client/server.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIICzzCCAbcCCQCUajf39FoF8jANBgkqhkiG9w0BAQsFADAWMRQwEgYDVQQDDAtj
+YS50bHMudGVzdDAeFw0xNjA0MjIxMTU1MTlaFw0xNzA0MjIxMTU1MTlaMD0xITAf
+BgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEYMBYGA1UEAwwPc2VydmVy
+LnRscy50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwhyGSO13
+/ozG0rL6FxDaaxYgMyPVK3hIhTHfKOK/eRZFRDFAhYudz9NbkvUMIF1SToED9FBh
+MbJrkPzCU3cLC1zgnTLseoOS3FKC8xVfJVwsWD8YjMvyQUV/Uo9TAHQSA4SfOB4W
+JjRBMX2GCoWLK5wVzxX+XGd5DnqME4n/CG+Il1t8mB+ACeA1FKwVPTi1wGvDzuCo
+swSEX3J08JB9rP5dix7t+Fezgr6PkvUcnAcu4utAw6f6c0LoHk0SnyXJg1jTdKrl
+J8dIyWQR0cvaxbF+04hvpDepx/62CP+aRs1zcC37eEQ3BVf4phJXbwuXbT7a1CUf
+XQ0cWnJg8mdfcQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBV7ZiwVM8alxPN9vd/
+Ze8EiidSuztkbtZX3mhHfkcJ2Q5c+tZ0Oxy4/g6oISe1+NOQJDMrsARrdWVPmmsb
+ihSHNdS6t0DTcWR5h+i/rnGh+cGiWOJKfhNWvpCVuU6YRZWhYOztL8p6iHoG3ZBi
++zo9GD71FNSRQxMois9sR9q/IgOmkm8CjQgYsv9bQ+Le4mRqfaOCOSoQvsRyLoam
+lNl85gzvVygHYPP9ypiia8btyOHwDSHiV8UhKaERSGKFqznPmTTwTQNXEtQylCXG
+C+13mMGVr49yP4cuYaM8mfL8Rg7Im8Mfa0GXq5PBwEFFYpR9xnbBouQv5erYTQdl
+Oxqk
+-----END CERTIFICATE-----