diff --git a/commons/zenoh-protocol/src/network/mod.rs b/commons/zenoh-protocol/src/network/mod.rs index cbda7f578b..44464c4b13 100644 --- a/commons/zenoh-protocol/src/network/mod.rs +++ b/commons/zenoh-protocol/src/network/mod.rs @@ -267,6 +267,30 @@ pub mod ext { let inner: u8 = rng.gen(); Self { inner } } + + pub fn declare_default() -> Self { + Self::new(Priority::default(), CongestionControl::Block, false) + } + + pub fn push_default() -> Self { + Self::new(Priority::default(), CongestionControl::Drop, false) + } + + pub fn request_default() -> Self { + Self::new(Priority::default(), CongestionControl::Block, false) + } + + pub fn response_default() -> Self { + Self::new(Priority::default(), CongestionControl::Block, false) + } + + pub fn response_final_default() -> Self { + Self::new(Priority::default(), CongestionControl::Block, false) + } + + pub fn oam_default() -> Self { + Self::new(Priority::default(), CongestionControl::Block, false) + } } impl Default for QoSType<{ ID }> { diff --git a/zenoh/src/key_expr.rs b/zenoh/src/key_expr.rs index 6ed616fd13..ad41c30457 100644 --- a/zenoh/src/key_expr.rs +++ b/zenoh/src/key_expr.rs @@ -633,7 +633,7 @@ impl SyncResolve for KeyExprUndeclaration<'_> { let primitives = state.primitives.as_ref().unwrap().clone(); drop(state); primitives.send_declare(zenoh_protocol::network::Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::UndeclareKeyExpr(UndeclareKeyExpr { id: expr_id }), diff --git a/zenoh/src/net/routing/network.rs b/zenoh/src/net/routing/network.rs index 37493831bb..3af1e0a87c 100644 --- a/zenoh/src/net/routing/network.rs +++ b/zenoh/src/net/routing/network.rs @@ -275,7 +275,7 @@ impl Network { Ok(NetworkBody::OAM(Oam { id: OAM_LINKSTATE, body: ZExtBody::ZBuf(buf), - ext_qos: oam::ext::QoSType::default(), + ext_qos: oam::ext::QoSType::oam_default(), ext_tstamp: None, }) .into()) diff --git a/zenoh/src/net/routing/pubsub.rs b/zenoh/src/net/routing/pubsub.rs index e31df26b59..f45b8029e3 100644 --- a/zenoh/src/net/routing/pubsub.rs +++ b/zenoh/src/net/routing/pubsub.rs @@ -60,7 +60,7 @@ fn send_sourced_subscription_to_net_childs( log::debug!("Send subscription {} on {}", res.expr(), someface); someface.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: routing_context.unwrap_or(0), @@ -114,7 +114,7 @@ fn propagate_simple_subscription_to( get_mut_unchecked(dst_face).local_subs.insert(res.clone()); let key_expr = Resource::decl_key(res, dst_face); dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -469,7 +469,7 @@ pub fn declare_client_subscription( #[cfg(not(windows))] for mcast_group in &wtables.mcast_groups { mcast_group.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -488,7 +488,7 @@ pub fn declare_client_subscription( #[cfg(not(windows))] for mcast_group in &wtables.mcast_groups { mcast_group.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -572,7 +572,7 @@ fn send_forget_sourced_subscription_to_net_childs( log::debug!("Send forget subscription {} on {}", res.expr(), someface); someface.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: routing_context.unwrap_or(0), @@ -595,7 +595,7 @@ fn propagate_forget_simple_subscription(tables: &mut Tables, res: &Arc if face.local_subs.contains(res) { let wire_expr = Resource::get_best_key(res, "", face.id); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -631,7 +631,7 @@ fn propagate_forget_simple_subscription_to_peers(tables: &mut Tables, res: &Arc< { let wire_expr = Resource::get_best_key(res, "", face.id); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -870,7 +870,7 @@ pub(crate) fn undeclare_client_subscription( { let wire_expr = Resource::get_best_key(res, "", face.id); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -930,7 +930,7 @@ pub(crate) fn pubsub_new_face(tables: &mut Tables, face: &mut Arc) { get_mut_unchecked(face).local_subs.insert(sub.clone()); let key_expr = Resource::decl_key(sub, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -954,7 +954,7 @@ pub(crate) fn pubsub_new_face(tables: &mut Tables, face: &mut Arc) { get_mut_unchecked(face).local_subs.insert(sub.clone()); let key_expr = Resource::decl_key(sub, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -974,7 +974,7 @@ pub(crate) fn pubsub_new_face(tables: &mut Tables, face: &mut Arc) { get_mut_unchecked(face).local_subs.insert(sub.clone()); let key_expr = Resource::decl_key(sub, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -1167,7 +1167,7 @@ pub(crate) fn pubsub_linkstate_change(tables: &mut Tables, zid: &ZenohId, links: if forget { let wire_expr = Resource::get_best_key(res, "", dst_face.id); dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber( @@ -1189,7 +1189,7 @@ pub(crate) fn pubsub_linkstate_change(tables: &mut Tables, zid: &ZenohId, links: mode: Mode::Push, }; dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -1831,7 +1831,7 @@ pub fn full_reentrant_route_data( outface.primitives.send_push(Push { wire_expr: key_expr, - ext_qos: ext::QoSType::default(), + ext_qos, ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: context.unwrap_or(0), @@ -1860,7 +1860,7 @@ pub fn full_reentrant_route_data( outface.primitives.send_push(Push { wire_expr: key_expr.into(), - ext_qos: ext::QoSType::default(), + ext_qos, ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: context.unwrap_or(0), @@ -1907,7 +1907,7 @@ pub fn pull_data(tables_ref: &RwLock, face: &Arc, expr: WireE for (key_expr, payload) in route { face.primitives.send_push(Push { wire_expr: key_expr, - ext_qos: ext::QoSType::default(), // TODO + ext_qos: ext::QoSType::push_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), payload, diff --git a/zenoh/src/net/routing/queries.rs b/zenoh/src/net/routing/queries.rs index 9fa922701f..e2608a0066 100644 --- a/zenoh/src/net/routing/queries.rs +++ b/zenoh/src/net/routing/queries.rs @@ -219,7 +219,7 @@ fn send_sourced_queryable_to_net_childs( log::debug!("Send queryable {} on {}", res.expr(), someface); someface.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: routing_context.unwrap_or(0), @@ -286,7 +286,7 @@ fn propagate_simple_queryable( .insert(res.clone(), info); let key_expr = Resource::decl_key(res, &mut dst_face); dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -697,7 +697,7 @@ fn send_forget_sourced_queryable_to_net_childs( log::debug!("Send forget queryable {} on {}", res.expr(), someface); someface.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: routing_context.unwrap_or(0), @@ -720,7 +720,7 @@ fn propagate_forget_simple_queryable(tables: &mut Tables, res: &mut Arc) { .insert(qabl.clone(), info); let key_expr = Resource::decl_key(qabl, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1092,7 +1092,7 @@ pub(crate) fn queries_new_face(tables: &mut Tables, face: &mut Arc) { .insert(qabl.clone(), info); let key_expr = Resource::decl_key(qabl, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1116,7 +1116,7 @@ pub(crate) fn queries_new_face(tables: &mut Tables, face: &mut Arc) { .insert(qabl.clone(), info); let key_expr = Resource::decl_key(qabl, face); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1253,7 +1253,7 @@ pub(crate) fn queries_linkstate_change(tables: &mut Tables, zid: &ZenohId, links if forget { let wire_expr = Resource::get_best_key(res, "", dst_face.id); dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareQueryable(UndeclareQueryable { @@ -1272,7 +1272,7 @@ pub(crate) fn queries_linkstate_change(tables: &mut Tables, zid: &ZenohId, links .insert(res.clone(), info); let key_expr = Resource::decl_key(res, dst_face); dst_face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -2128,7 +2128,7 @@ pub fn route_query( rid: qid, wire_expr: expr, payload, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::declare_default(), ext_tstamp: None, ext_respid: Some(response::ext::ResponderIdType { zid, @@ -2145,7 +2145,7 @@ pub fn route_query( ); face.primitives.clone().send_response_final(ResponseFinal { rid: qid, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_final_default(), ext_tstamp: None, }); } else { @@ -2173,7 +2173,7 @@ pub fn route_query( outface.primitives.send_request(Request { id: *qid, wire_expr: key_expr.into(), - ext_qos: ext::QoSType::default(), // TODO + ext_qos: ext::QoSType::request_default(), // TODO ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: context.map(|c| c.tree_id).unwrap_or(0) as u16, @@ -2208,7 +2208,7 @@ pub fn route_query( outface.primitives.send_request(Request { id: *qid, wire_expr: key_expr.into(), - ext_qos: ext::QoSType::default(), // TODO + ext_qos: ext::QoSType::request_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType { node_id: context.unwrap_or(0), @@ -2226,7 +2226,7 @@ pub fn route_query( drop(rtables); face.primitives.clone().send_response_final(ResponseFinal { rid: qid, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_final_default(), ext_tstamp: None, }); } @@ -2239,7 +2239,7 @@ pub fn route_query( drop(rtables); face.primitives.clone().send_response_final(ResponseFinal { rid: qid, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_final_default(), ext_tstamp: None, }); } @@ -2280,7 +2280,7 @@ pub(crate) fn route_send_response( rid: query.src_qid, wire_expr: key_expr.to_owned(), payload: body, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_default(), ext_tstamp: None, ext_respid, }); @@ -2337,7 +2337,7 @@ pub(crate) fn finalize_pending_query(query: Arc) { .clone() .send_response_final(ResponseFinal { rid: query.src_qid, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_final_default(), ext_tstamp: None, }); } diff --git a/zenoh/src/net/routing/resource.rs b/zenoh/src/net/routing/resource.rs index 557908c9fc..e26a9217f3 100644 --- a/zenoh/src/net/routing/resource.rs +++ b/zenoh/src/net/routing/resource.rs @@ -516,7 +516,7 @@ impl Resource { .local_mappings .insert(expr_id, nonwild_prefix.clone()); face.primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { diff --git a/zenoh/src/net/runtime/adminspace.rs b/zenoh/src/net/runtime/adminspace.rs index 304afd4491..23bb47d9b9 100644 --- a/zenoh/src/net/runtime/adminspace.rs +++ b/zenoh/src/net/runtime/adminspace.rs @@ -221,7 +221,7 @@ impl AdminSpace { zlock!(admin.primitives).replace(primitives.clone()); primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -235,7 +235,7 @@ impl AdminSpace { }); primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -342,7 +342,7 @@ impl Primitives for AdminSpace { ); primitives.send_response_final(ResponseFinal { rid: msg.id, - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::response_final_default(), ext_tstamp: None, }); return; @@ -355,7 +355,7 @@ impl Primitives for AdminSpace { log::error!("Unknown KeyExpr: {}", e); primitives.send_response_final(ResponseFinal { rid: msg.id, - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::response_final_default(), ext_tstamp: None, }); return; diff --git a/zenoh/src/net/tests/tables.rs b/zenoh/src/net/tests/tables.rs index 31d862c8bc..5dadf8d8a9 100644 --- a/zenoh/src/net/tests/tables.rs +++ b/zenoh/src/net/tests/tables.rs @@ -485,7 +485,7 @@ fn client_test() { &"test/client".into(), ); primitives0.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { @@ -507,7 +507,7 @@ fn client_test() { &WireExpr::from(11).with_suffix("/z1_pub1"), ); primitives0.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { @@ -529,7 +529,7 @@ fn client_test() { &"test/client".into(), ); primitives1.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { @@ -551,7 +551,7 @@ fn client_test() { &WireExpr::from(21).with_suffix("/z2_pub1"), ); primitives1.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { @@ -573,7 +573,7 @@ fn client_test() { &"test/client".into(), ); primitives2.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { diff --git a/zenoh/src/publication.rs b/zenoh/src/publication.rs index 85a47bc644..fa49f22ad8 100644 --- a/zenoh/src/publication.rs +++ b/zenoh/src/publication.rs @@ -431,7 +431,7 @@ impl SyncResolve for Publication<'_> { if publisher.destination != Locality::SessionLocal { primitives.send_push(Push { wire_expr: publisher.key_expr.to_wire(&publisher.session).to_owned(), - ext_qos: ext::QoSType::default(), // TODO + ext_qos: ext::QoSType::push_default(), // TODO // use publisher.priority // use publisher.congestion_control // need to check subscriptions to determine the right reliability value diff --git a/zenoh/src/queryable.rs b/zenoh/src/queryable.rs index eacebe35ae..ed0560d759 100644 --- a/zenoh/src/queryable.rs +++ b/zenoh/src/queryable.rs @@ -50,7 +50,7 @@ impl Drop for QueryInner { fn drop(&mut self) { self.primitives.send_response_final(ResponseFinal { rid: self.qid, - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_final_default(), ext_tstamp: None, }); } @@ -189,7 +189,7 @@ impl SyncResolve for ReplyBuilder<'_> { ext_unknown: vec![], payload, }), - ext_qos: response::ext::QoSType::default(), + ext_qos: response::ext::QoSType::response_default(), ext_tstamp: None, ext_respid: Some(response::ext::ResponderIdType { zid: self.query.inner.zid, diff --git a/zenoh/src/session.rs b/zenoh/src/session.rs index 5351041d71..744f21965f 100644 --- a/zenoh/src/session.rs +++ b/zenoh/src/session.rs @@ -889,7 +889,7 @@ impl Session { let primitives = state.primitives.as_ref().unwrap().clone(); drop(state); primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareKeyExpr(DeclareKeyExpr { @@ -1090,7 +1090,7 @@ impl Session { // }; primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -1149,7 +1149,7 @@ impl Session { let wire_expr = WireExpr::from(join_sub).to_owned(); drop(state); primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -1168,7 +1168,7 @@ impl Session { let primitives = state.primitives.as_ref().unwrap().clone(); drop(state); primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -1218,7 +1218,7 @@ impl Session { distance: 0, }; primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1246,7 +1246,7 @@ impl Session { distance: 0, }; primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1311,7 +1311,7 @@ impl Session { distance: 0, }; primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1330,7 +1330,7 @@ impl Session { distance: 0, }; primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareQueryable(DeclareQueryable { @@ -1346,7 +1346,7 @@ impl Session { // There are no more Queryables on the same KeyExpr. drop(state); primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::UndeclareQueryable(UndeclareQueryable { @@ -1382,7 +1382,7 @@ impl Session { let primitives = state.primitives.as_ref().unwrap().clone(); drop(state); primitives.send_declare(Declare { - ext_qos: declare::ext::QoSType::default(), + ext_qos: declare::ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: declare::ext::NodeIdType::default(), body: DeclareBody::DeclareSubscriber(DeclareSubscriber { @@ -1406,7 +1406,7 @@ impl Session { let primitives = state.primitives.as_ref().unwrap().clone(); drop(state); primitives.send_declare(Declare { - ext_qos: ext::QoSType::default(), + ext_qos: ext::QoSType::declare_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), body: DeclareBody::UndeclareSubscriber(UndeclareSubscriber { @@ -1545,7 +1545,7 @@ impl Session { primitives.send_request(Request { id: 0, // TODO wire_expr: key_expr.to_wire(self).to_owned(), - ext_qos: ext::QoSType::default(), // TODO + ext_qos: ext::QoSType::request_default(), ext_tstamp: None, ext_nodeid: ext::NodeIdType::default(), ext_target: request::ext::TargetType::default(), @@ -1639,7 +1639,7 @@ impl Session { primitives.send_request(Request { id: qid, wire_expr: wexpr.clone(), - ext_qos: request::ext::QoSType::default(), + ext_qos: request::ext::QoSType::request_default(), ext_tstamp: None, ext_nodeid: request::ext::NodeIdType::default(), ext_target: target,