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

fix --ipbase: fix ipAdd() and remove unused default from ipStr()

Browse Source
This commit is contained in:
Bob Lantz
2013-03-13 16:16:20 -07:00
parent bd558875f3
commit 8204a1b694
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/util.py
+5 -6
View File
@@ -242,9 +242,8 @@ def macColonHex( mac ):
def ipStr( ip ): def ipStr( ip ):
"""Generate IP address string from an unsigned int. """Generate IP address string from an unsigned int.
ip: unsigned int of form w << 24 | x << 16 | y << 8 | z ip: unsigned int of form w << 24 | x << 16 | y << 8 | z
returns: ip address string w.x.y.z, or 10.x.y.z if w==0""" returns: ip address string w.x.y.z"""
w = ( ip >> 24 ) & 0xff w = ( ip >> 24 ) & 0xff
w = 10 if w == 0 else w
x = ( ip >> 16 ) & 0xff x = ( ip >> 16 ) & 0xff
y = ( ip >> 8 ) & 0xff y = ( ip >> 8 ) & 0xff
z = ip & 0xff z = ip & 0xff
@@ -261,10 +260,10 @@ def ipAdd( i, prefixLen=8, ipBaseNum=0x0a000000 ):
prefixLen: optional IP prefix length prefixLen: optional IP prefix length
ipBaseNum: option base IP address as int ipBaseNum: option base IP address as int
returns IP address as string""" returns IP address as string"""
# Ugly but functional imax = 0xffffffff >> prefixLen
assert i < ( 1 << ( 32 - prefixLen ) ) assert i <= imax
mask = 0xffffffff ^ ( ( 1 << prefixLen ) - 1 ) mask = 0xffffffff ^ imax
ipnum = i + ( ipBaseNum & mask ) ipnum = ( ipBaseNum & mask ) + i
return ipStr( ipnum ) return ipStr( ipnum )
def ipParse( ip ): def ipParse( ip ):