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

Merge pull request #704 from mininet/devel/ipBase

Browse Source 
Updating Mininet to start with host IP request in ipBase
This commit is contained in:
lantz
2017-01-03 16:55:37 -08:00
committed by GitHub
parent e90a4a74cb 8c662d63bf
commit 3284b04f2b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/net.py
+2 -1
View File
@@ -144,7 +144,8 @@ class Mininet( object ):
self.intf = intf self.intf = intf
self.ipBase = ipBase self.ipBase = ipBase
self.ipBaseNum, self.prefixLen = netParse( self.ipBase ) self.ipBaseNum, self.prefixLen = netParse( self.ipBase )
self.nextIP = 1 # start for address allocation hostIP = ( 0xffffffff >> self.prefixLen ) & self.ipBaseNum
self.nextIP = hostIP if hostIP > 0 else 1 # start for address allocation
self.inNamespace = inNamespace self.inNamespace = inNamespace
self.xterms = xterms self.xterms = xterms
self.cleanup = cleanup self.cleanup = cleanup
mininet/util.py
+1 -1
View File
@@ -321,7 +321,7 @@ 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: while len(args) < 4:
args.append( 0 ) args.insert( len(args) - 1, 0 )
return ipNum( *args ) return ipNum( *args )
def netParse( ipstr ): def netParse( ipstr ):