From c56d9832d9e2e601f57b9f87593a2ff46f665bc4 Mon Sep 17 00:00:00 2001 From: LaborEtArs Date: Wed, 8 Jan 2020 15:58:56 +0100 Subject: [PATCH 1/2] Updating _port to really used port and made _port accessible --- libraries/ESP8266WiFi/src/WiFiServer.cpp | 5 +++++ libraries/ESP8266WiFi/src/WiFiServer.h | 1 + libraries/LittleFS/lib/littlefs | 2 +- libraries/SoftwareSerial | 2 +- tools/sdk/ssl/bearssl | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp index d9d47657df..494bf61dd5 100644 --- a/libraries/ESP8266WiFi/src/WiFiServer.cpp +++ b/libraries/ESP8266WiFi/src/WiFiServer.cpp @@ -83,6 +83,7 @@ void WiFiServer::begin(uint16_t port) { return; } _pcb = listen_pcb; + _port = _pcb->local_port; tcp_accept(listen_pcb, &WiFiServer::_s_accept); tcp_arg(listen_pcb, (void*) this); } @@ -126,6 +127,10 @@ uint8_t WiFiServer::status() { return _pcb->state; } +uint16_t WiFiServer::port() const { + return _port; +} + void WiFiServer::close() { if (!_pcb) { return; diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h index ec0cea17d6..7a4a3246d3 100644 --- a/libraries/ESP8266WiFi/src/WiFiServer.h +++ b/libraries/ESP8266WiFi/src/WiFiServer.h @@ -58,6 +58,7 @@ class WiFiServer : public Server { virtual size_t write(uint8_t); virtual size_t write(const uint8_t *buf, size_t size); uint8_t status(); + uint16_t port() const; void close(); void stop(); diff --git a/libraries/LittleFS/lib/littlefs b/libraries/LittleFS/lib/littlefs index ce2c01f098..6b65737715 160000 --- a/libraries/LittleFS/lib/littlefs +++ b/libraries/LittleFS/lib/littlefs @@ -1 +1 @@ -Subproject commit ce2c01f098f4d2b9479de5a796c3bb531f1fe14c +Subproject commit 6b65737715039ef92d348014316b575b52547019 diff --git a/libraries/SoftwareSerial b/libraries/SoftwareSerial index 1bb28accb7..3bfd18d428 160000 --- a/libraries/SoftwareSerial +++ b/libraries/SoftwareSerial @@ -1 +1 @@ -Subproject commit 1bb28accb7cadacd425e7394b5e517933d187106 +Subproject commit 3bfd18d428992b1924eebb28e333ee21d00e9ead diff --git a/tools/sdk/ssl/bearssl b/tools/sdk/ssl/bearssl index 0645c68c36..89454af34e 160000 --- a/tools/sdk/ssl/bearssl +++ b/tools/sdk/ssl/bearssl @@ -1 +1 @@ -Subproject commit 0645c68c3653233c4d0e59252cd591a664f808fd +Subproject commit 89454af34e3e61ddfc9837f3da5a0bc8ed44c3aa From 05b6020049e4bc18b4e5da1f65e101adbb96e67a Mon Sep 17 00:00:00 2001 From: LaborEtArs Date: Wed, 8 Jan 2020 17:35:58 +0100 Subject: [PATCH 2/2] 2. Try --- libraries/LittleFS/lib/littlefs | 2 +- libraries/SoftwareSerial | 2 +- tools/sdk/ssl/bearssl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/LittleFS/lib/littlefs b/libraries/LittleFS/lib/littlefs index 6b65737715..ce2c01f098 160000 --- a/libraries/LittleFS/lib/littlefs +++ b/libraries/LittleFS/lib/littlefs @@ -1 +1 @@ -Subproject commit 6b65737715039ef92d348014316b575b52547019 +Subproject commit ce2c01f098f4d2b9479de5a796c3bb531f1fe14c diff --git a/libraries/SoftwareSerial b/libraries/SoftwareSerial index 3bfd18d428..1bb28accb7 160000 --- a/libraries/SoftwareSerial +++ b/libraries/SoftwareSerial @@ -1 +1 @@ -Subproject commit 3bfd18d428992b1924eebb28e333ee21d00e9ead +Subproject commit 1bb28accb7cadacd425e7394b5e517933d187106 diff --git a/tools/sdk/ssl/bearssl b/tools/sdk/ssl/bearssl index 89454af34e..0645c68c36 160000 --- a/tools/sdk/ssl/bearssl +++ b/tools/sdk/ssl/bearssl @@ -1 +1 @@ -Subproject commit 89454af34e3e61ddfc9837f3da5a0bc8ed44c3aa +Subproject commit 0645c68c3653233c4d0e59252cd591a664f808fd