mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-28 10:36:14 +01:00
Merge 701bc0a837
into d46a6f092a
This commit is contained in:
commit
21253e3c18
|
@ -65,7 +65,7 @@ public:
|
|||
// return false here until we have
|
||||
// implemented a LRU timer
|
||||
// if (LRU too recent) return false;
|
||||
return false;
|
||||
//return false;
|
||||
|
||||
wifi = c;
|
||||
inUse = true;
|
||||
|
@ -248,6 +248,9 @@ bool WifiNINA::setup(const char *SSid,
|
|||
// #else
|
||||
DIAG(F("Server will be started on port %d"),port);
|
||||
// #endif
|
||||
ip = WiFi.localIP();
|
||||
LCD(4,F("IP: %d.%d.%d.%d"), ip[0], ip[1], ip[2], ip[3]);
|
||||
LCD(5,F("Port:%d"), port);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -275,27 +278,29 @@ void WifiNINA::loop() {
|
|||
CommandDistributor::forget(clientId);
|
||||
clients[clientId].wifi.stop();
|
||||
clients[clientId].inUse = false;
|
||||
|
||||
//Do NOT clients.erase(clients.begin()+clientId) as
|
||||
//that would mix up clientIds for later.
|
||||
}
|
||||
}
|
||||
if (server->available()) {
|
||||
WiFiClient client;
|
||||
while (client = server->available()) {
|
||||
WiFiClient client = server->available();
|
||||
if (client == true) {
|
||||
///while (client.available() == true) {
|
||||
for (clientId=0; clientId<clients.size(); clientId++){
|
||||
if (clients[clientId].recycle(client)) {
|
||||
ip = client.remoteIP();
|
||||
DIAG(F("Recycle client %d %s"), clientId, ip);
|
||||
DIAG(F("Recycle client %d %d.%d.%d.%d"), clientId, ip[0], ip[1], ip[2], ip[3]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (clientId>=clients.size()) {
|
||||
NetworkClient nc(client);
|
||||
clients.push_back(nc);
|
||||
NetworkClient* nc=new NetworkClient(client);
|
||||
clients.push_back(*nc);
|
||||
//delete nc;
|
||||
ip = client.remoteIP();
|
||||
DIAG(F("New client %d, %s"), clientId, ip);
|
||||
}
|
||||
DIAG(F("New client %d, %d.%d.%d.%d"), clientId, ip[0], ip[1], ip[2], ip[3]);
|
||||
}
|
||||
///}
|
||||
}
|
||||
// loop over all connected clients
|
||||
for (clientId=0; clientId<clients.size(); clientId++){
|
||||
|
|
Loading…
Reference in New Issue
Block a user