added support for olsrv2 and olsr adjacency observer widgets requires nrlConsole.py to be in the path
This commit is contained in:
tgoff0
parent
e905648d68
commit
75b65730d1
1 changed files with 155 additions and 41 deletions
148
gui/widget.tcl
148
gui/widget.tcl
|
|
@ -1916,9 +1916,21 @@ proc get_router_id {node} {
|
|||
return [string range $line 11 end]
|
||||
}
|
||||
}
|
||||
if {[lsearch [getNodeServices $node true] "OLSR"] == 0 } {
|
||||
|
||||
set sock [lindex [getEmulPlugin $node] 2]
|
||||
set exec_num [newExecCallbackRequest adjacencyrouterid]
|
||||
set cmd "nrlConsole.py ${node}_olsr i"
|
||||
sendExecMessage $sock $node $cmd $exec_num 0x30
|
||||
return ""
|
||||
} elseif {[lsearch [getNodeServices $node true] "OLSRv2"] == 0 } {
|
||||
set sock [lindex [getEmulPlugin $node] 2]
|
||||
set exec_num [newExecCallbackRequest adjacencyrouterid]
|
||||
set cmd "nrlConsole.py ${node}_olsrv2 i"
|
||||
sendExecMessage $sock $node $cmd $exec_num 0x30
|
||||
return ""
|
||||
}
|
||||
if { $oper_mode != "exec" } { return }
|
||||
|
||||
# use exec message here for retrieving router ID
|
||||
set sock [lindex [getEmulPlugin $node] 2]
|
||||
set exec_num [newExecCallbackRequest adjacencyrouterid]
|
||||
|
|
@ -1934,7 +1946,7 @@ proc get_router_id {node} {
|
|||
# Adjacency widget de/initialization
|
||||
#
|
||||
proc widget_adjacency_init {command} {
|
||||
global enable_Adjacency enable_Adjacency_v2 enable_Adjacency_v3
|
||||
global enable_Adjacency enable_Adjacency_OSPFv2 enable_Adjacency_OSPFv3 enable_Adjacency_OLSR enable_Adjacency_OLSRv2
|
||||
global node_list adjacency_cache adjacency_config adjacency_lock
|
||||
global g_execRequests
|
||||
set c .c
|
||||
|
|
@ -1943,17 +1955,31 @@ proc widget_adjacency_init {command} {
|
|||
array set g_execRequests [list adjacency ""]
|
||||
|
||||
# Menu item selected on/off
|
||||
if { $command == "menu2" || $command == "menu3" } {
|
||||
if { $command == "menu2" || $command == "menu3" || $command == "menu4" || $command == "menu5" } {
|
||||
# set global enable flag for v2/v3 adjacency display
|
||||
set enable_Adjacency \
|
||||
[expr {$enable_Adjacency_v2 | $enable_Adjacency_v3}]
|
||||
[expr {$enable_Adjacency_OSPFv2 | $enable_Adjacency_OSPFv3 | $enable_Adjacency_OLSR | $enable_Adjacency_OLSRv2}]
|
||||
# toggle other OSPFv2/v3 menu items off
|
||||
if { $command == "menu2" && $enable_Adjacency_v2 } {
|
||||
set enable_Adjacency_v3 0
|
||||
if { $command == "menu2" && $enable_Adjacency_OSPFv2 } {
|
||||
set enable_Adjacency_OSPFv3 0
|
||||
set enable_Adjacency_OLSR 0
|
||||
set enable_Adjacency_OLSRv2 0
|
||||
set adjacency_config(proto) "ip ospf"
|
||||
} elseif { $command == "menu3" && $enable_Adjacency_v3 } {
|
||||
set enable_Adjacency_v2 0
|
||||
} elseif { $command == "menu3" && $enable_Adjacency_OSPFv3 } {
|
||||
set enable_Adjacency_OSPFv2 0
|
||||
set enable_Adjacency_OLSR 0
|
||||
set enable_Adjacency_OLSRv2 0
|
||||
set adjacency_config(proto) "ipv6 ospf6"
|
||||
} elseif { $command == "menu4" && $enable_Adjacency_OLSR } {
|
||||
set enable_Adjacency_OSPFv2 0
|
||||
set enable_Adjacency_OSPFv3 0
|
||||
set enable_Adjacency_OLSRv2 0
|
||||
set adjacency_config(proto) "OLSR_proto"
|
||||
} elseif { $command == "menu5" && $enable_Adjacency_OLSRv2 } {
|
||||
set enable_Adjacency_OSPFv2 0
|
||||
set enable_Adjacency_OSPFv3 0
|
||||
set enable_Adjacency_OLSR 0
|
||||
set adjacency_config(proto) "OLSRv2_proto"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1962,7 +1988,9 @@ 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 [getNodeServices $node true] "zebra"] < 0 &&
|
||||
[lsearch [getNodeServices $node true] "OLSR"] < 0 &&
|
||||
[lsearch [getNodeServices $node true] "OLSRv2"] < 0} {
|
||||
continue
|
||||
}
|
||||
set rtrid [get_router_id $node]
|
||||
|
|
@ -1975,8 +2003,10 @@ proc widget_adjacency_init {command} {
|
|||
# De-initialize
|
||||
if { !$enable_Adjacency || $command == "stop" } {
|
||||
set enable_Adjacency 0
|
||||
set enable_Adjacency_v2 0
|
||||
set enable_Adjacency_v3 0
|
||||
set enable_Adjacency_OSPFv2 0
|
||||
set enable_Adjacency_OSPFv3 0
|
||||
set enable_Adjacency_OLSR 0
|
||||
set enable_Adjacency_OLSRv2 0
|
||||
$c delete -withtags "adjline"
|
||||
after 200 { .c delete -withtags "adjline" }
|
||||
}
|
||||
|
|
@ -1992,6 +2022,37 @@ proc widget_adjacency_periodic { now } {
|
|||
|
||||
set proto $adjacency_config(proto)
|
||||
|
||||
if { $proto == "OLSR_proto" } {
|
||||
foreach node $node_list {
|
||||
if { [nodeType $node] != "router" } { continue }
|
||||
if { [getNodeCanvas $node] != $curcanvas } { continue }
|
||||
if {[lsearch [getNodeServices $node true] "OLSR"] < 0} {
|
||||
continue
|
||||
}
|
||||
if { $adjacency_lock == $node } { continue }
|
||||
# when using daemon, send Execute Message and draw line using
|
||||
# widget_adjacency_callback after the response has been received
|
||||
set sock [lindex [getEmulPlugin $node] 2]
|
||||
set exec_num [newExecCallbackRequest adjacency]
|
||||
set cmd "nrlConsole.py ${node}_olsr n"
|
||||
sendExecMessage $sock $node $cmd $exec_num 0x30
|
||||
}
|
||||
} elseif { $proto == "OLSRv2_proto" } {
|
||||
foreach node $node_list {
|
||||
if { [nodeType $node] != "router" } { continue }
|
||||
if { [getNodeCanvas $node] != $curcanvas } { continue }
|
||||
if {[lsearch [getNodeServices $node true] "OLSRv2"] < 0} {
|
||||
continue
|
||||
}
|
||||
if { $adjacency_lock == $node } { continue }
|
||||
# when using daemon, send Execute Message and draw line using
|
||||
# widget_adjacency_callback after the response has been received
|
||||
set sock [lindex [getEmulPlugin $node] 2]
|
||||
set exec_num [newExecCallbackRequest adjacency]
|
||||
set cmd "nrlConsole.py ${node}_olsrv2 n"
|
||||
sendExecMessage $sock $node $cmd $exec_num 0x30
|
||||
}
|
||||
} else {
|
||||
foreach node $node_list {
|
||||
if { [nodeType $node] != "router" } { continue }
|
||||
if { [getNodeCanvas $node] != $curcanvas } { continue }
|
||||
|
|
@ -2008,6 +2069,7 @@ proc widget_adjacency_periodic { now } {
|
|||
sendExecMessage $sock $node $cmd $exec_num 0x30
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Execute Message callback
|
||||
proc exec_adjacency_callback { node execnum cmd result status } {
|
||||
|
|
@ -2023,7 +2085,9 @@ proc exec_adjacency_callback { node execnum cmd result status } {
|
|||
|
||||
$c addtag adjdelete withtag "adjline && $node" ;# flag del all adjlines
|
||||
set adjs [getadj_from_neighbors $result $proto]
|
||||
|
||||
foreach adj $adjs {
|
||||
|
||||
set peer [lindex $adj 0]
|
||||
set line [$c find withtag "adjline && $node && $peer"]
|
||||
|
||||
|
|
@ -2065,6 +2129,13 @@ proc exec_adjacency_callback { node execnum cmd result status } {
|
|||
proc exec_adjacencyrouterid_callback { node execnum cmd result status } {
|
||||
global adjacency_cache
|
||||
|
||||
#check if olsr or olsrv2 are running
|
||||
if {[lsearch [getNodeServices $node true] "OLSR"] == 0 ||
|
||||
[lsearch [getNodeServices $node true] "OLSRv2"] == 0 } {
|
||||
set lines [split $result "\n"]
|
||||
set rtrid [lindex $lines 1]
|
||||
array set adjacency_cache [list $rtrid $node]
|
||||
} else {
|
||||
# match both OSPFv2 and OSPFv3 responses
|
||||
set rid [regexp -inline {Router[- ]ID[:]? [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} \
|
||||
$result]
|
||||
|
|
@ -2073,10 +2144,34 @@ proc exec_adjacencyrouterid_callback { node execnum cmd result status } {
|
|||
array set adjacency_cache [list $rtrid $node]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# helper to convert neighbor list into adjacencies list
|
||||
proc getadj_from_neighbors { raw_input proto } {
|
||||
set ret { }
|
||||
#OLSR conversions
|
||||
if { $proto == "OLSRv2_proto" || $proto == "OLSR_proto"} {
|
||||
foreach line [split $raw_input "\n"] {
|
||||
if { $line == "neighbors" } { continue }
|
||||
if { $line == "end-neighbors" } { continue }
|
||||
if { $line == "" } { continue }
|
||||
set fields [split $line " "]
|
||||
lassign $fields rtrid state metric mpr
|
||||
# convert to OSPFv3 to simplify coloring
|
||||
switch -exact -- "$state" {
|
||||
"SYM" { set state "Full" }
|
||||
"ASYM" { set state "Init" }
|
||||
"LOST" { set state "Down" }
|
||||
"MPR" { set state "Full" }
|
||||
"PENDING" { set state "Init" }
|
||||
"INVALID" { set state "Down" }
|
||||
}
|
||||
lappend ret [list $rtrid $state]
|
||||
}
|
||||
return $ret
|
||||
}
|
||||
#OSPF converstion
|
||||
|
||||
#Neighbor ID Pri DeadTime State/IfState Duration I/F[State]
|
||||
#10.0.0.2 1 00:00:06 Init/PointToPoint 00:00:00 eth0[PointToP
|
||||
#10.0.0.2 1 00:00:06 Twoway/PointToPoint 00:00:00 eth0[PointToP
|
||||
|
|
@ -2150,12 +2245,31 @@ proc widget_adjacency_init_submenu { m } {
|
|||
$m add cascade -label "Adjacency" -menu $m.adj
|
||||
set w "Adjacency"
|
||||
|
||||
foreach v [list 2 3] {
|
||||
global enable_${w}_v${v}
|
||||
set enable_${w}_v${v} 0
|
||||
$m.adj add checkbutton -label "OSPFv$v" -variable enable_${w}_v${v} \
|
||||
-command "[lindex $widgets($w) 1] menu$v"
|
||||
}
|
||||
# foreach v [list 2 3] {
|
||||
# global enable_${w}_v${v}
|
||||
# set enable_${w}_v${v} 0
|
||||
# $m.adj add checkbutton -label "OSPFv$v" -variable enable_${w}_v${v} \
|
||||
# -command "[lindex $widgets($w) 1] menu$v"
|
||||
# }
|
||||
global enable_Adjacency_OSPFv2
|
||||
set enable_Adjacency_OSPFv2 0
|
||||
$m.adj add checkbutton -label "OSPFv2" -variable enable_Adjacency_OSPFv2 \
|
||||
-command "[lindex $widgets(Adjacency) 1] menu2"
|
||||
|
||||
global enable_Adjacency_OSPFv3
|
||||
set enable_Adjacency_OSPFv3 0
|
||||
$m.adj add checkbutton -label "OSPFv3" -variable enable_Adjacency_OSPFv3 \
|
||||
-command "[lindex $widgets(Adjacency) 1] menu3"
|
||||
|
||||
global enable_Adjacency_OLSR
|
||||
set enable_Adjacency_OLSR 0
|
||||
$m.adj add checkbutton -label "OLSR" -variable enable_Adjacency_OLSR \
|
||||
-command "[lindex $widgets(Adjacency) 1] menu4"
|
||||
|
||||
global enable_Adjacency_OLSRv2
|
||||
set enable_Adjacency_OLSRv2 0
|
||||
$m.adj add checkbutton -label "OLSRv2" -variable enable_Adjacency_OLSRv2 \
|
||||
-command "[lindex $widgets(Adjacency) 1] menu5"
|
||||
}
|
||||
|
||||
# load the widgets.conf file when this file is loaded
|
||||
|
|
|
|||
Loading…
Reference in a new issue