From a6b99ea8c4e322dfacab79b0ad265b652e06be0e Mon Sep 17 00:00:00 2001
From: Pierre Avital <pierre.avital@me.com>
Date: Wed, 21 Dec 2022 15:30:29 +0100
Subject: [PATCH 1/3] fix layout

---
 Cargo.lock               | 146 ++++++---------------------------------
 Cargo.toml               |   6 +-
 include/zenoh_concrete.h |   9 +--
 src/get.rs               |   9 +--
 4 files changed, 36 insertions(+), 134 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a23961096..8557a0b55 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -224,15 +224,6 @@ version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -958,15 +949,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.7.1"
@@ -997,19 +979,6 @@ dependencies = [
  "getrandom",
 ]
 
-[[package]]
-name = "nix"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if",
- "libc",
- "memoffset 0.6.5",
-]
-
 [[package]]
 name = "nix"
 version = "0.26.1"
@@ -1019,7 +988,7 @@ dependencies = [
  "bitflags",
  "cfg-if",
  "libc",
- "memoffset 0.7.1",
+ "memoffset",
  "pin-utils",
  "static_assertions",
 ]
@@ -1743,19 +1712,6 @@ dependencies = [
  "keccak",
 ]
 
-[[package]]
-name = "shared_memory"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54"
-dependencies = [
- "cfg-if",
- "libc",
- "nix 0.23.2",
- "rand",
- "win-sys",
-]
-
 [[package]]
 name = "shellexpand"
 version = "3.0.0"
