Fix shared-memory feature

eclipse-zenoh · Feb 7, 2024 · 94de239 · 94de239
1 parent c8df037
commit 94de239
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/io/zenoh-transport/src/shm.rs b/io/zenoh-transport/src/shm.rs
@@ -21,6 +21,7 @@ use zenoh_protocol::{
         err::{ext::ErrBodyType, Err},
         ext::ShmType,
         query::{ext::QueryBodyType, Query},
+        reply::ReplyBody,
         PushBody, Put, Reply, RequestBody, ResponseBody,
     },
 };
@@ -105,17 +106,17 @@ impl MapShm for Query {
 // Impl - Reply
 impl MapShm for Reply {
     fn map_to_shminfo(&mut self) -> ZResult<bool> {
-        let Self {
-            payload, ext_shm, ..
-        } = self;
-        map_to_shminfo!(payload, ext_shm)
+        match &mut self.payload {
+            ReplyBody::Put(b) => b.map_to_shminfo(),
+            _ => Ok(false),
+        }
     }
 
     fn map_to_shmbuf(&mut self, shmr: &RwLock<SharedMemoryReader>) -> ZResult<bool> {
-        let Self {
-            payload, ext_shm, ..
-        } = self;
-        map_to_shmbuf!(payload, ext_shm, shmr)
+        match &mut self.payload {
+            ReplyBody::Put(b) => b.map_to_shmbuf(shmr),
+            _ => Ok(false),
+        }
     }
 }
 

diff --git a/zenoh/src/net/routing/dispatcher/queries.rs b/zenoh/src/net/routing/dispatcher/queries.rs
@@ -545,7 +545,9 @@ pub fn route_query(
                             encoding: Encoding::default(), // @TODO: handle encoding
                             ext_sinfo: None,               // @TODO: handle source info
                             ext_attachment: None,          // @TODO: expose it in the API
-                            ext_unknown: vec![],           // @TODO: handle unknown extensions
+                            #[cfg(feature = "shared-memory")]
+                            ext_shm: None,
+                            ext_unknown: vec![], // @TODO: handle unknown extensions
                             payload,
                         }),
                     });