sanitizing tun_fwd in tunchannel.py

diff --git a/src/nepi/testbeds/planetlab/application.py b/src/nepi/testbeds/planetlab/application.py
index 450d267..e198a5f 100644 (file)
--- a/src/nepi/testbeds/planetlab/application.py
+++ b/src/nepi/testbeds/planetlab/application.py
@@ -897,9 +897,7 @@ class NS3Dependency(Dependency):
     def __init__(self, api = None):
         super(NS3Dependency, self).__init__(api)
         
-        self.depends = 'bzr'
-        
-        self.buildDepends = 'make waf gcc gcc-c++ gccxml unzip'
+        self.buildDepends = 'make waf gcc gcc-c++ gccxml unzip bzr'
         
         # We have to download the sources, untar, build...
         pygccxml_source_url = "http://leaseweb.dl.sourceforge.net/project/pygccxml/pygccxml/pygccxml-1.0/pygccxml-1.0.0.zip"

diff --git a/src/nepi/util/tunchannel.py b/src/nepi/util/tunchannel.py
index 5e2e3ca..78176d6 100644 (file)
--- a/src/nepi/util/tunchannel.py
+++ b/src/nepi/util/tunchannel.py
@@ -351,7 +351,7 @@ def tun_fwd(tun, remote, with_pi, ether_mode, cipher_key, udp, TERMINATE, SUSPEN
     while not TERMINATE:
         # The SUSPEND flag has been set. This means we need to wait on
         # the SUSPEND condition until it is released.
-        while SUSPEND:
+        while SUSPEND and not TERMINATE:
             time.sleep(0.5)
 
         wset = []