Merge pull request #29 from PLeVasseur/feature/single-application-instance-per-transport

[#29] Use single vsomeip application instance

Author: PLeVasseur

up-transport-vsomeip/src/determine_message_type.rs

@@ -11,69 +11,28 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-use crate::{ClientId, UeId};
-use up_rust::{UCode, UStatus, UUri};
+use log::trace;
+use up_rust::{UStatus, UUri};
 
 /// Registration type containing the [ClientId] of the [vsomeip_sys::vsomeip::application]
 /// which should be used for this message
 #[derive(Clone, Debug, PartialEq)]
 pub(crate) enum RegistrationType {
-    Publish(ClientId),
-    Request(ClientId),
-    Response(ClientId),
-    AllPointToPoint(ClientId),
-}
-
-impl RegistrationType {
-    /// Get the [ClientId] of the [vsomeip_sys::vsomeip::application]
-    /// which should be used for this message
-    pub fn client_id(&self) -> ClientId {
-        match self {
-            RegistrationType::Publish(client_id) => *client_id,
-            RegistrationType::Request(client_id) => *client_id,
-            RegistrationType::Response(client_id) => *client_id,
-            RegistrationType::AllPointToPoint(client_id) => *client_id,
-        }
-    }
-}
-
-/// infer the type of message desired based on the filters provided in a registration / unregistration
-pub(crate) fn determine_registration_type(
-    source_filter: &UUri,
-    sink_filter: &Option<UUri>,
-    my_ue_id: UeId,
-) -> Result<RegistrationType, UStatus> {
-    determine_type(
-        source_filter,
-        sink_filter,
-        Some(my_ue_id),
-        DeterminationType::Register,
-    )
-}
-
-/// infer the type of message desired based on the source and sink contained in a message
-pub(crate) fn determine_send_type(
-    source_filter: &UUri,
-    sink_filter: &Option<UUri>,
-) -> Result<RegistrationType, UStatus> {
-    determine_type(source_filter, sink_filter, None, DeterminationType::Send)
-}
-
-/// Whether the [determine_type] function should treat this as a registration / unregistration or send
-enum DeterminationType {
-    Register,
-    Send,
+    Publish,
+    Request,
+    Response,
+    AllPointToPoint,
 }
 
 /// Determines [RegistrationType] of a source and sink filter [UUri]
-fn determine_type(
+pub fn determine_type(
     source_filter: &UUri,
     sink_filter: &Option<UUri>,
-    my_ue_id: Option<UeId>,
-    determination_type: DeterminationType,
 ) -> Result<RegistrationType, UStatus> {
     if let Some(sink_filter) = &sink_filter {
         // determine if we're in the uStreamer use-case of capturing all point-to-point messages
+        trace!("source_filter: {source_filter:?}");
+        trace!("sink_filter: {sink_filter:?}");
         let streamer_use_case = {
             source_filter.authority_name == "*"
                 && source_filter.ue_id == 0x0000_FFFF
@@ -86,33 +45,16 @@ fn determine_type(
         };
 
         if streamer_use_case {
-            return Ok(RegistrationType::AllPointToPoint(0xFFFF));
+            return Ok(RegistrationType::AllPointToPoint);
         }
 
-        let client_id = match determination_type {
-            DeterminationType::Register => sink_filter.ue_id as ClientId,
-            DeterminationType::Send => source_filter.ue_id as ClientId,
-        };
-
         if sink_filter.resource_id == 0 {
-            Ok(RegistrationType::Response(client_id))
+            Ok(RegistrationType::Response)
         } else {
-            Ok(RegistrationType::Request(client_id))
+            Ok(RegistrationType::Request)
         }
     } else {
-        let client_id = match determination_type {
-            DeterminationType::Register => match my_ue_id {
-                None => {
-                    return Err(UStatus::fail_with_code(
-                        UCode::INTERNAL,
-                        "Should have been an own ue_id available in this path",
-                    ));
-                }
-                Some(ue_id) => ue_id,
-            },
-            DeterminationType::Send => source_filter.ue_id,
-        };
-        Ok(RegistrationType::Publish(client_id as ClientId))
+        Ok(RegistrationType::Publish)
     }
 }