* handling some EOL

* Removing wildcard check, since already done in UAttributesValidator
* cleaning up unused vsomeip JSON

up-transport-vsomeip/src/transport_inner/transport_inner_handle.rs

@@ -1299,18 +1299,7 @@ impl MockableUPTransportVsomeipInner for UPTransportVsomeipInnerHandle {
             ));
         };
 
-        source_filter.verify_no_wildcards().map_err(|e| {
-            UStatus::fail_with_code(UCode::INVALID_ARGUMENT, format!("Invalid source: {e:?}"))
-        })?;
-
         let sink_filter = message.attributes.sink.as_ref();
-
-        if let Some(sink) = sink_filter {
-            sink.verify_no_wildcards().map_err(|e| {
-                UStatus::fail_with_code(UCode::INVALID_ARGUMENT, format!("Invalid sink: {e:?}"))
-            })?;
-        }
-
         let message_type = determine_send_type(source_filter, &sink_filter.cloned())?;
         trace!("inside send(), message_type: {message_type:?}");
         let app_name_res = {

up-transport-vsomeip/tests/point_to_point.rs

@@ -27,7 +27,7 @@ use up_rust::{
 use up_transport_vsomeip::UPTransportVsomeip;
 
 const TEST_DURATION: u64 = 1000;
-const TEST_SLACK: usize = 0;
+const TEST_SLACK: usize = 1;
 
 const STREAMER_UE_ID: u16 = 0x9876;
 
@@ -53,7 +53,6 @@ const OTHER_CLIENT_STREAMER_UE_ID: u16 = 0x1337;
 const OTHER_SERVICE_UE_ID: u32 = 0x5252;
 const OTHER_SERVICE_UE_VERSION_NUMBER: u32 = 1;
 const OTHER_SERVICE_RESOURCE_ID: u32 = 0x0421;
-const OTHER_SERVICE_STREAMER_UE_ID: u16 = 0x2525;
 
 fn client_reply_uuri() -> UUri {
     UUri {
@@ -168,7 +167,6 @@ impl UListener for PointToPointListener {
                 let original_id = msg
                     .attributes
                     .as_ref()
-                    .clone()
                     .unwrap()
                     .id
                     .as_ref()
@@ -389,7 +387,6 @@ async fn point_to_point() {
     let current_dir = current_dir();
     info!("{current_dir:?}");
 
-    // let vsomeip_config_path = "vsomeip_configs/example_ustreamer.json";
     let vsomeip_config_path = "vsomeip_configs/point_to_point_integ.json";
     let abs_vsomeip_config_path = canonicalize(vsomeip_config_path).ok();
     info!("abs_vsomeip_config_path: {abs_vsomeip_config_path:?}");

up-transport-vsomeip/tests/register_unregister.rs

@@ -188,7 +188,7 @@ mod tests {
             &"foo".to_string(),
             &"me_authority".to_string(),
             10,
-            Path::new("vsomeip_configs/example_ustreamer_2.json"),
+            Path::new("vsomeip_configs/example_ustreamer.json"),
         )
         .unwrap();
 

up-transport-vsomeip/vsomeip_configs/client.json

@@ -6,4 +6,4 @@
       "id" : "0x0345"
     }
   ]
-}
+}

up-transport-vsomeip/vsomeip_configs/example_ustreamer.json

@@ -1,13 +1,14 @@
 {
+  "unicast" : "192.168.56.101",
   "applications" :
   [
     {
-      "name" : "foo",
-      "id" : "0x1236"
+      "name" : "foo2",
+      "id" : "0x2236"
     },
     {
-      "name" : "bar",
-      "id" : "0x4321"
+      "name" : "bar2",
+      "id" : "0x5321"
     }
   ]
-}
+}

up-transport-vsomeip/vsomeip_configs/service.json

@@ -6,4 +6,4 @@
       "id" : "0x1234"
     }
   ]
-}
+}

vsomeip-sys/.gitignore

@@ -2,4 +2,4 @@
 
 .idea
 
-**/build/
+**/build/

vsomeip-sys/Cargo.toml

@@ -31,4 +31,4 @@ autocxx-build = { version = "0.26.0" }
 cxx-build = "1.0.122"
 decompress = { version = "0.6.0" }
 miette = { version = "5", features = ["fancy"] }
-reqwest = { version = "0.12", features = ["blocking"] }
+reqwest = { version = "0.12", features = ["blocking"] }