diff --git a/mininet/link.py b/mininet/link.py index 2594a17..3930ead 100644 --- a/mininet/link.py +++ b/mininet/link.py @@ -297,7 +297,7 @@ class TCIntf( Intf ): ( [ '%s delay' % delay ] if delay is not None else [] ) + ( [ '%s jitter' % jitter ] if jitter is not None else [] ) + ( ['%d%% loss' % loss ] if loss is not None else [] ) + - ( [ 'ECN' ] if enable_ecn else [ 'RED' ] + ( [ 'ECN' ] if enable_ecn else [ 'RED' ] if enable_red else [] ) ) info( '(' + ' '.join( stuff ) + ') ' ) diff --git a/mininet/util.py b/mininet/util.py index 6418f52..fedea1a 100644 --- a/mininet/util.py +++ b/mininet/util.py @@ -252,7 +252,7 @@ def ipStr( ip ): def ipNum( w, x, y, z ): """Generate unsigned int from components of IP address returns: w << 24 | x << 16 | y << 8 | z""" - return ( w << 24 ) | ( x << 16 ) | ( y << 8 ) | z + return ( w << 24 ) | ( x << 16 ) | ( y << 8 ) | z def ipAdd( i, prefixLen=8, ipBaseNum=0x0a000000 ): """Return IP address string from ints