From f0812e80dd87b18a1944ae0593a316c591c2c51b Mon Sep 17 00:00:00 2001
From: OlivierHecart <olivier.hecart@adlinktech.com>
Date: Tue, 14 Nov 2023 13:40:04 +0100
Subject: [PATCH] Propagate queryables prior to subscriber/tokens on transport
 establishment (#588)

---
 zenoh/src/net/routing/router.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/zenoh/src/net/routing/router.rs b/zenoh/src/net/routing/router.rs
index dbf687ba79..54c83424c8 100644
--- a/zenoh/src/net/routing/router.rs
+++ b/zenoh/src/net/routing/router.rs
@@ -282,8 +282,8 @@ impl Tables {
             .clone();
         log::debug!("New {}", newface);
 
-        pubsub_new_face(self, &mut newface);
         queries_new_face(self, &mut newface);
+        pubsub_new_face(self, &mut newface);
 
         Arc::downgrade(&newface)
     }
@@ -314,8 +314,8 @@ impl Tables {
             .clone();
         log::debug!("New {}", newface);
 
-        pubsub_new_face(self, &mut newface);
         queries_new_face(self, &mut newface);
+        pubsub_new_face(self, &mut newface);
 
         Arc::downgrade(&newface)
     }
@@ -360,8 +360,8 @@ impl Tables {
                 };
 
                 log::trace!("Compute routes");
-                pubsub_tree_change(&mut tables, &new_childs, net_type);
                 queries_tree_change(&mut tables, &new_childs, net_type);
+                pubsub_tree_change(&mut tables, &new_childs, net_type);
 
                 log::trace!("Computations completed");
                 match net_type {
@@ -736,12 +736,12 @@ impl TransportPeerEventHandler for LinkStateInterceptor {
                                         .link_states(list.link_states, zid)
                                         .removed_nodes
                                     {
-                                        pubsub_remove_node(
+                                        queries_remove_node(
                                             &mut tables,
                                             &removed_node.zid,
                                             WhatAmI::Router,
                                         );
-                                        queries_remove_node(
+                                        pubsub_remove_node(
                                             &mut tables,
                                             &removed_node.zid,
                                             WhatAmI::Router,
@@ -792,12 +792,12 @@ impl TransportPeerEventHandler for LinkStateInterceptor {
                                             );
                                         } else {
                                             for (_, updated_node) in changes.updated_nodes {
-                                                pubsub_linkstate_change(
+                                                queries_linkstate_change(
                                                     &mut tables,
                                                     &updated_node.zid,
                                                     &updated_node.links,
                                                 );
-                                                queries_linkstate_change(
+                                                pubsub_linkstate_change(
                                                     &mut tables,
                                                     &updated_node.zid,
                                                     &updated_node.links,
@@ -836,8 +836,8 @@ impl TransportPeerEventHandler for LinkStateInterceptor {
                         for (_, removed_node) in
                             tables.routers_net.as_mut().unwrap().remove_link(&zid)
                         {
-                            pubsub_remove_node(&mut tables, &removed_node.zid, WhatAmI::Router);
                             queries_remove_node(&mut tables, &removed_node.zid, WhatAmI::Router);
+                            pubsub_remove_node(&mut tables, &removed_node.zid, WhatAmI::Router);
                         }
 
                         if tables.full_net(WhatAmI::Peer) {
@@ -856,8 +856,8 @@ impl TransportPeerEventHandler for LinkStateInterceptor {
                             for (_, removed_node) in
                                 tables.peers_net.as_mut().unwrap().remove_link(&zid)
                             {
-                                pubsub_remove_node(&mut tables, &removed_node.zid, WhatAmI::Peer);
                                 queries_remove_node(&mut tables, &removed_node.zid, WhatAmI::Peer);
+                                pubsub_remove_node(&mut tables, &removed_node.zid, WhatAmI::Peer);
                             }
 
                             if tables.whatami == WhatAmI::Router {