Enable OSPFv2 Adjacency Widget to work with FRR

This commit is contained in:
Shaun Voigt 2020-03-27 18:19:07 +10:30
parent 3be162b0b0
commit 6479afb7b2

View file

@ -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
}