arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

WiFiServer - don't inherit from Server class (#8418)

Browse Source 
* WiFiServer - don't inherit from Server class
This commit is contained in:
Juraj Andrássy 2022-01-03 14:06:31 +01:00 committed by GitHub
parent dde2c769db
commit d0cc3a80f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
#endif #endif
template <class TServer, class TClient> template <class TServer, class TClient>
class ArduinoCompatibleWiFiServerTemplate : public TServer { class ArduinoCompatibleWiFiServerTemplate : public TServer, public Print {
public: public:
ArduinoCompatibleWiFiServerTemplate(const IPAddress& addr, uint16_t port) : TServer(addr, port) {} ArduinoCompatibleWiFiServerTemplate(const IPAddress& addr, uint16_t port) : TServer(addr, port) {}

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

@ -171,18 +171,6 @@ void WiFiServer::stop() {
close(); close();
} }
size_t WiFiServer::write(uint8_t b) {
return write(&b, 1);
}
size_t WiFiServer::write(const uint8_t *buffer, size_t size) {
// write to all clients
// not implemented
(void) buffer;
(void) size;
return 0;
}
template<typename T> template<typename T>
T* slist_append_tail(T* head, T* item) { T* slist_append_tail(T* head, T* item) {
if (!head) if (!head)

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

@ -65,7 +65,7 @@ extern "C" {
class ClientContext; class ClientContext;
class WiFiClient; class WiFiClient;
class WiFiServer : public Server { class WiFiServer {
// Secure server needs access to all the private entries here // Secure server needs access to all the private entries here
protected: protected:
uint16_t _port; uint16_t _port;
@ -94,14 +94,11 @@ public:
void begin(uint16_t port, uint8_t backlog); void begin(uint16_t port, uint8_t backlog);
void setNoDelay(bool nodelay); void setNoDelay(bool nodelay);
bool getNoDelay(); bool getNoDelay();
virtual size_t write(uint8_t);
virtual size_t write(const uint8_t *buf, size_t size);
uint8_t status(); uint8_t status();
uint16_t port() const; uint16_t port() const;
void close(); void close();
void stop(); void stop();
using Print::write;
using ClientType = WiFiClient; using ClientType = WiFiClient;
protected: protected:

12
tests/host/common/MockWiFiServerSocket.cpp
View File

@ -127,18 +127,6 @@ bool WiFiServer::hasClient ()
return poll(&p, 1, 0) && p.revents == POLLIN; return poll(&p, 1, 0) && p.revents == POLLIN;
} }
size_t WiFiServer::write (uint8_t c)
{
return write(&c, 1);
}
size_t WiFiServer::write (const uint8_t *buf, size_t size)
{
fprintf(stderr, MOCK "todo: WiFiServer::write(%p, %zd)\n", buf, size);
exit(EXIT_FAILURE);
return 0;
}
void WiFiServer::close () void WiFiServer::close ()
{ {
if (pcb2int(_listen_pcb) >= 0) if (pcb2int(_listen_pcb) >= 0)