From 8c662d63bf0266c295e7d808753ef00059b449d2 Mon Sep 17 00:00:00 2001 From: Brian O'Connor Date: Tue, 3 Jan 2017 15:11:38 -0800 Subject: [PATCH] Updating Mininet to start with host IP request in ipBase --- mininet/net.py | 3 ++- mininet/util.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mininet/net.py b/mininet/net.py index 8acba20..df62c82 100755 --- a/mininet/net.py +++ b/mininet/net.py @@ -144,7 +144,8 @@ class Mininet( object ): self.intf = intf self.ipBase = 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.xterms = xterms self.cleanup = cleanup diff --git a/mininet/util.py b/mininet/util.py index c44627a..8140d70 100644 --- a/mininet/util.py +++ b/mininet/util.py @@ -321,7 +321,7 @@ def ipParse( ip ): "Parse an IP address and return an unsigned int." args = [ int( arg ) for arg in ip.split( '.' ) ] while len(args) < 4: - args.append( 0 ) + args.insert( len(args) - 1, 0 ) return ipNum( *args ) def netParse( ipstr ):