Skip to content

Commit 990e3d5

Browse files
JAndrassySuGlider
andauthored
WiFiServer - deprecate available(), use accept() everywhere (#8860)
esp8266 and esp32 server.available() is not implemented as documented it is implemented like server.accept() is documented by Arduino Co-authored-by: Rodrigo Garcia <[email protected]>
1 parent 1e980bd commit 990e3d5

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

Diff for: libraries/ESPmDNS/examples/mDNS_Web_Server/mDNS_Web_Server.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void setup(void)
6969
void loop(void)
7070
{
7171
// Check if a client has connected
72-
WiFiClient client = server.available();
72+
WiFiClient client = server.accept();
7373
if (!client) {
7474
return;
7575
}

Diff for: libraries/WebServer/src/WebServer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ void WebServer::serveStatic(const char* uri, FS& fs, const char* path, const cha
274274

275275
void WebServer::handleClient() {
276276
if (_currentStatus == HC_NONE) {
277-
_currentClient = _server.available();
277+
_currentClient = _server.accept();
278278
if (!_currentClient) {
279279
if (_nullDelay) {
280280
delay(1);

Diff for: libraries/WiFi/examples/SimpleWiFiServer/SimpleWiFiServer.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void setup()
6363
}
6464

6565
void loop(){
66-
WiFiClient client = server.available(); // listen for incoming clients
66+
WiFiClient client = server.accept(); // listen for incoming clients
6767

6868
if (client) { // if you get a client,
6969
Serial.println("New Client."); // print a message out the serial port

Diff for: libraries/WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void setup() {
4848
}
4949

5050
void loop() {
51-
WiFiClient client = server.available(); // listen for incoming clients
51+
WiFiClient client = server.accept(); // listen for incoming clients
5252

5353
if (client) { // if you get a client,
5454
Serial.println("New Client."); // print a message out the serial port

Diff for: libraries/WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void loop() {
7878
//find free/disconnected spot
7979
if (!serverClients[i] || !serverClients[i].connected()){
8080
if(serverClients[i]) serverClients[i].stop();
81-
serverClients[i] = server.available();
81+
serverClients[i] = server.accept();
8282
if (!serverClients[i]) Serial.println("available broken");
8383
Serial.print("New client: ");
8484
Serial.print(i); Serial.print(' ');
@@ -88,7 +88,7 @@ void loop() {
8888
}
8989
if (i >= MAX_SRV_CLIENTS) {
9090
//no free/disconnected spot so reject
91-
server.available().stop();
91+
server.accept().stop();
9292
}
9393
}
9494
//check clients for data

Diff for: libraries/WiFi/src/WiFiServer.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ size_t WiFiServer::write(const uint8_t *data, size_t len){
3939
void WiFiServer::stopAll(){}
4040

4141
WiFiClient WiFiServer::available(){
42+
return accept();
43+
}
44+
45+
WiFiClient WiFiServer::accept(){
4246
if(!_listening)
4347
return WiFiClient();
4448
int client_sock;

Diff for: libraries/WiFi/src/WiFiServer.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class WiFiServer : public Server {
4545
log_v("WiFiServer::WiFiServer(addr=%s, port=%d, ...)", addr.toString().c_str(), port);
4646
}
4747
~WiFiServer(){ end();}
48-
WiFiClient available();
49-
WiFiClient accept(){return available();}
48+
WiFiClient available() __attribute__((deprecated("Renamed to accept().")));
49+
WiFiClient accept();
5050
void begin(uint16_t port=0);
5151
void begin(uint16_t port, int reuse_enable);
5252
void setNoDelay(bool nodelay);

0 commit comments

Comments
 (0)