From 6d0f7edc6782d8eb669c2561dab773a882fedb0a Mon Sep 17 00:00:00 2001
From: Henry Winkel <henrywinkel@bundeswehr.org>
Date: Thu, 10 Aug 2023 10:45:08 +0200
Subject: [PATCH] ADD: adden a function to delete clients

---
 include/DirectCommunicationServer.hpp |  1 +
 src/DirectCommunicationServer.cpp     | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/include/DirectCommunicationServer.hpp b/include/DirectCommunicationServer.hpp
index 32a8284..cdea03d 100644
--- a/include/DirectCommunicationServer.hpp
+++ b/include/DirectCommunicationServer.hpp
@@ -46,6 +46,7 @@ namespace DirectCommunication
             std::vector<std::uint32_t> connectedClients_;
 
             bool hasClient(std::uint32_t clientId);
+            void deleteClient(std::uint32_t clientId);
 
             std::function<void(std::string)> MessageHandle_ = nullptr;
 
diff --git a/src/DirectCommunicationServer.cpp b/src/DirectCommunicationServer.cpp
index 4971897..2b9f047 100644
--- a/src/DirectCommunicationServer.cpp
+++ b/src/DirectCommunicationServer.cpp
@@ -48,7 +48,14 @@ namespace DirectCommunication
             for (auto it = connectedClients_.begin(); it != connectedClients_.end(); ++it) {
                 zmq::message_t zmqMsg(msg.begin(),msg.end());
                 zmqMsg.set_routing_id(*it);
+                try {
                 socket_.send(zmqMsg,zmq::send_flags::dontwait);
+                
+                } catch (const std::exception& e) {
+                    LOG_S(ERROR)<<e.what(); 
+                    LOG_S(ERROR)<< "Routing id: " << *it;
+                    deleteClient(*it);
+                }
             }
         }
     }
@@ -72,7 +79,6 @@ namespace DirectCommunication
 
     void DirectCommunicationServer::workerFunc_()
     {
-        LOG_S(INFO)<<"worker started";
         while (stopWorker_ == false) 
         {   
             zmq::message_t msg;
@@ -87,13 +93,13 @@ namespace DirectCommunication
                 }
                 if (msg.to_string() == "CLOSE") 
                 {
-                   auto it =  std::find(connectedClients_.begin(), connectedClients_.end(), msg.routing_id());
-                   connectedClients_.erase(it);
+                    LOG_S(INFO)<<"CLOSE received from: "<< msg.routing_id();
+                    deleteClient(msg.routing_id());
+                    LOG_S(INFO)<<"remaining connected clients: " <<connectedClients_.size();
                 }else 
                 {   
                     if (MessageHandle_ != nullptr) 
                     {
-                        LOG_S(INFO)<<"using handle";  
                         MessageHandle_(msg.to_string());
                     }
                     else 
@@ -119,6 +125,15 @@ namespace DirectCommunication
         }
     }
 
+    void DirectCommunicationServer::deleteClient(std::uint32_t clientId)
+    {
+        auto it =  std::find(connectedClients_.begin(), connectedClients_.end(), clientId);
+        if (it != connectedClients_.end() ) {
+            connectedClients_.erase(it);
+        }
+    }
+
+
 
 
 }
\ No newline at end of file