DashyFox/Ethernet_W5500
1
0
Fork 0
mirror of https://github.com/Show-maket/EthernetMaket.git synced 2025-10-31 02:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: DashyFox:main
Branches Tags
DashyFox:main DashyFox:neuroFix-stateMashine DashyFox:vanilla-server DashyFox:todo-ReworkStateMachine
..
compare: DashyFox:todo-ReworkStateMachine
Branches Tags
DashyFox:neuroFix-stateMashine DashyFox:vanilla-server DashyFox:main DashyFox:todo-ReworkStateMachine

1 Commits
main ... todo-Rewor

Author SHA1 Message Date
DashyFox
b883d3a757 testing 2024-12-09 15:45:41 +03:00
2 changed files with 87 additions and 101 deletions
Expand all files Collapse all files

178
src/EthernetOverride/Server.cpp
View File

@ -12,117 +12,103 @@ void EthernetMaketServer::resetServerHandler()
serverHandler = [](EthernetMaketClient &sclient) {};
}
// EthernetMaketClient EthernetMaketServer::available(int sock)
// {
// accept(sock);
// EthernetClient client(sock);
// if (EthernetClass::_server_port[sock] == _port &&
// (client.status() == SnSR::ESTABLISHED ||
// client.status() == SnSR::CLOSE_WAIT))
// {
// if (client.available())
// {
// return std::move(EthernetMaketClient(client));
// }
// }
// return std::move(EthernetMaketClient(MAX_SOCK_NUM));
// }
EthernetMaketClient EthernetMaketServer::available(int sock)
{
accept(sock);
EthernetClient client(sock);
if (EthernetClass::_server_port[sock] == _port &&
(client.status() == SnSR::ESTABLISHED ||
client.status() == SnSR::CLOSE_WAIT))
{
if (client.available())
{
return std::move(EthernetMaketClient(client));
}
}
return std::move(EthernetMaketClient(MAX_SOCK_NUM));
}
// void EthernetMaketServer::accept(int sock)
// {
// int listening = 0;
// EthernetClient client(sock);
void EthernetMaketServer::accept(int sock)
{
int listening = 0;
EthernetClient client(sock);
// if (EthernetClass::_server_port[sock] == _port)
// {
// if (client.status() == SnSR::LISTEN)
// {
// listening = 1;
// }
// else if (client.status() == SnSR::CLOSE_WAIT && !client.available())
// {
// Serial.println("HARD STOP");
// client.stop();
// }
// }
if (EthernetClass::_server_port[sock] == _port)
{
if (client.status() == SnSR::LISTEN)
{
listening = 1;
}
else if (client.status() == SnSR::CLOSE_WAIT && !client.available())
{
Serial.println("HARD STOP");
client.stop();
}
}
// if (!listening)
// {
// // begin();
// begin(sock); // added
// }
// }
if (!listening)
{
begin();
// begin(sock); // added
}
}
// void EthernetMaketServer::begin(int sock)
// {
// EthernetClient client(sock);
// if (client.status() == SnSR::CLOSED)
// {
// socket(sock, SnMR::TCP, _port, 0);
// listen(sock);
// EthernetClass::_server_port[sock] = _port;
// serverSocket = sock;
// return;
// }
// // Serial.println(F("EthernetMaketServer::begin() FAIL"));
// }
void EthernetMaketServer::begin(int sock)
{
EthernetClient client(sock);
if (client.status() == SnSR::CLOSED)
{
socket(sock, SnMR::TCP, _port, 0);
listen(sock);
EthernetClass::_server_port[sock] = _port;
serverSocket = sock;
return;
}
// Serial.println(F("EthernetMaketServer::begin() FAIL"));
}
void EthernetMaketServer::begin()
{
for (int sock = 0; sock < MAX_SOCK_NUM; sock++) {
EthernetClient client(sock);
if (client.status() == SnSR::CLOSED) {
socket(sock, SnMR::TCP, _port, 0);
listen(sock);
EthernetClass::_server_port[sock] = _port;
serverSocket = sock;
break;
}
}
// Serial.println(F("EthernetMaketServer::begin() FAIL"));
}
// void EthernetMaketServer::begin()
// {
// for (int sock = 0; sock < MAX_SOCK_NUM; sock++) {
// EthernetClient client(sock);
// if (client.status() == SnSR::CLOSED) {
// socket(sock, SnMR::TCP, _port, 0);
// listen(sock);
// EthernetClass::_server_port[sock] = _port;
// serverSocket = sock;
// break;
// }
// }
// // Serial.println(F("EthernetMaketServer::begin() FAIL"));
// }
uint8_t buf[256];
void EthernetMaketServer::tick()
{
// for (int sock = 0; sock < MAX_SOCK_NUM; sock++)
{
EthernetClient sclient = available(/* serverSocket */);
size_t dataSize;
if (sclient.connected() && (dataSize = sclient.available()) > 0)
sclient = available(serverSocket);
if (sclient.connected() && sclient.available() > 0)
{
Serial.println("Receive!");
memset(buf,0x00,sizeof(buf));
sclient.read(buf, sizeof(buf));
Serial.print("Received data: ");
for (int i = 0; i < dataSize; i++)
{
Serial.print(buf[i], HEX);
Serial.print(" ");
}
Serial.println("\n");
// sclient.activityUpdate();
//* serverHandler(sclient);
sclient.activityUpdate();
serverHandler(sclient);
}
// if (!wasConnected && sclient.connected())
// {
// wasConnected = true;
// Serial.println("Client connected");
// }
if (!wasConnected && sclient.connected())
{
wasConnected = true;
Serial.println("Client connected");
}
// if (wasConnected && !sclient.connected())
// {
// wasConnected = false;
// sclient.stop();
// // begin(serverSocket);
// Serial.println("Client disconnected");
// }
if (wasConnected && !sclient.connected())
{
wasConnected = false;
sclient.stop();
// begin(serverSocket);
Serial.println("Client disconnected");
}
// // Закрытие соединения по таймеру неактивности
// if (sclient.connected() && (millis() - lastActivityTime > timeout))
// {
@ -131,5 +117,5 @@ void EthernetMaketServer::tick()
// // begin(serverSocket);
// }
}
// sclient.tick_();
sclient.tick_();
}

10
src/EthernetOverride/Server.h
View File

@ -8,8 +8,8 @@ class EthernetMaketClient;
class EthernetMaketServer : public EthernetServer
{
private:
// EthernetClient available();
// void accept(int sock);
EthernetClient available();
void accept(int sock);
std::function<void(EthernetMaketClient&)> serverHandler = [](EthernetMaketClient &sclient) {};
SOCKET serverSocket = MAX_SOCK_NUM;
@ -18,12 +18,12 @@ private:
public:
using EthernetServer::EthernetServer;
// EthernetMaketClient available(int sock);
EthernetMaketClient available(int sock);
void setServerHandler(std::function<void(EthernetMaketClient)> handler);
void resetServerHandler();
// void begin() override;
// void begin(int sock);
void begin() override;
void begin(int sock);
void tick();
};