Fix router panic when configured with linkstate peer routing mode (#562…

…) (#595)
eclipse-zenoh · Nov 20, 2023 · 1daaaf5 · 1daaaf5
1 parent d2399ca
commit 1daaaf5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/zenoh/src/net/routing/pubsub.rs b/zenoh/src/net/routing/pubsub.rs
@@ -1421,7 +1421,10 @@ pub(super) fn compute_data_routes_(tables: &Tables, res: &Arc<Resource>) -> Data
                 compute_data_route(tables, &mut expr, Some(idx.index()), WhatAmI::Router);
         }
 
-        routes.peer_data_route = Some(compute_data_route(tables, &mut expr, None, WhatAmI::Peer));
+        if !tables.full_net(WhatAmI::Peer) {
+            routes.peer_data_route =
+                Some(compute_data_route(tables, &mut expr, None, WhatAmI::Peer));
+        }
     }
     if (tables.whatami == WhatAmI::Router || tables.whatami == WhatAmI::Peer)
         && tables.full_net(WhatAmI::Peer)
@@ -1479,8 +1482,10 @@ pub(crate) fn compute_data_routes(tables: &mut Tables, res: &mut Arc<Resource>)
                     compute_data_route(tables, &mut expr, Some(idx.index()), WhatAmI::Router);
             }
 
-            res_mut.context_mut().peer_data_route =
-                Some(compute_data_route(tables, &mut expr, None, WhatAmI::Peer));
+            if !tables.full_net(WhatAmI::Peer) {
+                res_mut.context_mut().peer_data_route =
+                    Some(compute_data_route(tables, &mut expr, None, WhatAmI::Peer));
+            }
         }
         if (tables.whatami == WhatAmI::Router || tables.whatami == WhatAmI::Peer)
             && tables.full_net(WhatAmI::Peer)

diff --git a/zenoh/src/net/routing/queries.rs b/zenoh/src/net/routing/queries.rs
@@ -1529,7 +1529,10 @@ pub(super) fn compute_query_routes_(tables: &Tables, res: &Arc<Resource>) -> Que
                 compute_query_route(tables, &mut expr, Some(idx.index()), WhatAmI::Router);
         }
 
-        routes.peer_query_route = Some(compute_query_route(tables, &mut expr, None, WhatAmI::Peer));
+        if !tables.full_net(WhatAmI::Peer) {
+            routes.peer_query_route =
+                Some(compute_query_route(tables, &mut expr, None, WhatAmI::Peer));
+        }
     }
     if (tables.whatami == WhatAmI::Router || tables.whatami == WhatAmI::Peer)
         && tables.full_net(WhatAmI::Peer)
@@ -1595,8 +1598,10 @@ pub(crate) fn compute_query_routes(tables: &mut Tables, res: &mut Arc<Resource>)
                     compute_query_route(tables, &mut expr, Some(idx.index()), WhatAmI::Router);
             }
 
-            res_mut.context_mut().peer_query_route =
-                Some(compute_query_route(tables, &mut expr, None, WhatAmI::Peer));
+            if !tables.full_net(WhatAmI::Peer) {
+                res_mut.context_mut().peer_query_route =
+                    Some(compute_query_route(tables, &mut expr, None, WhatAmI::Peer));
+            }
         }
         if (tables.whatami == WhatAmI::Router || tables.whatami == WhatAmI::Peer)
             && tables.full_net(WhatAmI::Peer)