Skip to content

Commit a96309c

Browse files
committed
use server.accept() instead of available()
1 parent 91e2ab1 commit a96309c

File tree

12 files changed

+16
-16
lines changed

12 files changed

+16
-16
lines changed

libraries/ESP8266AVRISP/src/ESP8266AVRISP.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ AVRISPState_t ESP8266AVRISP::update() {
7272
switch (_state) {
7373
case AVRISP_STATE_IDLE: {
7474
if (_server.hasClient()) {
75-
_client = _server.available();
75+
_client = _server.accept();
7676
_client.setNoDelay(true);
7777
AVRISP_DEBUG("client connect %s:%d", _client.remoteIP().toString().c_str(), _client.remotePort());
7878
_client.setTimeout(100); // for getch()
@@ -121,7 +121,7 @@ AVRISPState_t ESP8266AVRISP::serve() {
121121
}
122122

123123
inline void ESP8266AVRISP::_reject_incoming(void) {
124-
while (_server.hasClient()) _server.available().stop();
124+
while (_server.hasClient()) _server.accept().stop();
125125
}
126126

127127
uint8_t ESP8266AVRISP::getch() {

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void ESP8266WebServerTemplate<ServerType>::serveStatic(const char* uri, FS& fs,
281281
template <typename ServerType>
282282
void ESP8266WebServerTemplate<ServerType>::handleClient() {
283283
if (_currentStatus == HC_NONE) {
284-
ClientType client = _server.available();
284+
ClientType client = _server.accept();
285285
if (!client) {
286286
return;
287287
}

libraries/ESP8266WiFi/examples/BearSSL_Server/BearSSL_Server.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static const char *HTTP_RES =
207207

208208
void loop() {
209209
static int cnt;
210-
BearSSL::WiFiClientSecure incoming = server.available();
210+
BearSSL::WiFiClientSecure incoming = server.accept();
211211
if (!incoming) {
212212
return;
213213
}

libraries/ESP8266WiFi/examples/BearSSL_ServerClientCert/BearSSL_ServerClientCert.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ static const char *HTTP_RES =
227227
"</html>\r\n";
228228

229229
void loop() {
230-
BearSSL::WiFiClientSecure incoming = server.available();
230+
BearSSL::WiFiClientSecure incoming = server.accept();
231231
if (!incoming) {
232232
return;
233233
}

libraries/ESP8266WiFi/examples/IPv6/IPv6.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ unsigned long statusTimeMs = 0;
175175
void loop() {
176176

177177
if (statusServer.hasClient()) {
178-
WiFiClient cli = statusServer.available();
178+
WiFiClient cli = statusServer.accept();
179179
status(cli);
180180
}
181181

libraries/ESP8266WiFi/examples/WiFiEcho/WiFiEcho.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void loop() {
7777

7878
//check if there are any new clients
7979
if (server.hasClient()) {
80-
client = server.available();
80+
client = server.accept();
8181
Serial.println("New client");
8282
}
8383

libraries/ESP8266WiFi/examples/WiFiManualWebServer/WiFiManualWebServer.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void setup() {
5454

5555
void loop() {
5656
// Check if a client has connected
57-
WiFiClient client = server.available();
57+
WiFiClient client = server.accept();
5858
if (!client) {
5959
return;
6060
}

libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@ void loop() {
130130
int i;
131131
for (i = 0; i < MAX_SRV_CLIENTS; i++)
132132
if (!serverClients[i]) { // equivalent to !serverClients[i].connected()
133-
serverClients[i] = server.available();
133+
serverClients[i] = server.accept();
134134
logger->print("New client: index ");
135135
logger->print(i);
136136
break;
137137
}
138138

139139
//no free/disconnected spot so reject
140140
if (i == MAX_SRV_CLIENTS) {
141-
server.available().println("busy");
142-
// hints: server.available() is a WiFiClient with short-term scope
141+
server.accept().println("busy");
142+
// hints: server.accept() is a WiFiClient with short-term scope
143143
// when out of scope, a WiFiClient will
144144
// - flush() - all data will be sent
145145
// - stop() - automatically too

libraries/ESP8266WiFiMesh/src/ESP8266WiFiMesh.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void ESP8266WiFiMesh::acceptRequest()
624624
if(_handler != NULL)
625625
{
626626
while (true) {
627-
_client = _server.available();
627+
_client = _server.accept();
628628
if (!_client)
629629
break;
630630

@@ -647,7 +647,7 @@ void ESP8266WiFiMesh::acceptRequest()
647647
{
648648
////////////////////////////</DEPRECATED> TODO: REMOVE IN 2.5.0////////////////////////////
649649
while (true) {
650-
WiFiClient _client = _server.available();
650+
WiFiClient _client = _server.accept();
651651

652652
if (!_client)
653653
break;

libraries/ESP8266WiFiMesh/src/TcpIpMeshBackend.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ void TcpIpMeshBackend::acceptRequests()
533533
}
534534

535535
while (true) {
536-
WiFiClient _client = _server.available();
536+
WiFiClient _client = _server.accept();
537537

538538
if (!_client)
539539
break;

libraries/ESP8266mDNS/examples/mDNS_Web_Server/mDNS_Web_Server.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void loop(void) {
7676
MDNS.update();
7777

7878
// Check if a client has connected
79-
WiFiClient client = server.available();
79+
WiFiClient client = server.accept();
8080
if (!client) {
8181
return;
8282
}

libraries/Netdump/src/Netdump.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void Netdump::tcpDumpLoop(WiFiServer &tcpDumpServer, const Filter nf)
193193
{
194194
if (tcpDumpServer.hasClient())
195195
{
196-
tcpDumpClient = tcpDumpServer.available();
196+
tcpDumpClient = tcpDumpServer.accept();
197197
tcpDumpClient.setNoDelay(true);
198198

199199
bufferIndex = 0;

0 commit comments

Comments
 (0)