diff --git a/zenoh/src/net/routing/hat/client/pubsub.rs b/zenoh/src/net/routing/hat/client/pubsub.rs index cd6338d7b5..61d89fa804 100644 --- a/zenoh/src/net/routing/hat/client/pubsub.rs +++ b/zenoh/src/net/routing/hat/client/pubsub.rs @@ -193,7 +193,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -231,7 +233,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/client/queries.rs b/zenoh/src/net/routing/hat/client/queries.rs index cd417ef84b..aaec9e07ce 100644 --- a/zenoh/src/net/routing/hat/client/queries.rs +++ b/zenoh/src/net/routing/hat/client/queries.rs @@ -188,7 +188,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -232,7 +234,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/linkstate_peer/pubsub.rs b/zenoh/src/net/routing/hat/linkstate_peer/pubsub.rs index fc2074c0b9..358a174217 100644 --- a/zenoh/src/net/routing/hat/linkstate_peer/pubsub.rs +++ b/zenoh/src/net/routing/hat/linkstate_peer/pubsub.rs @@ -398,7 +398,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -428,7 +430,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -554,7 +558,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -586,7 +592,9 @@ pub(super) fn undeclare_simple_subscription( body: DeclareBody::UndeclareSubscriber( UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }, ), }, diff --git a/zenoh/src/net/routing/hat/linkstate_peer/queries.rs b/zenoh/src/net/routing/hat/linkstate_peer/queries.rs index 8668c01ba2..f901e8c3a3 100644 --- a/zenoh/src/net/routing/hat/linkstate_peer/queries.rs +++ b/zenoh/src/net/routing/hat/linkstate_peer/queries.rs @@ -413,7 +413,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -444,7 +446,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -576,7 +580,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -607,7 +613,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/p2p_peer/pubsub.rs b/zenoh/src/net/routing/hat/p2p_peer/pubsub.rs index 776b472c87..58ffc8d2ae 100644 --- a/zenoh/src/net/routing/hat/p2p_peer/pubsub.rs +++ b/zenoh/src/net/routing/hat/p2p_peer/pubsub.rs @@ -250,7 +250,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -278,7 +280,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -319,7 +323,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -347,7 +353,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/p2p_peer/queries.rs b/zenoh/src/net/routing/hat/p2p_peer/queries.rs index 052d401690..644e6033dc 100644 --- a/zenoh/src/net/routing/hat/p2p_peer/queries.rs +++ b/zenoh/src/net/routing/hat/p2p_peer/queries.rs @@ -218,7 +218,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -246,7 +248,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -292,7 +296,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -320,7 +326,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/router/pubsub.rs b/zenoh/src/net/routing/hat/router/pubsub.rs index a1fb8de164..10e9e79dfa 100644 --- a/zenoh/src/net/routing/hat/router/pubsub.rs +++ b/zenoh/src/net/routing/hat/router/pubsub.rs @@ -434,7 +434,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -466,7 +468,9 @@ fn propagate_forget_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -514,7 +518,9 @@ fn propagate_forget_simple_subscription_to_peers( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -680,7 +686,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -712,7 +720,9 @@ pub(super) fn undeclare_simple_subscription( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), diff --git a/zenoh/src/net/routing/hat/router/queries.rs b/zenoh/src/net/routing/hat/router/queries.rs index 34e05c43c0..61b94da43e 100644 --- a/zenoh/src/net/routing/hat/router/queries.rs +++ b/zenoh/src/net/routing/hat/router/queries.rs @@ -560,7 +560,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -592,7 +594,9 @@ fn propagate_forget_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -640,7 +644,9 @@ fn propagate_forget_simple_queryable_to_peers( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -819,7 +825,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(), @@ -851,7 +859,9 @@ pub(super) fn undeclare_simple_queryable( ext_nodeid: ext::NodeIdType::DEFAULT, body: DeclareBody::UndeclareQueryable(UndeclareQueryable { id, - ext_wire_expr: WireExprType::null(), + ext_wire_expr: WireExprType { + wire_expr: res.expr().into(), + }, }), }, res.expr(),