Skip to content

Commit a5c3aea

Browse files
committed
Merge pull request #1189 from Links2004/master
fix #1167 WiFiServer stop / close
2 parents 086af80 + 9a096f8 commit a5c3aea

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed

libraries/ESP8266WebServer/src/ESP8266WebServer.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ ESP8266WebServer::~ESP8266WebServer() {
7171
delete handler;
7272
handler = next;
7373
}
74+
close();
7475
}
7576

7677
void ESP8266WebServer::begin() {
@@ -173,6 +174,14 @@ void ESP8266WebServer::handleClient() {
173174
_handleRequest();
174175
}
175176

177+
void ESP8266WebServer::close() {
178+
_server.close();
179+
}
180+
181+
void ESP8266WebServer::stop() {
182+
close();
183+
}
184+
176185
void ESP8266WebServer::sendHeader(const String& name, const String& value, bool first) {
177186
String headerLine = name;
178187
headerLine += ": ";

libraries/ESP8266WebServer/src/ESP8266WebServer.h

+3
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ class ESP8266WebServer
6666
void begin();
6767
void handleClient();
6868

69+
void close();
70+
void stop();
71+
6972
bool authenticate(const char * username, const char * password);
7073
void requestAuthentication();
7174

libraries/ESP8266WiFi/src/WiFiServer.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,16 @@ uint8_t WiFiServer::status() {
121121
return _pcb->state;
122122
}
123123

124+
void WiFiServer::close() {
125+
if (!_pcb) {
126+
return;
127+
}
128+
tcp_close(_pcb);
129+
}
130+
131+
void WiFiServer::stop() {
132+
close();
133+
}
124134

125135
size_t WiFiServer::write(uint8_t b) {
126136
return write(&b, 1);

libraries/ESP8266WiFi/src/WiFiServer.h

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ class WiFiServer : public Server {
5454
virtual size_t write(uint8_t);
5555
virtual size_t write(const uint8_t *buf, size_t size);
5656
uint8_t status();
57+
void close();
58+
void stop();
5759

5860
using Print::write;
5961

0 commit comments

Comments
 (0)