@@ -2231,15 +2187,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "win-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5"
-dependencies = [
- "windows",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -2271,19 +2218,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f"
-dependencies = [
- "windows_aarch64_msvc 0.34.0",
- "windows_i686_gnu 0.34.0",
- "windows_i686_msvc 0.34.0",
- "windows_x86_64_gnu 0.34.0",
- "windows_x86_64_msvc 0.34.0",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.36.1"
@@ -2318,12 +2252,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.36.1"
@@ -2336,12 +2264,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
@@ -2354,12 +2276,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
@@ -2372,12 +2288,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
@@ -2396,12 +2306,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"
@@ -2417,7 +2321,7 @@ checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 [[package]]
 name = "zenoh"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-global-executor",
  "async-std",
@@ -2462,14 +2366,10 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
- "bincode",
  "hex",
- "log",
- "serde",
- "shared_memory",
  "zenoh-collections",
  "zenoh-core",
 ]
@@ -2498,7 +2398,7 @@ dependencies = [
 [[package]]
 name = "zenoh-cfg-properties"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "zenoh-core",
  "zenoh-macros",
@@ -2507,7 +2407,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2520,7 +2420,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "flume",
  "json5",
@@ -2538,7 +2438,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "anyhow",
  "async-std",
@@ -2549,7 +2449,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "aes",
  "hmac",
@@ -2562,7 +2462,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2581,7 +2481,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2597,7 +2497,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2620,7 +2520,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2635,7 +2535,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -2657,7 +2557,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2674,13 +2574,13 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "async-trait",
  "futures",
  "log",
- "nix 0.26.1",
+ "nix",
  "uuid",
  "zenoh-core",
  "zenoh-link-commons",
@@ -2691,7 +2591,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2703,7 +2603,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "libloading",
  "log",
@@ -2716,7 +2616,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "log",
  "uhlc",
@@ -2728,7 +2628,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol-core"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "hex",
  "itertools",
@@ -2743,7 +2643,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "event-listener",
@@ -2756,7 +2656,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-executor",
  "async-global-executor",
@@ -2784,7 +2684,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#1ad30ac8de84f32606ab6bea31fc6abc3a382646"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
 dependencies = [
  "async-std",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 072509bff..2dfb17e43 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,11 +45,11 @@ libc = "0.2.138"
 log = "0.4.17"
 rand = "0.8.5"
 spin = "0.9.4"
-zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
+zenoh = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
     "unstable",
 ] }
-zenoh-protocol-core = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
-zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-protocol-core = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-util = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
 
 [build-dependencies]
 cbindgen = "0.24.3"
diff --git a/include/zenoh_concrete.h b/include/zenoh_concrete.h
index c6a1a1c60..2cc13a3f5 100644
--- a/include/zenoh_concrete.h
+++ b/include/zenoh_concrete.h
@@ -58,10 +58,11 @@ typedef struct _zc_stack_ke {
   uint8_t _4;
 } _zc_stack_ke;
 typedef struct _zc_res_s_v {
-  uint8_t _3;
-  _z_u128 _0[3];
-  struct _zc_stack_ke _1;
-  uintptr_t _2[11];
+  uint8_t _0;
+  _z_u128 _1[2];
+  struct _zc_stack_ke _2;
+  uintptr_t _3[11];
+  uint64_t _4;
 } _zc_res_s_v;
 /**
  * A loaned zenoh session.
diff --git a/src/get.rs b/src/get.rs
index b2ac96c5d..f63935721 100644
--- a/src/get.rs
+++ b/src/get.rs
@@ -51,10 +51,11 @@ pub struct z_owned_reply_t {
 }
 #[repr(C)]
 pub struct _zc_res_s_v {
-    _3: u8,
-    _0: [_z_u128; 3],
-    _1: _zc_stack_ke,
-    _2: [usize; 11],
+    _0: u8,
+    _1: [_z_u128; 2],
+    _2: _zc_stack_ke,
+    _3: [usize; 11],
+    _4: u64,
 }
 
 impl From<ReplyInner> for z_owned_reply_t {

From 0e2b2fb9022c2adbce9d4df1192e13294be66cd2 Mon Sep 17 00:00:00 2001
From: Luca Cominardi <luca.cominardi@gmail.com>
Date: Wed, 21 Dec 2022 15:57:37 +0100
Subject: [PATCH 2/3] Bump to zenoh 0.7.0-rc dependency

---
 Cargo.lock    | 161 ++++++++++++++++++++++++++++----------------------
 Cargo.toml    |   6 +-
 Cargo.toml.in |   6 +-
 3 files changed, 97 insertions(+), 76 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8557a0b55..3ff689e97 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -24,9 +24,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "array-init"
@@ -180,9 +180,9 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364"
+checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -298,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.77"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 
 [[package]]
 name = "cfg-if"
@@ -823,9 +823,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
 dependencies = [
  "hermit-abi 0.2.6",
  "io-lifetimes",
@@ -844,9 +844,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
+checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
 [[package]]
 name = "js-sys"
@@ -919,9 +919,9 @@ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "lock_api"
@@ -1049,11 +1049,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
 dependencies = [
- "hermit-abi 0.1.19",
+ "hermit-abi 0.2.6",
  "libc",
 ]
 
@@ -1092,9 +1092,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
 
 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 
 [[package]]
 name = "pem-rfc7468"
@@ -1310,9 +1310,9 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748"
+checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6"
 dependencies = [
  "autocfg",
  "cfg-if",
@@ -1330,15 +1330,15 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.20+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
+checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5"
 dependencies = [
  "unicode-ident",
 ]
@@ -1395,9 +1395,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
 dependencies = [
  "proc-macro2",
 ]
@@ -1588,9 +1588,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
+checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
 
 [[package]]
 name = "schannel"
@@ -1643,24 +1643,24 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"
+checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
 
 [[package]]
 name = "serde"
-version = "1.0.149"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.149"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1669,9 +1669,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "itoa",
  "ryu",
@@ -1680,9 +1680,9 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.14"
+version = "0.9.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da"
+checksum = "92b5b431e8907b50339b51223b97d102db8d987ced36f6e4d03621db9316c834"
 dependencies = [
  "indexmap",
  "itoa",
@@ -1832,9 +1832,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "syn"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1872,18 +1872,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1989,15 +1989,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"
+checksum = "bc7ed8ba44ca06be78ea1ad2c3682a43349126c8818054231ee6f4748012aed2"
 
 [[package]]
 name = "untrusted"
@@ -2171,9 +2171,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
  "webpki",
 ]
@@ -2321,7 +2321,8 @@ checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 [[package]]
 name = "zenoh"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44140d6ebcf2e52ee48acad0e9d960c2b1e868eec021da2538e58373d615fc18"
 dependencies = [
  "async-global-executor",
  "async-std",
@@ -2366,7 +2367,8 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "244d54f1228d3c53fc69483faafcfcc1b4d670b60cffce17696fc49fbc7a6608"
 dependencies = [
  "async-std",
  "hex",
@@ -2398,7 +2400,8 @@ dependencies = [
 [[package]]
 name = "zenoh-cfg-properties"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a963395194bf1b64f67d89333e8089f01568ec7ac28c305847f505452a98006e"
 dependencies = [
  "zenoh-core",
  "zenoh-macros",
@@ -2407,7 +2410,8 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e256d7aff2c9af765d77efbfae7fcb708d2d7f4e179aa201bff2f81ad7a3845"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2420,7 +2424,8 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad1ff61abf28c57e8879ec4286fa29becf7e9bf12555df9a7faddff3bc9ea1b"
 dependencies = [
  "flume",
  "json5",
@@ -2438,7 +2443,8 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b0f55158f3f83555db74d4cf5ebc34f90df5d2992cc0de67eba69b99628605e"
 dependencies = [
  "anyhow",
  "async-std",
@@ -2449,7 +2455,8 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "653ba15479a0e3f1a94d7f079babc52f742f3a2bd995c59bc250cfc9a789dbbc"
 dependencies = [
  "aes",
  "hmac",
@@ -2462,7 +2469,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e58770c73cf0b5ec8fbe104d609eec83f9bc3463ea23a583c8b465de77f7d27"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2481,7 +2489,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21aab9eeb2aba53e37aae57467ffca1268d209811c5e2f39761aab4c1343bce3"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2497,7 +2506,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9f1354094eb4d5e4b864b5aa385efce46f94a43f6ba57dd9ea9a017e6e74176"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2520,7 +2530,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ffc29707a50680dba124dd4d8bc3bc19feb158db8312433bfc3078f7b8f1ef"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2535,7 +2546,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a5630b3a218c7179191dab78ebc45da1837793951bddb8fda4f5900b47da552"
 dependencies = [
  "async-rustls",
  "async-std",
@@ -2557,7 +2569,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "176494947bd3a6aa10baa469afa4572635822683830808cd71d5554ce15dfebb"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2574,7 +2587,8 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9974305820f92478490ba8b8f119eb5b7d7b4998a7125d1510f6e69f3f81d1"
 dependencies = [
  "async-std",
  "async-trait",
@@ -2591,7 +2605,8 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a9ac20b120990778cca204ee46c43a37ed4ffbc331e95702615490f9c169de8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2603,7 +2618,8 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3b8bfb8e2625e1150dab46b7a4433f866aa06af763237d564b1aa8f6aaf0b29"
 dependencies = [
  "libloading",
  "log",
@@ -2616,7 +2632,8 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "174a00456e29d941a4230148fd184953e95883bde47a4cfc1a508e0aaec89a89"
 dependencies = [
  "log",
  "uhlc",
@@ -2628,7 +2645,8 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol-core"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf3eaea2095d2c13fefdae25aca813b3644fc15e1441e16a4398b5113033753"
 dependencies = [
  "hex",
  "itertools",
@@ -2643,7 +2661,8 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "821070b62a55d4c8a22e1e06c939c1f2d94767e660df9fcbea377781f72f59bf"
 dependencies = [
  "async-std",
  "event-listener",
@@ -2656,7 +2675,8 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce4387cfc02cb86383de8e65ab1eb204e3908c5f1db9e6b4defd8ad530c9ddea"
 dependencies = [
  "async-executor",
  "async-global-executor",
@@ -2684,7 +2704,8 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "0.7.0-rc"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=master#d36f10cb251966c7fcc5fa295357acc4644adcdb"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54646455dad3940535e97cce03f1b604265177349133903d989bc72e00011404"
 dependencies = [
  "async-std",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 2dfb17e43..36e219d62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,11 +45,11 @@ libc = "0.2.138"
 log = "0.4.17"
 rand = "0.8.5"
 spin = "0.9.4"
-zenoh = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
+zenoh = { version = "0.7.0-rc", features = [
     "unstable",
 ] }
-zenoh-protocol-core = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
-zenoh-util = { version = "0.7.0-rc", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-protocol-core = { version = "0.7.0-rc" }
+zenoh-util = { version = "0.7.0-rc" }
 
 [build-dependencies]
 cbindgen = "0.24.3"
diff --git a/Cargo.toml.in b/Cargo.toml.in
index ef6c834d8..88199a327 100644
--- a/Cargo.toml.in
+++ b/Cargo.toml.in
@@ -45,11 +45,11 @@ libc = "0.2.138"
 log = "0.4.17"
 rand = "0.8.5"
 spin = "0.9.4"
-zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master", features = [
+zenoh = { version = "0.7.0-rc", features = [
     "unstable",
 ] }
-zenoh-protocol-core = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
-zenoh-util = { git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "master" }
+zenoh-protocol-core = { version = "0.7.0-rc" }
+zenoh-util = { version = "0.7.0-rc" }
 
 [build-dependencies]
 cbindgen = "0.24.3"

From 71b4530f931dd1e210bf11f274c4ac91121fe2e0 Mon Sep 17 00:00:00 2001
From: Luca Cominardi <luca.cominardi@gmail.com>
Date: Wed, 21 Dec 2022 16:03:54 +0100
Subject: [PATCH 3/3] Fix zenoh-c version

---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ff689e97..c425dde15 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2378,7 +2378,7 @@ dependencies = [
 
 [[package]]
 name = "zenoh-c"
-version = "0.7.0-rc.1"
+version = "0.7.0-rc"
 dependencies = [
  "async-std",
  "async-trait",
diff --git a/Cargo.toml b/Cargo.toml
index 36e219d62..3ddfb3f8c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
 #
 [package]
 name = "zenoh-c"
-version = "0.7.0-rc.1"
+version = "0.7.0-rc"
 repository = "https://github.com/eclipse-zenoh/zenoh-c"
 homepage = "http://zenoh.io"
 authors = [