arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-23 08:45:22 +03:00
Code Activity

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

Browse Source 
* WiFiServer - 'rename' available() to accept()
* use server.accept() instead of available()
* WiFiServer.accept() and ArduinoWiFiServer class doc update
This commit is contained in:
Juraj Andrássy
2022-01-03 14:32:02 +01:00
committed by GitHub
parent 2f58f679ee
commit f401f08aba
20 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/ESP8266WiFi/src/ArduinoWiFiServer.h
View File

@ -35,11 +35,6 @@ public:
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 @@ private:
void acceptClients() {
for (uint8_t i = 0; i < MAX_MONITORED_CLIENTS; i++) {
if (!connectedClients[i]) {
connectedClients[i] = accept();
connectedClients[i] = TServer::accept();
}
}
}

4
libraries/ESP8266WiFi/src/WiFiServer.cpp
View File

@ -130,6 +130,10 @@ bool WiFiServer::hasMaxPendingClients() {
WiFiClient WiFiServer::available(byte* status) {
(void) status;
return accept();
}
WiFiClient WiFiServer::accept() {
if (_unclaimed) {
WiFiClient result(_unclaimed);

3
libraries/ESP8266WiFi/src/WiFiServer.h
View File

@ -80,7 +80,8 @@ public:
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

4
libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.cpp
View File

@ -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);

3
libraries/ESP8266WiFi/src/WiFiServerSecureBearSSL.h
View File

@ -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;