Allow WiFiServer to bind to a specific address (esp8266#997)

igrr · igrr · commit 5b28ae23c262 · 2015-11-15T20:35:52.000+03:00
In addition to the existing constructors (WiFiServer::WiFiServer(port) and WiFiWebServer::WiFiWebServer(port)), new constructors are added:
WiFiServer::WiFiServer(IPAddress, port) and WiFiWebServer::WiFiWebServer(IPAddress, port).
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -31,23 +31,32 @@
 #define DEBUG_OUTPUT Serial
 
 
+ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
+: _server(addr, port)
+, _firstHandler(0)
+, _lastHandler(0)
+, _currentArgCount(0)
+, _currentArgs(0)
+, _headerKeysCount(0)
+, _currentHeaders(0)
+{
+}
+
 ESP8266WebServer::ESP8266WebServer(int port)
 : _server(port)
 , _firstHandler(0)
 , _lastHandler(0)
 , _currentArgCount(0)
 , _currentArgs(0)
-,_headerKeysCount(0)
-,_currentHeaders(0)
+, _headerKeysCount(0)
+, _currentHeaders(0)
 {
 }
 
 ESP8266WebServer::~ESP8266WebServer() {
-   if (_currentHeaders)
-     delete[]_currentHeaders;
+  if (_currentHeaders)
+    delete[]_currentHeaders;
   _headerKeysCount = 0;
-  if (!_firstHandler)
-    return;
   RequestHandler* handler = _firstHandler;
   while (handler) {
     RequestHandler* next = handler->next();
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -59,6 +59,7 @@ typedef struct {
 class ESP8266WebServer
 {
 public:
+  ESP8266WebServer(IPAddress addr, int port = 80);
   ESP8266WebServer(int port = 80);
   ~ESP8266WebServer();
 
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -38,33 +38,41 @@ extern "C" {
 #include "cbuf.h"
 #include "include/ClientContext.h"
 
-WiFiServer::WiFiServer(uint16_t port)
+WiFiServer::WiFiServer(IPAddress addr, uint16_t port)
+: _port(port)
+, _addr(addr)
+, _pcb(nullptr)
+, _unclaimed(nullptr)
+, _discarded(nullptr)
 {
-    _port = port;
-    _pcb = 0;
-    _unclaimed = 0;
-    _discarded = 0;
 }
 
-void WiFiServer::begin()
+WiFiServer::WiFiServer(uint16_t port)
+: _port(port)
+, _addr((uint32_t) IPADDR_ANY)
+, _pcb(nullptr)
+, _unclaimed(nullptr)
+, _discarded(nullptr)
 {
-    err_t err;
+}
 
+void WiFiServer::begin() {
+    err_t err;
     tcp_pcb* pcb = tcp_new();
     if (!pcb)
         return;
 
-    err = tcp_bind(pcb, INADDR_ANY, _port);
+    ip_addr_t local_addr;
+    local_addr.addr = (uint32_t) _addr;
+    err = tcp_bind(pcb, &local_addr, _port);
 
-    if (err != ERR_OK)
-    {
+    if (err != ERR_OK) {
         tcp_close(pcb);
         return;
     }
 
     tcp_pcb* listen_pcb = tcp_listen(pcb);
-    if (!listen_pcb)
-    {
+    if (!listen_pcb) {
         tcp_close(pcb);
         return;
     }
@@ -73,59 +81,59 @@ void WiFiServer::begin()
     tcp_arg(listen_pcb, (void*) this);
 }
 
-void WiFiServer::setNoDelay(bool nodelay){
-  if(!_pcb) return;
-  if(nodelay) tcp_nagle_disable(_pcb);
-  else tcp_nagle_enable(_pcb);
-}
+void WiFiServer::setNoDelay(bool nodelay) {
+    if (!_pcb)
+      return;
 
-bool WiFiServer::getNoDelay(){
-  if(!_pcb) return false;
-  return tcp_nagle_disabled(_pcb);
+    if (nodelay)
+        tcp_nagle_disable(_pcb);
+    else
+        tcp_nagle_enable(_pcb);
 }
 
-bool WiFiServer::hasClient(){
-  if (_unclaimed) return true;
-  return false;
+bool WiFiServer::getNoDelay() {
+    if (!_pcb)
+        return false;
+    return tcp_nagle_disabled(_pcb);
 }
 
-WiFiClient WiFiServer::available(byte* status)
-{
+bool WiFiServer::hasClient() {
     if (_unclaimed)
-    {
+        return true;
+    return false;
+}
+
+WiFiClient WiFiServer::available(byte* status) {
+    if (_unclaimed) {
         WiFiClient result(_unclaimed);
         _unclaimed = _unclaimed->next();
         DEBUGV("WS:av\r\n");
         return result;
     }
 
     optimistic_yield(1000);
-
     return WiFiClient();
 }
 
-uint8_t WiFiServer::status() {
+uint8_t WiFiServer::status()  {
     if (!_pcb)
         return CLOSED;
     return _pcb->state;
 }
 
 
-size_t WiFiServer::write(uint8_t b)
-{
+size_t WiFiServer::write(uint8_t b) {
     return write(&b, 1);
 }
 
-size_t WiFiServer::write(const uint8_t *buffer, size_t size)
-{
+size_t WiFiServer::write(const uint8_t *buffer, size_t size) {
     // write to all clients
     // not implemented
     return 0;
 }
 
 template<typename T>
-T* slist_append_tail(T* head, T* item)
-{
+T* slist_append_tail(T* head, T* item) {
     if (!head)
         return item;
     T* last = head;
@@ -135,29 +143,23 @@ T* slist_append_tail(T* head, T* item)
     return head;
 }
 
-int8_t WiFiServer::_accept(tcp_pcb* apcb, int8_t err)
-{
+int8_t WiFiServer::_accept(tcp_pcb* apcb, int8_t err) {
     DEBUGV("WS:ac\r\n");
     ClientContext* client = new ClientContext(apcb, &WiFiServer::_s_discard, this);
     _unclaimed = slist_append_tail(_unclaimed, client);
     tcp_accepted(_pcb);
-    // printf("WiFiServer::_accept\r\n");
     return ERR_OK;
 }
 
-void WiFiServer::_discard(ClientContext* client)
-{
+void WiFiServer::_discard(ClientContext* client) {
     // _discarded = slist_append_tail(_discarded, client);
     DEBUGV("WS:dis\r\n");
-    // printf("WiFiServer::_discard\r\n");
 }
 
-int8_t WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, int8_t err)
-{
+int8_t WiFiServer::_s_accept(void *arg, tcp_pcb* newpcb, int8_t err) {
     return reinterpret_cast<WiFiServer*>(arg)->_accept(newpcb, err);
 }
 
-void WiFiServer::_s_discard(void* server, ClientContext* ctx)
-{
+void WiFiServer::_s_discard(void* server, ClientContext* ctx) {
     reinterpret_cast<WiFiServer*>(server)->_discard(ctx);
 }
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -29,19 +29,22 @@ extern "C" {
 }
 
 #include "Server.h"
+#include "IPAddress.h"
 
 class ClientContext;
 class WiFiClient;
 
 class WiFiServer : public Server {
 private:
   uint16_t _port;
+  IPAddress _addr;
   tcp_pcb* _pcb;
 
   ClientContext* _unclaimed;
   ClientContext* _discarded;
 
 public:
+  WiFiServer(IPAddress addr, uint16_t port);
   WiFiServer(uint16_t port);
   WiFiClient available(uint8_t* status = NULL);
   bool hasClient();
@@ -56,7 +59,7 @@ class WiFiServer : public Server {
 
 protected:
   int8_t _accept(tcp_pcb* newpcb, int8_t err);
-  void   _discard(ClientContext* client);  
+  void   _discard(ClientContext* client);
 
   static int8_t _s_accept(void *arg, tcp_pcb* newpcb, int8_t err);
   static void _s_discard(void* server, ClientContext* ctx);

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ typedef struct {`
`59`	`59`	`class ESP8266WebServer`
`60`	`60`	`{`
`61`	`61`	`public:`
	`62`	`+ ESP8266WebServer(IPAddress addr, int port = 80);`
`62`	`63`	`ESP8266WebServer(int port = 80);`
`63`	`64`	`~ESP8266WebServer();`
`64`	`65`