Changeset 23:fd4a129a8417 in finroc_plugins_network_transport

Timestamp:

26.05.2017 20:03:58 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Adds support for different data encodings in connectors established via generic protocol's CONNECT_PORTS opcode

Location:

generic_protocol

Files:

• tNetworkPortInfo.cpp (modified) (1 diff)
• tNetworkPortInfo.h (modified) (3 diffs)
• tRemoteRuntime.cpp (modified) (1 diff)
• tServerSideConversionInfo.h (modified) (4 diffs)

generic_protocol/tNetworkPortInfo.cpp

@@ -79 +79 @@
   deleted(false),
   last_update(rrlib::time::cNO_TIME),
-  desired_encoding(message_flags::tDataEncoding::cBINARY_ENCODING),
+  desired_encoding(rrlib::serialization::tDataEncoding::BINARY),
   served_port_handle(served_port_handle)
 {

generic_protocol/tNetworkPortInfo.h

@@ -178 +178 @@
    * \param encoding Desired data encoding
    */
-  inline void SerializeBuffer(rrlib::serialization::tOutputStream& stream, data_ports::tPortDataPointer<const rrlib::rtti::tGenericObject>& buffer, message_flags::tDataEncoding encoding)
-  {
-    buffer->Serialize(stream, static_cast<rrlib::serialization::tDataEncoding>(encoding));
+  inline void SerializeBuffer(rrlib::serialization::tOutputStream& stream, data_ports::tPortDataPointer<const rrlib::rtti::tGenericObject>& buffer, rrlib::serialization::tDataEncoding encoding)
+  {
+    buffer->Serialize(stream, encoding);
+  }
+
+  /*!
+   * Sets desired network encoding of network partner
+   */
+  void SetDesiredEncoding(rrlib::serialization::tDataEncoding desired_encoding)
+  {
+    this->desired_encoding = desired_encoding;
   }
 
   /*!
    * Sets subscription data of server ports to specified values
+   *
+   * \param data Dynamic connection data
    */
   void SetServerSideDynamicConnectionData(const tDynamicConnectionData& data);
@@ -200 +210 @@
       bool express_data = current_dynamic_connection_data.high_priority;
       bool legacy = stream.GetTargetInfo().revision == 0;
-      uint8_t message_flags = desired_encoding | ((!legacy) && client_info ? message_flags::cTO_SERVER : 0);
+      uint8_t message_flags = static_cast<uint8_t>(desired_encoding) | ((!legacy) && client_info ? message_flags::cTO_SERVER : 0);
       int handle = stream.GetTargetInfo().revision == 0 ? remote_port_handle : connection_handle;
       if (express_data && values_to_send.Size() == 0)
@@ -275 +285 @@
 
   /*! Desired encoding of network partner */
-  message_flags::tDataEncoding desired_encoding;
+  rrlib::serialization::tDataEncoding desired_encoding;
 
   /*! In case this is a server port: Local handle of served port - otherwise 0 */

generic_protocol/tRemoteRuntime.cpp

@@ -664 +664 @@
           data_ports::tGenericPort created_port(rrlib::uri::tURI(port->GetPath()).ToString(), &GetServerPortsElement(), &GetServerPortsElement(), port_to_connect_to->GetDataType(), flags);
           tNetworkPortInfo* network_port_info = new tNetworkPortInfo(*this, message.Get<0>(), message.Get<0>(), dynamic_connection_data.strategy, *created_port.GetWrapped(), port->GetHandle());
+          network_port_info->SetDesiredEncoding(static_subscription_parameters.server_side_conversion.encoding);
           network_port_info->SetServerSideDynamicConnectionData(dynamic_connection_data);
           created_port.AddPortListenerForPointer(*network_port_info);

generic_protocol/tServerSideConversionInfo.h

@@ -72 +72 @@
   std::string operation_1, operation_2, operation_1_parameter, operation_2_parameter, intermediate_type, destination_type;
 
+  /*! Data encoding to use */
+  rrlib::serialization::tDataEncoding encoding = rrlib::serialization::tDataEncoding::BINARY;
+
   bool NoConversion() const
   {
@@ -82 +85 @@
 {
   return lhs.operation_1 == rhs.operation_1 && lhs.operation_2 == rhs.operation_2 && lhs.operation_1_parameter == rhs.operation_1_parameter &&
-         lhs.operation_2_parameter == rhs.operation_2_parameter && lhs.intermediate_type == rhs.intermediate_type && lhs.destination_type == rhs.destination_type;
+         lhs.operation_2_parameter == rhs.operation_2_parameter && lhs.intermediate_type == rhs.intermediate_type && lhs.destination_type == rhs.destination_type &&
+         lhs.encoding == rhs.encoding;
 }
 
@@ -92 +96 @@
 inline rrlib::serialization::tOutputStream& operator << (rrlib::serialization::tOutputStream& stream, const tServerSideConversionInfo& info)
 {
-  stream << info.operation_1 << info.operation_1_parameter << info.operation_2 << info.operation_2_parameter << info.intermediate_type << info.destination_type;
+  stream << info.destination_type << info.operation_1 << info.operation_1_parameter << info.operation_2 << info.operation_2_parameter << info.intermediate_type << info.encoding;
   return stream;
 }
@@ -98 +102 @@
 inline rrlib::serialization::tInputStream& operator >> (rrlib::serialization::tInputStream& stream, tServerSideConversionInfo& info)
 {
-  stream >> info.operation_1 >> info.operation_1_parameter >> info.operation_2 >> info.operation_2_parameter >> info.intermediate_type >> info.destination_type;
+  stream >> info.destination_type >> info.operation_1 >> info.operation_1_parameter >> info.operation_2 >> info.operation_2_parameter >> info.intermediate_type >> info.encoding;
   return stream;
 }