Merge pull request #1 from Show-maket/vanilla-server

vanilla

examples/ClientMultiInstance/ClientMultiInstance.ino

@@ -0,0 +1,150 @@
+#include "EthernetMaket.h" // Предполагается, что этот файл подключает Ethernet3.h
+
+#include <map>
+
+// Настройки для W5500
+#define W5500_CS_PIN PA2 // Пин для CS
+#define SOCKET_NUMBER 0  // Используем сокет 0
+#define SERVER_PORT 1337 // Порт на сервере
+#define CLIENT_PORT 1337 // Порт клиента
+
+#define ServerMac {0xDA, 0x7A, 0xFF, 0x00, 0x00, 0x00}
+#define ServerIP {192, 168, 254, 254}
+
+#define IniMac {0xDA, 0x7A, 0xF0, 0x00, 0x00, 0x00}
+#define IniIP {192, 168, 254, 253}
+
+uint8_t gateway[] = {192, 168, 0, 1}; // Шлюз
+uint8_t subnet[] = {255, 255, 0, 0};  // Маска подсети
+
+uint8_t mac[] = IniMac;    // MAC-адрес
+uint8_t localIP[] = IniIP; // Локальный IP-адрес
+
+uint8_t serverMac[] = ServerMac; // MAC-адрес сервера
+uint8_t serverIP[] = ServerIP;   // IP-адрес сервера
+
+uint8_t buf[512]; // Буфер для передачи данных
+
+uint32_t previousMillis = 0; // Для хранения времени последней отправки
+const long interval = 3750;       // Интервал отправки данных (1.75 секунды)
+uint32_t ttt;
+
+EthernetServer server(SERVER_PORT);
+
+
+struct EthernetMaketClientStruct
+{
+    EthernetMaketClient clientMember; //
+};
+
+std::map<uint16_t, EthernetMaketClientStruct> clientMap;
+ 
+uint32_t packetCounter = 0;
+uint32_t data1;
+uint32_t data2;
+
+void setup()
+{
+    Serial.begin(115200);
+    pinMode(LED_BUILTIN, OUTPUT);
+    Ethernet.setCsPin(W5500_CS_PIN);
+    Ethernet.init();
+
+    // Настройка Ethernet с указанием статических параметров
+    Ethernet.begin(mac, localIP, subnet, gateway, gateway);
+
+
+    EthernetMaketClientStruct c1;
+    EthernetMaketClientStruct c2;
+    clientMap.insert({1, c1});
+    clientMap.insert({2, c2});
+}
+
+void loop()
+{
+    EthernetMaketClient::tick();
+    uint32_t currentMillis = millis();
+    if (currentMillis - ttt > 25)
+    {
+        digitalToggle(PC13);
+        ttt = currentMillis; // Обновляем время
+    }
+
+    if (currentMillis - previousMillis >= interval)
+    {
+        previousMillis = currentMillis;
+
+        Serial.println("connectNonBlock");
+        clientMap[1].clientMember.startConnection(serverIP, SERVER_PORT);
+        clientMap[2].clientMember.startConnection(serverIP, SERVER_PORT);
+
+
+        //* for single packets
+        Serial.print("Sending packet ONE: ");
+        data1 = packetCounter;
+        clientMap[1].clientMember.dataWrite((uint8_t *)&data1, sizeof(data1));
+        for (size_t j = 0; j < sizeof(data1); j++)
+        {
+            Serial.print(((uint8_t *)&data1)[j], HEX);
+            Serial.print(" ");
+        }
+        Serial.println();
+
+        packetCounter++;
+        data2 = packetCounter;
+
+        Serial.print("Sending packet TWO: ");
+        clientMap[2].clientMember.dataWrite((uint8_t *)&data2, sizeof(data2));
+        for (size_t j = 0; j < sizeof(data2); j++)
+        {
+            Serial.print(((uint8_t *)&data2)[j], HEX);
+            Serial.print(" ");
+        }
+        Serial.println();
+
+
+
+
+        packetCounter++;
+
+
+    }
+
+
+if(clientMap[1].clientMember.available()>0){
+    byte response[16];
+        int len = clientMap[1].clientMember.read(response, sizeof(response));
+
+        if (len == 16)
+        {
+            // Проверка контрольной суммы
+            uint8_t checksum = 0;
+            for (int i = 0; i < 15; i++)
+            {
+                checksum += response[i];
+            }
+
+            Serial.print("RX: ");
+            for (int i = 0; i < 16; i++)
+            {
+                Serial.print(response[i], HEX);
+                Serial.print(" ");
+            }
+
+            if (response[15] == checksum)
+            {
+                Serial.println("Checksum is OK");
+            }
+            else
+            {
+                Serial.println("Checksum is ERROR");
+            }
+            clientMap[1].clientMember.activityUpdate(); // Обновляем время последней активности
+        }
+        else
+        {
+            Serial.println("Received an incomplete response");
+        }
+}
+
+}

