WiFiServer - 'rename' available() to accept()

esp8266 · d-a-v · Jan 3, 2022 · Dec 19, 2021 · Dec 21, 2021 · Dec 21, 2021
commit 91e2ab18c27486374a420196ee26e11a966e8a09
diff --git a/libraries/ESP8266WiFi/src/ArduinoWiFiServer.h b/libraries/ESP8266WiFi/src/ArduinoWiFiServer.h
@@ -35,11 +35,6 @@ class ArduinoCompatibleWiFiServerTemplate : public TServer {
   ArduinoCompatibleWiFiServerTemplate(uint16_t port) : TServer(port) {}
   virtual ~ArduinoCompatibleWiFiServerTemplate() {}
 
-  // https://www.arduino.cc/en/Reference/EthernetServerAccept
-  TClient accept() {
-    return TServer::available();
-  }
-
   // https://www.arduino.cc/en/Reference/WiFiServerAvailable
   TClient available() {
 
@@ -132,7 +127,7 @@ class ArduinoCompatibleWiFiServerTemplate : public TServer {
   void acceptClients() {
     for (uint8_t i = 0; i < MAX_MONITORED_CLIENTS; i++) {
       if (!connectedClients[i]) {
-        connectedClients[i] = accept();
+        connectedClients[i] = TServer::accept();
       }
     }
   }

diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -130,6 +130,10 @@ bool WiFiServer::hasMaxPendingClients() {
 
 WiFiClient WiFiServer::available(byte* status) {
     (void) status;
+    return accept();
+}
+
+WiFiClient WiFiServer::accept() {
     if (_unclaimed) {
         WiFiClient result(_unclaimed);
 

diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -80,7 +80,8 @@ class WiFiServer : public Server {
   WiFiServer(const IPAddress& addr, uint16_t port);
   WiFiServer(uint16_t port);
   virtual ~WiFiServer() {}
-  WiFiClient available(uint8_t* status = NULL);
+  WiFiClient accept(); // https://www.arduino.cc/en/Reference/EthernetServerAccept
+  WiFiClient available(uint8_t* status = NULL) __attribute__((deprecated("Renamed to accept().")));
   bool hasClient();
   // hasClientData():
   // returns the amount of data available from the first client

diff --git a/libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp b/libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp
@@ -77,6 +77,10 @@ void WiFiServerSecure::setECCert(const X509List *chain, unsigned cert_issuer_key
 // then any validation (i.e. client cert checking) will have succeeded.
 WiFiClientSecure WiFiServerSecure::available(uint8_t* status) {
   (void) status; // Unused
+  return accept();
+}
+
+WiFiClientSecure WiFiServerSecure::accept() {
   if (_unclaimed) {
     if (_sk && _sk->isRSA()) {
       WiFiClientSecure result(_unclaimed, _chain, _sk, _iobuf_in_size, _iobuf_out_size, _cache, _client_CA_ta, _tls_min, _tls_max);

diff --git a/libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.h b/libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.h
@@ -65,7 +65,8 @@ class WiFiServerSecure : public WiFiServer {
     bool setSSLVersion(uint32_t min = BR_TLS10, uint32_t max = BR_TLS12);
 
     // If awaiting connection available and authenticated (i.e. client cert), return it.
-    WiFiClientSecure available(uint8_t* status = NULL);
+    WiFiClientSecure accept(); // https://www.arduino.cc/en/Reference/EthernetServerAccept
+    WiFiClientSecure available(uint8_t* status = NULL) __attribute__((deprecated("Renamed to accept().")));
 
     WiFiServerSecure& operator=(const WiFiServerSecure&) = default;
 

diff --git a/tests/host/common/MockWiFiServer.cpp b/tests/host/common/MockWiFiServer.cpp
@@ -58,6 +58,11 @@ WiFiServer::WiFiServer (uint16_t port)
 WiFiClient WiFiServer::available (uint8_t* status)
 {
 	(void)status;
+	return accept();
+}
+
+WiFiClient WiFiServer::accept ()
+{
 	if (hasClient())
 		return WiFiClient(new ClientContext(serverAccept(pcb2int(_listen_pcb))));
 	return WiFiClient();