fix(modem): Use link-id from responder class

Author: david-cermak

components/esp_modem/examples/modem_tcp_client/main/generate/sock_dce.cpp

@@ -15,6 +15,27 @@ namespace sock_dce {
 
 constexpr auto const *TAG = "sock_dce";
 
+// Definition of the static member variables
+std::vector<DCE*> DCE::dce_list{};
+bool DCE::network_init = false;
+int Responder::s_link_id = 0;
+
+// Constructor - add this DCE instance to the static list
+DCE::DCE(std::shared_ptr<esp_modem::DTE> dte_arg, const esp_modem_dce_config *config)
+    : Module(std::move(dte_arg), config)
+{
+    dce_list.push_back(this);
+}
+
+// Destructor - remove this DCE instance from the static list
+DCE::~DCE()
+{
+    auto it = std::find(dce_list.begin(), dce_list.end(), this);
+    if (it != dce_list.end()) {
+        dce_list.erase(it);
+    }
+}
+
 
 bool DCE::perform_sock()
 {
@@ -224,10 +245,12 @@ void DCE::start_listening(int port)
 
 bool DCE::connect(std::string host, int port)
 {
+    data_ready_fd = eventfd(0, EFD_SUPPORT_ISR);
+    assert(data_ready_fd > 0);
     dte->on_read(nullptr);
     tcp_close();
     dte->on_read([this](uint8_t *data, size_t len) {
-        this->perform_at(data, len);
+        read_callback(data, len);
         return esp_modem::command_result::TIMEOUT;
     });
     if (!at.start_connecting(host, port)) {
@@ -241,12 +264,13 @@ bool DCE::connect(std::string host, int port)
 
 bool DCE::init()
 {
+    if (network_init) {
+        return true;
+    }
+    network_init = true;
     esp_vfs_eventfd_config_t config = ESP_VFS_EVENTD_CONFIG_DEFAULT();
     esp_vfs_eventfd_register(&config);
 
-    data_ready_fd = eventfd(0, EFD_SUPPORT_ISR);
-    assert(data_ready_fd > 0);
-
     dte->on_read(nullptr);
     const int retries = 5;
     int i = 0;

components/esp_modem/examples/modem_tcp_client/main/generate/sock_dce.hpp

@@ -63,7 +63,9 @@ class Responder {
         return total_len;
     }
 
+    int link_id{s_link_id++};
 private:
+    static int s_link_id;
     static constexpr size_t buffer_size = 512;
 
     bool on_read(char *data, size_t len)
@@ -99,8 +101,9 @@ class Responder {
 };
 
 class DCE : public Module {
-    using Module::Module;
 public:
+    DCE(std::shared_ptr<esp_modem::DTE> dte_arg, const esp_modem_dce_config *config);
+    ~DCE();
 
 //  --- ESP-MODEM command module starts here ---
 #include "esp_modem_command_declare_helper.inc"
@@ -204,6 +207,14 @@ esp_modem::return_type name(ESP_MODEM_COMMAND_PARAMS(__VA_ARGS__));
         }
         return -1;
     }
+    static std::vector<DCE*> dce_list;
+    static bool network_init;
+    static void read_callback(uint8_t *data, size_t len)
+    {
+        for (auto dce : dce_list) {
+            dce->perform_at(data, len);
+        }
+    }
 
 private:
     esp_modem::SignalGroup signal;

components/esp_modem/examples/modem_tcp_client/main/sock_commands_espat.cpp

@@ -86,28 +86,28 @@ command_result net_close(CommandableIf *t)
     return command_result::OK;
 }
 
-command_result tcp_open(CommandableIf *t, const std::string &host, int port, int timeout)
-{
-    ESP_LOGV(TAG, "%s", __func__);
-
-    // Use link ID 0 for now (can be extended to support multiple concurrent connections)
-    const int link_id = 0;
-
-    // Establish TCP connection with link ID for multiple connections mode
-    std::string tcp_cmd = "AT+CIPSTART=" + std::to_string(link_id) + ",\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r\n";
-
-    // In multiple connections mode, response format is: <link ID>,CONNECT
-    std::string expected_response = std::to_string(link_id) + ",CONNECT";
-
-    auto ret = dce_commands::generic_command(t, tcp_cmd, expected_response, "ERROR", timeout);
-    if (ret != command_result::OK) {
-        ESP_LOGE(TAG, "Failed to establish TCP connection to %s:%d on link %d", host.c_str(), port, link_id);
-        return ret;
-    }
-
-    ESP_LOGI(TAG, "TCP connection established to %s:%d on link %d", host.c_str(), port, link_id);
-    return command_result::OK;
-}
+// command_result tcp_open(CommandableIf *t, const std::string &host, int port, int timeout)
+// {
+//     ESP_LOGV(TAG, "%s", __func__);
+//
+//     // Use link ID 0 for now (can be extended to support multiple concurrent connections)
+//     const int link_id = 0;
+//
+//     // Establish TCP connection with link ID for multiple connections mode
+//     std::string tcp_cmd = "AT+CIPSTART=" + std::to_string(link_id) + ",\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r\n";
+//
+//     // In multiple connections mode, response format is: <link ID>,CONNECT
+//     std::string expected_response = std::to_string(link_id) + ",CONNECT";
+//
+//     auto ret = dce_commands::generic_command(t, tcp_cmd, expected_response, "ERROR", timeout);
+//     if (ret != command_result::OK) {
+//         ESP_LOGE(TAG, "Failed to establish TCP connection to %s:%d on link %d", host.c_str(), port, link_id);
+//         return ret;
+//     }
+//
+//     ESP_LOGI(TAG, "TCP connection established to %s:%d on link %d", host.c_str(), port, link_id);
+//     return command_result::OK;
+// }
 
 command_result tcp_close(CommandableIf *t)
 {
@@ -122,21 +122,6 @@ command_result tcp_close(CommandableIf *t)
     return dce_commands::generic_command(t, close_cmd, expected_response, "ERROR", 5000);
 }
 
-command_result tcp_send(CommandableIf *t, uint8_t *data, size_t len)
-{
-    ESP_LOGV(TAG, "%s", __func__);
-    // This function is not used in the current implementation
-    // Data sending is handled by the DCE responder
-    return command_result::FAIL;
-}
-
-command_result tcp_recv(CommandableIf *t, uint8_t *data, size_t len, size_t &out_len)
-{
-    ESP_LOGV(TAG, "%s", __func__);
-    // This function is not used in the current implementation
-    // Data receiving is handled by the DCE responder
-    return command_result::FAIL;
-}
 
 command_result get_ip(CommandableIf *t, std::string &ip)
 {
@@ -183,21 +168,18 @@ void Responder::start_sending(size_t len)
     data_to_send = len;
     send_stat = 0;
     // For multiple connections mode, include link ID
-    const int link_id = 0;
     send_cmd("AT+CIPSEND=" + std::to_string(link_id) + "," + std::to_string(len) + "\r\n");
 }
 
 void Responder::start_receiving(size_t len)
 {
     // For multiple connections mode, include link ID
-    const int link_id = 0;
     send_cmd("AT+CIPRECVDATA=" + std::to_string(link_id) + "," + std::to_string(len) + "\r\n");
 }
 
 bool Responder::start_connecting(std::string host, int port)
 {
     // For multiple connections mode, include link ID
-    const int link_id = 0;
     std::string cmd = "AT+CIPSTART=" + std::to_string(link_id) + ",\"TCP\",\"" + host + "\"," + std::to_string(port) + "\r\n";
     send_cmd(cmd);
     return true;