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

initial pass at removing bsd and code related to using bsd nodes

Browse source
This commit is contained in:
Blake J. Harnden 2018-03-07 12:54:19 -08:00
parent 4858151d7c
commit bc1e3e70c9
62 changed files with 720 additions and 18008 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gui/mobility.tcl
View file

@ -6,7 +6,7 @@
# shows the Two-node Tool
proc popupTwoNodeDialog { } {
global twonodePID lastTwoNodeHop g_twoNodeSelect g_twoNodeSelectCallback
markerOptions off
set wi .twonodetool
catch {destroy $wi}
@ -61,7 +61,7 @@ proc popupTwoNodeDialog { } {
# buttons on the bottom
frame $wi.butt -borderwidth 6
button $wi.butt.run -text "Run" -command "runTwoNodeCommand $wi"
button $wi.butt.run -text "Run" -command "runTwoNodeCommand $wi"
button $wi.butt.cancel -text "Clear" -command "clearTwoNodeDialog $wi 0"
button $wi.butt.close -text "Close" -command "clearTwoNodeDialog $wi 1"
pack $wi.butt.run $wi.butt.cancel $wi.butt.close -side left
@ -83,11 +83,7 @@ proc clearTwoNodeDialog { wi done} {
set emul [getEmulPlugin $node]
set emulation_type [lindex $emul 1]
catch {
if { $os == "FreeBSD" } {
exec sudo kill -9 $twonodePID 2> /dev/null
} else {
exec kill -9 $twonodePID 2> /dev/null
}
exec kill -9 $twonodePID 2> /dev/null
}
set twonodePID 0
}
@ -318,11 +314,11 @@ proc drawTwoNodeLine { node line type } {
# search for hops matching this nexthop address
set hops [findNextHops $lastTwoNodeHop $nexthop ""]
if {[llength $hops] == 0} {
puts "Couldn't highlight next hop: $nexthop";
puts "Couldn't highlight next hop: $nexthop";
return
}
# highlight the path
# highlight the path
set a $lastTwoNodeHop
foreach b $hops {
highlightLink $a $b
@ -372,7 +368,7 @@ proc nodeHasAddr { node addr } {
if { $nodeaddr == $addr } {
return 1
}
}
}
return 0
}
@ -429,7 +425,7 @@ proc clearLinkHighlights { } {
# Boeing: shows the Two-node Tool
proc popupRunDialog { } {
global node_list activetool systype
set activetool select
markerOptions off
set wi .runtool
@ -489,7 +485,7 @@ proc popupRunDialog { } {
# buttons on the bottom
frame $wi.butt -borderwidth 6
button $wi.butt.run -text "Run" -command "runToolCommand $wi \"\""
button $wi.butt.run -text "Run" -command "runToolCommand $wi \"\""
button $wi.butt.close -text "Close" -command "destroy $wi"
pack $wi.butt.run $wi.butt.close -side left
pack $wi.butt -side bottom
@ -504,7 +500,7 @@ proc runToolCommand { wi node } {
if { ![winfo exists $wi] } { return }; # user has closed window
# start running commands
if { $node == "" } {
if { $node == "" } {
$wi.results.text delete 1.0 end
set selected [$wi.n.nodes.nodes curselection]
if { [llength $selected] == 0 } {
@ -518,8 +514,8 @@ proc runToolCommand { wi node } {
set next ""
set getnext 0
foreach i [$wi.n.nodes.nodes curselection] { ;# find the next node
set n [lindex $node_list $i]
foreach i [$wi.n.nodes.nodes curselection] { ;# find the next node
set n [lindex $node_list $i]
if {$n == $node } {
set getnext 1
} elseif { $getnext == 1 } {
@ -553,7 +549,7 @@ proc runToolCommand { wi node } {
# callback after receiving exec message response
proc exec_runtool_callback { node execnum cmd result status } {
set wi .runtool
if { ![winfo exists $wi] } { return }; # user has closed window
$wi.results.text insert end "> $node > $cmd:\n"