examples/Server/Server.ino

@@ -25,21 +25,25 @@ void serverHandler(EthernetClient client)
     byte buf[512];
     int len = client.read(buf, sizeof(buf));
 
-    // Обработка каждого 4-байтового пакета
+    Serial.print("sock: ");
-    for (int i = 0; i < len; i += 4)
+    Serial.println(client.getSocketNumber());
-    {
+        processReceivedData(buf, len);
-        int packetLen = min(4, len - i); // Определяем длину текущего пакета
+
-        processReceivedData(buf + i, packetLen);
+    // // Обработка каждого 4-байтового пакета
-        for (uint8_t j = 0; j < 3; j++)
+    // for (int i = 0; i < len; i += 4)
-        {
+    // {
-            sendResponse(client, *(uint32_t *)(buf + i));
+    //     int packetLen = min(4, len - i); // Определяем длину текущего пакета
-        }
+    //     processReceivedData(buf + i, packetLen);
-        packetCounter++;
+    //     for (uint8_t j = 0; j < 3; j++)
-    }
+    //     {
+    //         sendResponse(client, *(uint32_t *)(buf + i));
+    //     }
+    //     packetCounter++;
+    // }
 
     //!-----------------
     Serial.println("DONE");
-    client.stop();
+    // client.stop();
     Serial.println();
     Serial.println();
 }

src/EthernetOverride/Server.cpp

