Protect asio exception hotfix (#4527)

* Refs #20599: Handle error code before function call Signed-off-by: cferreiragonz <[email protected]> * Apply suggestion Co-authored-by: Miguel Company <[email protected]> --------- Signed-off-by: cferreiragonz <[email protected]> Co-authored-by: Miguel Company <[email protected]> (cherry picked from commit 08193d5) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp
eProsima · Apr 4, 2024 · 56fd8c3 · 56fd8c3
1 parent 05c889a
commit 56fd8c3
Showing 1 changed file with 37 additions and 0 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -225,6 +225,43 @@ void TCPTransportInterface::clean()
     }
 }
 
+<<<<<<< HEAD
+=======
+Locator TCPTransportInterface::remote_endpoint_to_locator(
+        const std::shared_ptr<TCPChannelResource>& channel) const
+{
+    Locator locator;
+    asio::error_code ec;
+    auto endpoint = channel->remote_endpoint(ec);
+    if (ec)
+    {
+        LOCATOR_INVALID(locator);
+    }
+    else
+    {
+        endpoint_to_locator(endpoint, locator);
+    }
+    return locator;
+}
+
+Locator TCPTransportInterface::local_endpoint_to_locator(
+        const std::shared_ptr<TCPChannelResource>& channel) const
+{
+    Locator locator;
+    asio::error_code ec;
+    auto endpoint = channel->local_endpoint(ec);
+    if (ec)
+    {
+        LOCATOR_INVALID(locator);
+    }
+    else
+    {
+        endpoint_to_locator(endpoint, locator);
+    }
+    return locator;
+}
+
+>>>>>>> 08193d5f7 (Protect asio exception hotfix (#4527))
 void TCPTransportInterface::bind_socket(
         std::shared_ptr<TCPChannelResource>& channel)
 {