lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #264 from adferguson/tc-no_opt-fix

Browse Source 
don't crash when link is TCLink but without options
This commit is contained in:
Bob
2014-01-24 12:43:50 -08:00
parent b357a212dd 284547080c
commit 06b99c8ef2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/node.py
+4 -1
View File
@@ -847,10 +847,13 @@ class UserSwitch( Switch ):
minspeed = ifspeed * 0.001 minspeed = ifspeed * 0.001
res = intf.config( **intf.params ) res = intf.config( **intf.params )
parent = res['parent']
if res is None: # link may not have TC parameters
return
# Re-add qdisc, root, and default classes user switch created, but # Re-add qdisc, root, and default classes user switch created, but
# with new parent, as setup by Mininet's TCIntf # with new parent, as setup by Mininet's TCIntf
parent = res['parent']
intf.tc( "%s qdisc add dev %s " + parent + intf.tc( "%s qdisc add dev %s " + parent +
" handle 1: htb default 0xfffe" ) " handle 1: htb default 0xfffe" )
intf.tc( "%s class add dev %s classid 1:0xffff parent 1: htb rate " intf.tc( "%s class add dev %s classid 1:0xffff parent 1: htb rate "