Skip to content

Remote tcp disconnect not detected #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2017
Merged

Remote tcp disconnect not detected #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f0af30
Add setNoDelay and getNoDelay to WiFiServer class
bbx10 May 19, 2017
a02533b
Remote TCP disconnect not detected
bbx10 May 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions libraries/WiFi/src/WiFiClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,28 @@ void WiFiClient::flush() {

uint8_t WiFiClient::connected()
{
uint8_t dummy = 0;
read(&dummy, 0);
if (_connected) {
uint8_t dummy;
int res = recv(fd(), &dummy, 0, MSG_DONTWAIT);
if (res <= 0) {
switch (errno) {
case ENOTCONN:
case EPIPE:
case ECONNRESET:
case ECONNREFUSED:
case ECONNABORTED:
_connected = false;
break;
default:
_connected = true;
break;
}
}
else {
// Should never happen since requested 0 bytes
_connected = true;
}
}
return _connected;
}

Expand Down
15 changes: 13 additions & 2 deletions libraries/WiFi/src/WiFiServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,11 @@ WiFiClient WiFiServer::available(){
int client_sock = accept(sockfd, (struct sockaddr *)&_client, (socklen_t*)&cs);
if(client_sock >= 0){
int val = 1;
if(setsockopt(client_sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&val, sizeof(int)) == ESP_OK)
return WiFiClient(client_sock);
if(setsockopt(client_sock, SOL_SOCKET, SO_KEEPALIVE, (char*)&val, sizeof(int)) == ESP_OK) {
val = _noDelay;
if(setsockopt(client_sock, IPPROTO_TCP, TCP_NODELAY, (char*)&val, sizeof(int)) == ESP_OK)
return WiFiClient(client_sock);
}
}
return WiFiClient();
}
Expand All @@ -69,6 +72,14 @@ void WiFiServer::begin(){
_listening = true;
}

void WiFiServer::setNoDelay(bool nodelay) {
_noDelay = nodelay;
}

bool WiFiServer::getNoDelay() {
return _noDelay;
}

void WiFiServer::end(){
close(sockfd);
sockfd = -1;
Expand Down
3 changes: 3 additions & 0 deletions libraries/WiFi/src/WiFiServer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ class WiFiServer : public Server {
uint16_t _port;
uint8_t _max_clients;
bool _listening;
bool _noDelay = false;

public:
void listenOnLocalhost(){}
Expand All @@ -38,6 +39,8 @@ class WiFiServer : public Server {
WiFiClient available();
WiFiClient accept(){return available();}
void begin();
void setNoDelay(bool nodelay);
bool getNoDelay();
size_t write(const uint8_t *data, size_t len);
size_t write(uint8_t data){
return write(&data, 1);
Expand Down