dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-22 23:56:13 +01:00
Code Releases Activity

replace socket.connected() with check for return value of socket.read()

Browse Source
This commit is contained in:
Harald Barth 2024-08-17 20:18:59 +02:00
parent c8c3697fa0
commit 048ba3fd1e
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
EthernetInterface.cpp
View File

@ -208,28 +208,24 @@ void EthernetInterface::loop2() {
int count = clients[socket].read(buffer, MAX_ETH_BUFFER); int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
looptimer(8000, F("Ethloop2 read")); looptimer(8000, F("Ethloop2 read"));
if (count > 0) { if (count > 0) {
if (Diag::ETHERNET) DIAG(F("Ethernet: available socket=%d,count=%d"), socket, count); if (Diag::ETHERNET) DIAG(F("Ethernet: available socket=%d,count=%d"), socket, count);
buffer[count] = '\0'; // terminate the string properly buffer[count] = '\0'; // terminate the string properly
if (Diag::ETHERNET) DIAG(F("buffer:%e"), buffer); if (Diag::ETHERNET) DIAG(F("buffer:%e"), buffer);
// execute with data going directly back // execute with data going directly back
CommandDistributor::parse(socket,buffer,outboundRing); CommandDistributor::parse(socket,buffer,outboundRing);
looptimer(2000, F("Ethloop2 parse")); looptimer(2000, F("Ethloop2 parse"));
return; // limit the amount of processing that takes place within 1 loop() cycle. return; // limit the amount of processing that takes place within 1 loop() cycle.
} } else if (count == 0) {
} // The client has disconnected
clients[socket].stop();
CommandDistributor::forget(socket);
if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket);
}
// fall through if count = -1 (no bytes available)
}
} }
looptimer(8000, F("Ethloop2 after incoming")); looptimer(8000, F("Ethloop2 after incoming"));
// stop any clients which disconnect
for (int socket = 0; socket<MAX_SOCK_NUM; socket++) {
if (clients[socket] && !clients[socket].connected()) {
clients[socket].stop();
CommandDistributor::forget(socket);
if (Diag::ETHERNET) DIAG(F("Ethernet: disconnect %d "), socket);
}
}
looptimer(8000, F("Ethloop after disconnectcheck"));
WiThrottle::loop(outboundRing); WiThrottle::loop(outboundRing);
looptimer(8000, F("Ethloop after Withrottleloop")); looptimer(8000, F("Ethloop after Withrottleloop"));