mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-27 18:02:17 +03:00
WiFiServer - 'rename' available() to accept() (#8419)
* WiFiServer - 'rename' available() to accept() * use server.accept() instead of available() * WiFiServer.accept() and ArduinoWiFiServer class doc update
This commit is contained in:
@ -207,7 +207,7 @@ static const char *HTTP_RES =
|
||||
|
||||
void loop() {
|
||||
static int cnt;
|
||||
BearSSL::WiFiClientSecure incoming = server.available();
|
||||
BearSSL::WiFiClientSecure incoming = server.accept();
|
||||
if (!incoming) {
|
||||
return;
|
||||
}
|
||||
|
@ -227,7 +227,7 @@ static const char *HTTP_RES =
|
||||
"</html>\r\n";
|
||||
|
||||
void loop() {
|
||||
BearSSL::WiFiClientSecure incoming = server.available();
|
||||
BearSSL::WiFiClientSecure incoming = server.accept();
|
||||
if (!incoming) {
|
||||
return;
|
||||
}
|
||||
|
@ -175,7 +175,7 @@ unsigned long statusTimeMs = 0;
|
||||
void loop() {
|
||||
|
||||
if (statusServer.hasClient()) {
|
||||
WiFiClient cli = statusServer.available();
|
||||
WiFiClient cli = statusServer.accept();
|
||||
status(cli);
|
||||
}
|
||||
|
||||
|
@ -77,7 +77,7 @@ void loop() {
|
||||
|
||||
//check if there are any new clients
|
||||
if (server.hasClient()) {
|
||||
client = server.available();
|
||||
client = server.accept();
|
||||
Serial.println("New client");
|
||||
}
|
||||
|
||||
|
@ -54,7 +54,7 @@ void setup() {
|
||||
|
||||
void loop() {
|
||||
// Check if a client has connected
|
||||
WiFiClient client = server.available();
|
||||
WiFiClient client = server.accept();
|
||||
if (!client) {
|
||||
return;
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ void loop() {
|
||||
int i;
|
||||
for (i = 0; i < MAX_SRV_CLIENTS; i++)
|
||||
if (!serverClients[i]) { // equivalent to !serverClients[i].connected()
|
||||
serverClients[i] = server.available();
|
||||
serverClients[i] = server.accept();
|
||||
logger->print("New client: index ");
|
||||
logger->print(i);
|
||||
break;
|
||||
@ -138,8 +138,8 @@ void loop() {
|
||||
|
||||
//no free/disconnected spot so reject
|
||||
if (i == MAX_SRV_CLIENTS) {
|
||||
server.available().println("busy");
|
||||
// hints: server.available() is a WiFiClient with short-term scope
|
||||
server.accept().println("busy");
|
||||
// hints: server.accept() is a WiFiClient with short-term scope
|
||||
// when out of scope, a WiFiClient will
|
||||
// - flush() - all data will be sent
|
||||
// - stop() - automatically too
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -130,6 +130,10 @@ bool WiFiServer::hasMaxPendingClients() {
|
||||
|
||||
WiFiClient WiFiServer::available(byte* status) {
|
||||
(void) status;
|
||||
return accept();
|
||||
}
|
||||
|
||||
WiFiClient WiFiServer::accept() {
|
||||
if (_unclaimed) {
|
||||
WiFiClient result(_unclaimed);
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user