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

fix broken Throughput Widget and Wireshark for node numbers above 10

Browse source 
this also fixes the Throughput Widget results when multiple sessions are running
This commit is contained in:
Jeff Ahrenholz 2017-03-31 09:55:26 -07:00
parent de923091b3
commit 724534e3ac
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gui/editor.tcl
View file

@ -1483,10 +1483,11 @@ proc addInterfaceCommand { node parentmenu txt cmd state isnodecmd } {
if { $isnodecmd } { ;# run command in a node if { $isnodecmd } { ;# run command in a node
set icmd "spawnShell $node \"$cmd $ifc\"" set icmd "spawnShell $node \"$cmd $ifc\""
} else { ;# exec a command directly } else { ;# exec a command directly
set nodenum [string range $node 1 end] set node_num [string range $node 1 end]
set hex [format "%x" $node_num]
set ifnum [string range $ifc 3 end] set ifnum [string range $ifc 3 end]
set localifc veth$nodenum.$ifnum.$ssid set ifname "veth$hex\\.$ifnum\\.$ssid"
set icmd "exec $cmd $localifc &" set icmd "exec $cmd $ifname &"
} }
$childmenu add command -label "$ifc$addr" -state $state -command $icmd $childmenu add command -label "$ifc$addr" -state $state -command $icmd
} }

10
gui/widget.tcl
View file

@ -919,6 +919,7 @@ proc getstats_bytes_netgraph { raw_input } {
} }
proc getstats_link_ifname { link } { proc getstats_link_ifname { link } {
global g_current_session
set lnode1 [lindex [linkPeers $link] 0] set lnode1 [lindex [linkPeers $link] 0]
set lnode2 [lindex [linkPeers $link] 1] set lnode2 [lindex [linkPeers $link] 1]
@ -932,13 +933,10 @@ proc getstats_link_ifname { link } {
set ifname [ifcByPeer $lnode2 $lnode1] set ifname [ifcByPeer $lnode2 $lnode1]
} }
if { $node_num < 0 } { return "" } if { $node_num < 0 } { return "" }
set node_num [format %x $node_num] set ssid [shortSessionID $g_current_session]
# TODO: need to determine session number used by daemon
# instead this uses a '*' character for a regexp match against
# the interfaces in /proc/net/dev
set hex [format "%x" $node_num] set hex [format "%x" $node_num]
set ifname "veth$hex\\.[string range $ifname 3 end]\\.*" set ifnum [string range $ifname 3 end]
set ifname "veth$hex.$ifnum.$ssid"
return $ifname return $ifname
} }