Skip to content

Commit

Permalink
replace socket.connected() with check for return value of socket.read()
Browse files Browse the repository at this point in the history
  • Loading branch information
habazut committed Aug 17, 2024
1 parent c8c3697 commit 048ba3f
Showing 1 changed file with 15 additions and 19 deletions.
34 changes: 15 additions & 19 deletions EthernetInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,28 +208,24 @@ void EthernetInterface::loop2() {
int count = clients[socket].read(buffer, MAX_ETH_BUFFER);
looptimer(8000, F("Ethloop2 read"));
if (count > 0) {
if (Diag::ETHERNET) DIAG(F("Ethernet: available socket=%d,count=%d"), socket, count);
buffer[count] = '\0'; // terminate the string properly
if (Diag::ETHERNET) DIAG(F("buffer:%e"), buffer);
// execute with data going directly back
CommandDistributor::parse(socket,buffer,outboundRing);
looptimer(2000, F("Ethloop2 parse"));
return; // limit the amount of processing that takes place within 1 loop() cycle.
}
}
if (Diag::ETHERNET) DIAG(F("Ethernet: available socket=%d,count=%d"), socket, count);
buffer[count] = '\0'; // terminate the string properly
if (Diag::ETHERNET) DIAG(F("buffer:%e"), buffer);
// execute with data going directly back
CommandDistributor::parse(socket,buffer,outboundRing);
looptimer(2000, F("Ethloop2 parse"));
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"));

// 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);
looptimer(8000, F("Ethloop after Withrottleloop"));

Expand Down

0 comments on commit 048ba3f

Please sign in to comment.