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

fixed netParse bug that caused mininet crash when no ip prefix was specified

Browse Source
This commit is contained in:
Cody Burkard
2014-06-10 18:38:10 -07:00
parent 87b6021428
commit b3055067ac
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/util.py
+6
View File
@@ -281,6 +281,8 @@ def ipAdd( i, prefixLen=8, ipBaseNum=0x0a000000 ):
def ipParse( ip ): def ipParse( ip ):
"Parse an IP address and return an unsigned int." "Parse an IP address and return an unsigned int."
args = [ int( arg ) for arg in ip.split( '.' ) ] args = [ int( arg ) for arg in ip.split( '.' ) ]
while ( len(args) < 4 ):
args.append( 0 )
return ipNum( *args ) return ipNum( *args )
def netParse( ipstr ): def netParse( ipstr ):
@@ -290,6 +292,10 @@ def netParse( ipstr ):
if '/' in ipstr: if '/' in ipstr:
ip, pf = ipstr.split( '/' ) ip, pf = ipstr.split( '/' )
prefixLen = int( pf ) prefixLen = int( pf )
#if no prefix is specified, set the prefix to 24
else:
ip = ipstr
prefixLen = 24
return ipParse( ip ), prefixLen return ipParse( ip ), prefixLen
def checkInt( s ): def checkInt( s ):