afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #414 from smvoigt/coreemu#413

Browse source 
Enable OSPFv2 Adjacency Widget to work with FRR
This commit is contained in:
bharnden 2020-03-27 10:14:04 -07:00 • committed by GitHub
commit 484d66191d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gui/widget.tcl
View file

@ -1972,7 +1972,7 @@ proc widget_adjacency_init {command} {
array unset adjacency_cache * array unset adjacency_cache *
foreach node $node_list { ;# save router-id node pairs for later lookup foreach node $node_list { ;# save router-id node pairs for later lookup
if { [nodeType $node] != "router" } { continue } 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] "OLSR"] < 0 &&
[lsearch [getNodeServices $node true] "OLSRv2"] < 0} { [lsearch [getNodeServices $node true] "OLSRv2"] < 0} {
continue continue
@ -2041,7 +2041,7 @@ proc widget_adjacency_periodic { now } {
foreach node $node_list { foreach node $node_list {
if { [nodeType $node] != "router" } { continue } if { [nodeType $node] != "router" } { continue }
if { [getNodeCanvas $node] != $curcanvas } { continue } if { [getNodeCanvas $node] != $curcanvas } { continue }
if {[lsearch [getNodeServices $node true] "zebra"] < 0} { if {[lsearch -regexp [getNodeServices $node true] "(FRR)?zebra"] < 0} {
continue continue
} }