Ensure examples work again:

* me_service <-> ue_client * ue_service <-> me_client * ue_publisher -> me_subscriber * me_publisher -> ue_subscriber
eclipse-uprotocol · Nov 10, 2024 · 06a0c38 · 06a0c38
1 parent 092f3ab
commit 06a0c38
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example-streamer-uses/Cargo.toml b/example-streamer-uses/Cargo.toml
@@ -56,5 +56,6 @@ serde = { workspace = true }
 tokio = { workspace = true }
 up-rust = { workspace = true }
 up-transport-zenoh = { version = "0.3.0"  }
-up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
+up-transport-vsomeip = { git = "https://github.com/PLeVasseur/up-client-vsomeip-rust", branch = "feature/fix-client-id-usage" }
+# up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
 zenoh = { version = "1.0.0", features = ["unstable", "internal"] }
diff --git a/up-linux-streamer-plugin/Cargo.toml b/up-linux-streamer-plugin/Cargo.toml
@@ -45,7 +45,8 @@ serde_json = { version = "1.0.94" }
 tokio = { version = "1.35.1", default-features = false }
 up-rust = { workspace = true }
 up-transport-zenoh = { version = "0.3.0"  }
-up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
+up-transport-vsomeip = { git = "https://github.com/PLeVasseur/up-client-vsomeip-rust", branch = "feature/fix-client-id-usage" }
+# up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
 up-streamer = { path = "../up-streamer" }
 usubscription-static-file = {path = "../utils/usubscription-static-file"}
 zenoh = { version = "1.0.0", features = ["unstable", "internal", "plugins"] }

diff --git a/up-linux-streamer/Cargo.toml b/up-linux-streamer/Cargo.toml
@@ -36,8 +36,8 @@ tokio = { workspace = true }
 up-rust = { workspace = true }
 up-streamer = { path = "../up-streamer" }
 up-transport-zenoh = { version = "0.3.0"  }
-# up-transport-vsomeip = { git = "https://github.com/PLeVasseur/up-client-vsomeip-rust", branch = "feature/debug-unable-to-send-back-result", default-features = false }
-up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
+up-transport-vsomeip = { git = "https://github.com/PLeVasseur/up-client-vsomeip-rust", branch = "feature/fix-client-id-usage" }
+# up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.2.0", default-features = false }
 zenoh = { version = "1.0.0", features = ["unstable", "internal"] }
 usubscription-static-file = {path = "../utils/usubscription-static-file"}
 

diff --git a/up-streamer/src/ustreamer.rs b/up-streamer/src/ustreamer.rs
@@ -52,7 +52,7 @@ lazy_static! {
 fn uauthority_to_uuri(authority_name: &str) -> UUri {
     UUri {
         authority_name: authority_name.to_string(),
-        ue_id: 0xFFFF_FFFF,     // any instance, any service
+        ue_id: 0x0000_FFFF,     // any instance, any service
         ue_version_major: 0xFF, // any
         resource_id: 0xFFFF,    // any
         ..Default::default()