@@ -9,91 +9,127 @@ void EthernetMaketServer::setServerHandler(std::function<void(EthernetMaketClien
 
 void EthernetMaketServer::resetServerHandler()
 {
-    serverHandler = [](EthernetMaketClient sclient) {};
+    serverHandler = [](EthernetMaketClient &sclient) {};
 }
 
-EthernetMaketClient EthernetMaketServer::available(int sock)
+// EthernetMaketClient EthernetMaketServer::available(int sock)
-{
+// {
-    accept(sock);
+//     accept(sock);
-    EthernetMaketClient client(sock);
+//     EthernetClient client(sock);
-    if (EthernetClass::_server_port[sock] == _port &&
+//     if (EthernetClass::_server_port[sock] == _port &&
-        (client.status() == SnSR::ESTABLISHED ||
+//         (client.status() == SnSR::ESTABLISHED ||
-         client.status() == SnSR::CLOSE_WAIT))
+//          client.status() == SnSR::CLOSE_WAIT))
-    {
+//     {
-        if (client.available())
+//         if (client.available())
-        {
+//         {
-            return client;
+//             return std::move(EthernetMaketClient(client));
-        }
+//         }
-    }
+//     }
-    return EthernetMaketClient(MAX_SOCK_NUM);
+//     return std::move(EthernetMaketClient(MAX_SOCK_NUM));
-}
+// }
 
-void EthernetMaketServer::accept(int sock)
+// void EthernetMaketServer::accept(int sock)
-{
+// {
-    int listening = 0;
+//     int listening = 0;
-    EthernetClient client(sock);
+//     EthernetClient client(sock);
 
-    if (EthernetClass::_server_port[sock] == _port)
+//     if (EthernetClass::_server_port[sock] == _port)
-    {
+//     {
-        if (client.status() == SnSR::LISTEN)
+//         if (client.status() == SnSR::LISTEN)
-        {
+//         {
-            listening = 1;
+//             listening = 1;
-        }
+//         }
-        else if (client.status() == SnSR::CLOSE_WAIT && !client.available())
+//         else if (client.status() == SnSR::CLOSE_WAIT && !client.available())
-        {
+//         {
-            client.stop();
+//             Serial.println("HARD STOP");
-        }
+//             client.stop();
-    }
+//         }
+//     }
 
-    if (!listening)
+//     if (!listening)
-    {
+//     {
-        // begin();
+//         // begin();
-        begin(sock); // added
+//         begin(sock); // added
-    }
+//     }
-}
+// }
 
-void EthernetMaketServer::begin(int sock)
+// void EthernetMaketServer::begin(int sock)
-{
+// {
-    EthernetClient client(sock);
+//     EthernetClient client(sock);
-    if (client.status() == SnSR::CLOSED)
+//     if (client.status() == SnSR::CLOSED)
-    {
+//     {
-        socket(sock, SnMR::TCP, _port, 0);
+//         socket(sock, SnMR::TCP, _port, 0);
-        listen(sock);
+//         listen(sock);
-        EthernetClass::_server_port[sock] = _port;
+//         EthernetClass::_server_port[sock] = _port;
-    }
+//         serverSocket = sock; 
-}
+//         return;
-
+//     } 
-void EthernetMaketServer::begin()
+//     // Serial.println(F("EthernetMaketServer::begin() FAIL"));
-{
+// }
-    EthernetServer::begin();
-}
 
+// 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++)
+    // for (int sock = 0; sock < MAX_SOCK_NUM; sock++)
     {
-        EthernetMaketClient sclient = available(sock);
+        EthernetClient sclient = available(/* serverSocket */);
-        if (sclient.connected() && sclient.available() > 0)
+        size_t dataSize;
+        if (sclient.connected() && (dataSize = sclient.available()) > 0)
         {
-            serverHandler(sclient);
+            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);
         }
-        // // Закрытие соединения по таймеру неактивности
+
-        // if (sclient.connected() && (millis() - lastActivityTime > timeout))
+
-        // {
+
-        //     Serial.println("Connection closed due to inactivity");
-        //     sclient.stop();
-        // }
 
         // if (!wasConnected && sclient.connected())
         // {
-        //     wasConnected[sock] = true;
+        //     wasConnected = true;
+        //     Serial.println("Client connected");
         // }
 
         // if (wasConnected && !sclient.connected())
         // {
-        //     wasConnected[sock] = false;
+        //     wasConnected = false;
         //     sclient.stop();
+        //     // begin(serverSocket);
         //     Serial.println("Client disconnected");
         // }
+        // // Закрытие соединения по таймеру неактивности
+        // if (sclient.connected() && (millis() - lastActivityTime > timeout))
+        // {
+        //     Serial.println("Connection closed due to inactivity");
+        //     sclient.close();
+        //     // begin(serverSocket);
+        // }
     }
-}
+    // sclient.tick_();
+}

src/EthernetOverride/Server.h

@@ -8,19 +8,22 @@ class EthernetMaketClient;
 class EthernetMaketServer : public EthernetServer
 {
 private:
-    EthernetClient available();
+    // EthernetClient available();
-    void accept(int sock);
+    // void accept(int sock);
-    std::function<void(EthernetMaketClient)> serverHandler = [](EthernetMaketClient sclient) {};
+    std::function<void(EthernetMaketClient&)> serverHandler = [](EthernetMaketClient &sclient) {};
-    bool wasConnected[MAX_SOCK_NUM];
+    SOCKET serverSocket = MAX_SOCK_NUM;
+
+    bool wasConnected;
+    EthernetMaketClient sclient;
 
 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() override;
-    void begin(int sock);
+    // void begin(int sock);
     void tick();
 };
 

