Changeset 24:cddabeebd261 in finroc_plugins_network_transport

Timestamp:

31.05.2017 23:42:14 (6 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Fixes robustness issue (potential crash) with closed connections and improves inline documentation

Files:

• generic_protocol/tConnection.cpp (modified) (1 diff)
• generic_protocol/tRemoteRuntime.cpp (modified) (2 diffs)
• runtime_info/tFrameworkElementInfo.h (modified) (2 diffs)

generic_protocol/tConnection.cpp

@@ -221 +221 @@
     non_acknowledged_bulk_packets += 0x8000;
   }
+  assert(GetRemoteRuntime());
   bool more_bulk_packets_allowed = non_acknowledged_bulk_packets < static_cast<int>(GetRemoteRuntime()->NetworkTransport().par_max_not_acknowledged_packets_bulk.Get());
 

generic_protocol/tRemoteRuntime.cpp

@@ -943 +943 @@
 void tRemoteRuntime::SendPendingMessages(const rrlib::time::tTimestamp& time_now)
 {
+  if ((!GetPrimaryConnection()) || GetPrimaryConnection()->IsClosed())
+  {
+    return;
+  }
+
   for (auto it = not_ready_calls.begin(); it < not_ready_calls.end();)
   {
@@ -981 +986 @@
   for (auto & connection : connections)
   {
-    if (connection)
+    if (connection && (!connection->IsClosed()))
     {
       connection->SendPendingMessages(time_now);

runtime_info/tFrameworkElementInfo.h

@@ -229 +229 @@
 
   /*!
-   * Serializes info on single framework element to stream so that it can later
+   * Serializes info one single framework element to stream so that it can later
    * be deserialized in typically another runtime environment.
+   * Note that its handle is also serialized.
    *
    * \param stream Binary stream to serialize to
@@ -239 +240 @@
    */
   template < bool ENABLE = !Tremote >
-  static void Serialize(typename std::enable_if<ENABLE, rrlib::serialization::tOutputStream>::type& stream, const core::tFrameworkElement& framework_element, bool serialize_owned_connectors = false)
+  static void Serialize(typename std::enable_if<ENABLE, rrlib::serialization::tOutputStream>::type& stream, const core::tFrameworkElement& framework_element, bool serialize_owned_connectors)
   {
     rrlib::uri::tURI uri;