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

don't crash when link is TCLink but without options
2014-01-24 12:43:50 -08:00
parent b357a212dd 284547080c
commit 06b99c8ef2
1 changed files with 4 additions and 1 deletions
@@ -847,10 +847,13 @@ class UserSwitch( Switch ):
            minspeed = ifspeed * 0.001

            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
            # with new parent, as setup by Mininet's TCIntf
+            parent = res['parent']
            intf.tc( "%s qdisc add dev %s " + parent +
                     " handle 1: htb default 0xfffe" )
            intf.tc( "%s class add dev %s classid 1:0xffff parent 1: htb rate "