From 6479afb7b2caa531cfb20cd69a21da29022605f3 Mon Sep 17 00:00:00 2001 From: Shaun Voigt Date: Fri, 27 Mar 2020 18:19:07 +1030 Subject: [PATCH] Enable OSPFv2 Adjacency Widget to work with FRR --- gui/widget.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/widget.tcl b/gui/widget.tcl index 1a8f6b7a..4e42556c 100644 --- a/gui/widget.tcl +++ b/gui/widget.tcl @@ -1972,7 +1972,7 @@ proc widget_adjacency_init {command} { array unset adjacency_cache * foreach node $node_list { ;# save router-id node pairs for later lookup if { [nodeType $node] != "router" } { continue } - if {[lsearch [getNodeServices $node true] "zebra"] < 0 && + if {[lsearch -regexp [getNodeServices $node true] "(FRR)?zebra"] < 0 && [lsearch [getNodeServices $node true] "OLSR"] < 0 && [lsearch [getNodeServices $node true] "OLSRv2"] < 0} { continue @@ -2041,7 +2041,7 @@ proc widget_adjacency_periodic { now } { foreach node $node_list { if { [nodeType $node] != "router" } { continue } if { [getNodeCanvas $node] != $curcanvas } { continue } - if {[lsearch [getNodeServices $node true] "zebra"] < 0} { + if {[lsearch -regexp [getNodeServices $node true] "(FRR)?zebra"] < 0} { continue }