src/EthernetOverride/TCP.cpp

@@ -2,30 +2,32 @@
 #include "utility/w5500.h"
 #include "utility/socket.h"
 
-std::list<EthernetMaketClient*>& EthernetMaketClient::getInstances() {
+////////////////////////////////////////////////////////////////
-    static std::list<EthernetMaketClient*> instances; // Список создаётся при первом доступе
+
-    return instances;
-}
 
 EthernetMaketClient::EthernetMaketClient() {
     _sock = MAX_SOCK_NUM;
-    getInstances().push_back(this);
+    // Serial.print("SOCK ?? "); Serial.println(_sock);
 }
 
 EthernetMaketClient::EthernetMaketClient(uint8_t sock) {
     _sock = sock;
-    getInstances().push_back(this);
+}
+EthernetMaketClient::EthernetMaketClient(EthernetClient &client) {
+    _sock = client.getSocketNumber();
 }
 
-EthernetMaketClient::~EthernetMaketClient() {
+void EthernetMaketClient::tick()
-    getInstances().remove(this);
+  {
-}
+    forEach(
+        [](EthernetMaketClient& obj) {  
+            obj.tick_();
+        }
+    );
 
-void EthernetMaketClient::tick() {
+  }
-    for (EthernetMaketClient* client : getInstances()) {
+
-        client->tick_();
+////////////////////////////////////////////////////////////////
-    }
-}
 
 ConnectionStatusSimple EthernetMaketClient::connectNonBlock(IPAddress ip, uint16_t port) {
     dstIP = ip;
@@ -58,7 +60,10 @@ ConnectionStatusSimple EthernetMaketClient::connectNonBlock(IPAddress ip, uint16
         uint8_t s = w5500.readSnSR(i);
         if (s == SnSR::CLOSED || s == SnSR::FIN_WAIT || s == SnSR::CLOSE_WAIT) {
             _sock = i;
+            Serial.print("SOCK <- "); Serial.println(_sock);
             break;
+
+            //todo if (s == SnSR::LISTEN){ выполнить приём и занять на время отправки сокет прослушивания }
         }
     }
 
@@ -85,8 +90,8 @@ ConnectionStatusSimple EthernetMaketClient::connectNonBlock(IPAddress ip, uint16
 }
 
 
-bool EthernetMaketClient::isConnected() const {
+bool EthernetMaketClient::canWriteIntoConnection(size_t size) const {
-    return connectStatus == CONNECT_CONNECTED;
+    return connectStatus == CONNECT_CONNECTED /* && w5500.getTXFreeSize(_sock) >= size */;
 }
 
 void EthernetMaketClient::disconnect(){
@@ -103,6 +108,11 @@ void EthernetMaketClient::close(){
 }
 
 void EthernetMaketClient::tick_(){
+    if(_sock != MAX_SOCK_NUM && connectStatus!=CONNECT_CONNECTED && connectStatus!=CONNECT_STOP_WAITING&&connectStatus!=CONNECT_CONNECTING){
+        Serial.print("tick_() sock = "); Serial.println(_sock); 
+    }
+
+//todo [] Пересмотреть стейт машину перевести на нативные статусы
     switch (connectStatus)
     {
     case CONNECT_START:
@@ -111,6 +121,35 @@ void EthernetMaketClient::tick_(){
         connectStatus = CONNECT_CONNECTING;
         close();
         Serial.println("CONNECT_CONNECTING...");
+        {
+        for (int i = 0; i < MAX_SOCK_NUM; i++) {
+            uint8_t s = w5500.readSnSR(i);
+            String state = "";
+            switch (s) {
+                case 0x00: state = "CLOSED"; break;
+                case 0x13: state = "INIT"; break;
+                case 0x14: state = "LISTEN"; break;
+                case 0x15: state = "SYNSENT"; break;
+                case 0x16: state = "SYNRECV"; break;
+                case 0x17: state = "ESTABLISHED"; break;
+                case 0x18: state = "FIN_WAIT"; break;
+                case 0x1A: state = "CLOSING"; break;
+                case 0x1B: state = "TIME_WAIT"; break;
+                case 0x1C: state = "CLOSE_WAIT"; break;
+                case 0x1D: state = "LAST_ACK"; break;
+                case 0x22: state = "UDP"; break;
+                case 0x32: state = "IPRAW"; break;
+                case 0x42: state = "MACRAW"; break;
+                case 0x5F: state = "PPPOE"; break;
+                default: state = "UNKNOWN"; break;
+        }
+        
+            Serial.print("SOCK <- "); 
+            Serial.print(i);
+            Serial.print(" State: ");
+            Serial.println(state);
+        }
+    }
         break;
     case CONNECT_CONNECTING:
         if (millis() - startConnectionTime >= connectionTimeout)
@@ -160,7 +199,7 @@ void EthernetMaketClient::tick_(){
         Serial.println("CONNECT_STOP_START");
         dstIP = IPAddress(0,0,0,0);
         dstPort = 0;
-        disconnect();
+        disconnect(); 
         stopStartTime = millis();
         connectStatus = CONNECT_STOP_WAITING;
         Serial.println("CONNECT_STOP_WAITING");
@@ -212,7 +251,8 @@ void EthernetMaketClient::tick_(){
     }
 //********************************************************
 
-    // //? Проверка наличия доступных данных от сервера
+    // //? [*] Проверка наличия доступных данных от сервера
+    // //? проверяется во вне
     // if (available() > 0)
     // {
         
@@ -225,8 +265,7 @@ bool EthernetMaketClient::dataWrite(){
     if(dataSize) {
         lastActivityTime = millis();
         if(write(dataPtr, dataSize)){
-            dataPtr = nullptr; 
+            clearData();
-            dataSize = 0; // Очищаем размер данных
             ret = true;
         }
         lastActivityTime = millis();
@@ -237,49 +276,30 @@ bool EthernetMaketClient::dataWrite(){
     return ret;
 }
 
+void EthernetMaketClient::clearData(){
+    this->dataPtr = nullptr;
+    this->dataSize = 0;
+}
+bool EthernetMaketClient::isDataEmpty() const{
+    return  this->dataPtr == nullptr;
+}
+
 void EthernetMaketClient::dataWrite(uint8_t* data, uint16_t dataSize, bool override) {
-    if (this->dataSize == 0 || override) {
+    if (this->dataPtr == nullptr || override) {
         this->dataPtr = data;
         this->dataSize = dataSize;
-        if(isConnected()){
+        activityUpdate();
-            dataWrite();
+        Serial.println("Data buffer Saved.");
-        }
+        // if(canWrite(dataSize)){
+        //     dataWrite();
+        // } else {
+        //     Serial.println("W5500 Buffer is full. Write operation is ignored.");
+        // }
     } else {
         Serial.println("Data buffer is not empty. Write operation is ignored.");
     }
 }
 
-
-// bool EthernetMaketClient::send(uint8_t* data, uint16_t dataSize, IPAddress ip, uint16_t port) {
-//     this->dataPtr = data;
-//     this->dataSize = dataSize;
-//     dstIP = ip;
-//     dstPort = port;
-
-//     switch (connectStatus) {
-//         case CONNECT_CONNECTED:
-//             if(dataWrite()){
-//                 onSendSuccess();
-//             }
-//             // Если подключено, отправляем данные
-//             return true;
-
-//         case CONNECT_STOP_WAITING:
-//         case CONNECT_STOP_START:
-//             return false; // Ожидаем завершения разрыва
-
-//         // case CONNECT_FAIL:
-//         case CONNECT_IDLE:
-//             connectNonBlock(ip, port);
-//             connectStatus = CONNECT_START; // Начинаем новое подключение
-//             return false; // Подключение инициировано
-
-//         default:
-//             return false; // Пока ждём подключения
-//     }
-//     return false;
-// }
-
 void EthernetMaketClient::setOnSendSuccess(const std::function<void()>& callback) {
     onSendSuccess = callback;
 }
@@ -289,6 +309,7 @@ void EthernetMaketClient::resetOnSendSuccess() {
 }
 
 void EthernetMaketClient::stop(){
+    // if(connectStatus!=CONNECT_STOP_WAITING)
     connectStatus = CONNECT_STOP_START;
 }
 
@@ -322,6 +343,8 @@ EthernetMaketClient& EthernetMaketClient::operator=(const EthernetMaketClient& o
     this->dataPtr = other.dataPtr;
     this->dataSize = other.dataSize;
     this->onSendSuccess = other.onSendSuccess;
+
+    this->_sock = other._sock;
     
     // Отключаем исполнение старого клиента
     const_cast<EthernetMaketClient&>(other).connectStatus = CONNECT_IDLE;
@@ -329,3 +352,6 @@ EthernetMaketClient& EthernetMaketClient::operator=(const EthernetMaketClient& o
     return *this;
 }
 
+ConnectionStatusSimple EthernetMaketClient::getConnectionStatus() const {
+    return connectStatus;
+}

src/EthernetOverride/TCP.h

@@ -4,8 +4,9 @@
 #include <list>
 #include <functional>
 #include "../util/config.h"
+#include "InstanceManager.h"
 
-class EthernetMaketClient : public EthernetClient {
+class EthernetMaketClient : public EthernetClient, public InstanceManager<EthernetMaketClient> {
 protected:
     uint32_t lastActivityTime = 0; // Время последней активности
     const uint16_t timeout = 300;  // Таймаут неактивности в миллисекундах
@@ -25,15 +26,32 @@ protected:
 
     bool dataWrite();
 
-    static std::list<EthernetMaketClient*>& getInstances(); // Ленивое создание списка
+    // static std::list<EthernetMaketClient*>& getInstances(); // Ленивое создание списка
 
-    void tick_();
     ConnectionStatusSimple connectStatus = CONNECT_IDLE; 
 
 public:
     EthernetMaketClient();
     EthernetMaketClient(uint8_t sock);
-    ~EthernetMaketClient();
+    EthernetMaketClient(EthernetClient &client);
+    
+    //     // Move constructor
+    // EthernetMaketClient(EthernetMaketClient&& other) noexcept
+    //     : EthernetClient(std::move(other)), // Move base class
+    //       lastActivityTime(other.lastActivityTime),
+    //       startConnectionTime(other.startConnectionTime),
+    //       stopStartTime(other.stopStartTime),
+    //       onSendSuccess(std::move(other.onSendSuccess)),
+    //       isNonBlocking(other.isNonBlocking),
+    //       dataPtr(other.dataPtr),
+    //       dataSize(other.dataSize),
+    //       dstIP(std::move(other.dstIP)),
+    //       dstPort(other.dstPort),
+    //       connectStatus(other.connectStatus)
+    // {
+    //     other.dataPtr = nullptr; // Reset the source object's pointer
+    //     other.dataSize = 0;
+    // }
 
     EthernetMaketClient& operator=(const EthernetMaketClient& other);
 
@@ -41,18 +59,22 @@ public:
     void startConnection(IPAddress ip, uint16_t port, bool nonBlock = true);
 
     void dataWrite(uint8_t* data, uint16_t dataSize, bool override = false);
-    // bool send(uint8_t* data, uint16_t dataSize, IPAddress ip, uint16_t port);
+    void clearData();
+    bool isDataEmpty() const;
 
     void disconnect();
     void close();
     void stop();
-    bool isConnected() const;
+    bool canWriteIntoConnection(size_t = 0) const;
 
     static void tick();
+    void tick_();
 
     void setOnSendSuccess(const std::function<void()>& callback);
     void resetOnSendSuccess();
 
+    ConnectionStatusSimple getConnectionStatus() const;
+
     void activityUpdate();
 };
 

todo

@@ -1 +1,3 @@
-[] Проверить и отладить UDP
+[] Проверить и отладить UDP
+[] 8 статических клиентов для управления таймингами и сессией
+