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

fixed bug with lsearch for display for olsr

Browse source
This commit is contained in:
tgoff0 2015-05-22 00:54:59 +00:00
parent 75b65730d1
commit f3c9bcbcc4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gui/widget.tcl
View file

@ -1916,14 +1916,14 @@ proc get_router_id {node} {
return [string range $line 11 end] return [string range $line 11 end]
} }
} }
if {[lsearch [getNodeServices $node true] "OLSR"] == 0 } { if {[lsearch [getNodeServices $node true] "OLSR"] != -1 } {
set sock [lindex [getEmulPlugin $node] 2] set sock [lindex [getEmulPlugin $node] 2]
set exec_num [newExecCallbackRequest adjacencyrouterid] set exec_num [newExecCallbackRequest adjacencyrouterid]
set cmd "nrlConsole.py ${node}_olsr i" set cmd "nrlConsole.py ${node}_olsr i"
sendExecMessage $sock $node $cmd $exec_num 0x30 sendExecMessage $sock $node $cmd $exec_num 0x30
return "" return ""
} elseif {[lsearch [getNodeServices $node true] "OLSRv2"] == 0 } { } elseif {[lsearch [getNodeServices $node true] "OLSRv2"] != -1 } {
set sock [lindex [getEmulPlugin $node] 2] set sock [lindex [getEmulPlugin $node] 2]
set exec_num [newExecCallbackRequest adjacencyrouterid] set exec_num [newExecCallbackRequest adjacencyrouterid]
set cmd "nrlConsole.py ${node}_olsrv2 i" set cmd "nrlConsole.py ${node}_olsrv2 i"
@ -2021,7 +2021,6 @@ proc widget_adjacency_periodic { now } {
set changed 0 set changed 0
set proto $adjacency_config(proto) set proto $adjacency_config(proto)
if { $proto == "OLSR_proto" } { if { $proto == "OLSR_proto" } {
foreach node $node_list { foreach node $node_list {
if { [nodeType $node] != "router" } { continue } if { [nodeType $node] != "router" } { continue }
@ -2130,12 +2129,13 @@ proc exec_adjacencyrouterid_callback { node execnum cmd result status } {
global adjacency_cache global adjacency_cache
#check if olsr or olsrv2 are running #check if olsr or olsrv2 are running
if {[lsearch [getNodeServices $node true] "OLSR"] == 0 || if {[lsearch [getNodeServices $node true] "OLSR"] != -1 ||
[lsearch [getNodeServices $node true] "OLSRv2"] == 0 } { [lsearch [getNodeServices $node true] "OLSRv2"] != -1 } {
set lines [split $result "\n"] set lines [split $result "\n"]
set rtrid [lindex $lines 1] set rtrid [lindex $lines 1]
array set adjacency_cache [list $rtrid $node] array set adjacency_cache [list $rtrid $node]
} else { } else {
puts "matches OSPFv2"
# match both OSPFv2 and OSPFv3 responses # match both OSPFv2 and OSPFv3 responses
set rid [regexp -inline {Router[- ]ID[:]? [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} \ set rid [regexp -inline {Router[- ]ID[:]? [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} \
$result] $result]