From 0a9358c9fc314725f8ce62a86f4d9c509d056b44 Mon Sep 17 00:00:00 2001
From: Brandon Heller <brandonh@stanford.edu>
Date: Wed, 18 Aug 2010 00:29:15 -0700
Subject: [PATCH] Add option to turn off passive listening port

---
 bin/mn         | 6 +++++-
 mininet/net.py | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/mn b/bin/mn
index 510af1a..e1bd175 100755
--- a/bin/mn
+++ b/bin/mn
@@ -179,6 +179,8 @@ class MininetRunner( object ):
         opts.add_option( '--listenport', type='int', default=6634,
                         help='[base port for passive switch listening'
                         ' controller]' )
+        opts.add_option( '--nolistenport', action='store_true',
+                        default=False, help="don't use passive listening port")
         opts.add_option( '--pre', type='string', default=None,
                         help='[CLI script to run before tests]' )
         opts.add_option( '--post', type='string', default=None,
@@ -225,7 +227,9 @@ class MininetRunner( object ):
         xterms = self.options.xterms
         mac = self.options.mac
         arp = self.options.arp
-        listenPort = self.options.listenport
+        listenPort = None
+        if not self.options.nolistenport:
+            listenPort = self.options.listenport
         mn = Mininet( topo, switch, host, controller, controllerParams,
                      inNamespace=inNamespace,
                      xterms=xterms, autoSetMacs=mac,
diff --git a/mininet/net.py b/mininet/net.py
index d343207..25623dc 100755
--- a/mininet/net.py
+++ b/mininet/net.py
@@ -174,7 +174,7 @@ class Mininet( object ):
             sw = self.switch( name, listenPort=self.listenPort,
                 defaultMAC=mac, defaultIP=ip, dp=self.dps,
                 inNamespace=self.inNamespace )
-        if not self.inNamespace:
+        if not self.inNamespace and self.listenPort:
             self.listenPort += 1
         self.dps += 1
         self.switches.append( sw )