From a2b6886733eaf5bfa93211f6190f9e2621ff9d28 Mon Sep 17 00:00:00 2001
From: Pete LeVasseur <plevasseur@gmail.com>
Date: Fri, 8 Nov 2024 13:18:40 -0500
Subject: [PATCH] Ensure examples work again:

* me_service <-> ue_client
* ue_service <-> me_client
* ue_publisher -> me_subscriber
* me_publisher -> ue_subscriber
---
 Cargo.lock                       | 61 +++++++++++++++++++++++++++++---
 example-streamer-uses/Cargo.toml |  3 +-
 up-linux-streamer/Cargo.toml     |  4 +--
 up-streamer/src/ustreamer.rs     |  2 +-
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 17395d9..fcbb141 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1163,7 +1163,7 @@ dependencies = [
  "serde",
  "tokio",
  "up-rust",
- "up-transport-vsomeip",
+ "up-transport-vsomeip 0.2.0 (git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id)",
  "up-transport-zenoh",
  "zenoh",
 ]
@@ -4019,7 +4019,7 @@ dependencies = [
  "tokio",
  "up-rust",
  "up-streamer",
- "up-transport-vsomeip",
+ "up-transport-vsomeip 0.2.0 (git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id)",
  "up-transport-zenoh",
  "usubscription-static-file",
  "zenoh",
@@ -4040,7 +4040,7 @@ dependencies = [
  "tracing",
  "up-rust",
  "up-streamer",
- "up-transport-vsomeip",
+ "up-transport-vsomeip 0.2.0 (git+https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git?tag=v0.2.0)",
  "up-transport-zenoh",
  "usubscription-static-file",
  "zenoh",
@@ -4112,8 +4112,31 @@ dependencies = [
  "serde_json",
  "tokio",
  "up-rust",
- "vsomeip-proc-macro",
- "vsomeip-sys",
+ "vsomeip-proc-macro 0.1.0 (git+https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git?tag=v0.2.0)",
+ "vsomeip-sys 0.2.0 (git+https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git?tag=v0.2.0)",
+]
+
+[[package]]
+name = "up-transport-vsomeip"
+version = "0.2.0"
+source = "git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id#8db66110da31a7bf977d0b18140024d37cb535fd"
+dependencies = [
+ "async-trait",
+ "bimap",
+ "bytes",
+ "crossbeam-channel",
+ "cxx",
+ "futures",
+ "lazy_static",
+ "log",
+ "once_cell",
+ "protobuf",
+ "serde",
+ "serde_json",
+ "tokio",
+ "up-rust",
+ "vsomeip-proc-macro 0.1.0 (git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id)",
+ "vsomeip-sys 0.2.0 (git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id)",
 ]
 
 [[package]]
@@ -4268,6 +4291,17 @@ dependencies = [
  "syn 2.0.86",
 ]
 
+[[package]]
+name = "vsomeip-proc-macro"
+version = "0.1.0"
+source = "git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id#8db66110da31a7bf977d0b18140024d37cb535fd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rayon",
+ "syn 2.0.86",
+]
+
 [[package]]
 name = "vsomeip-sys"
 version = "0.2.0"
@@ -4285,6 +4319,23 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "vsomeip-sys"
+version = "0.2.0"
+source = "git+https://github.com/PLeVasseur/up-client-vsomeip-rust?branch=debug/client-id#8db66110da31a7bf977d0b18140024d37cb535fd"
+dependencies = [
+ "autocxx",
+ "autocxx-build",
+ "cmake",
+ "crossbeam-channel",
+ "cxx",
+ "cxx-build",
+ "lazy_static",
+ "log",
+ "miette",
+ "once_cell",
+]
+
 [[package]]
 name = "waker-fn"
 version = "1.2.0"
diff --git a/example-streamer-uses/Cargo.toml b/example-streamer-uses/Cargo.toml
index 06b3470..308dd4c 100644
--- 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 = "debug/client-id" }
+# 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/Cargo.toml b/up-linux-streamer/Cargo.toml
index 292f96b..890869e 100644
--- 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 = "debug/client-id" }
+# 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
index 69ae2eb..c801460 100644
--- 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()