From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Tue, 19 Jul 2011 13:20:44 +0000 (+0200)
Subject: Always kill tcpdumps, even on errors
X-Git-Tag: nepi-3.0.0~363
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bffc829dcfa15d84330e1938726739d6902ecbeb;p=nepi.git

Always kill tcpdumps, even on errors
---

diff --git a/src/nepi/testbeds/planetlab/scripts/tun_connect.py b/src/nepi/testbeds/planetlab/scripts/tun_connect.py
index a23a3a88..8d2802b0 100644
--- a/src/nepi/testbeds/planetlab/scripts/tun_connect.py
+++ b/src/nepi/testbeds/planetlab/scripts/tun_connect.py
@@ -523,9 +523,6 @@ try:
 
     tun_fwd(tun, remote)
 
-    if tcpdump:
-        os.kill(tcpdump.pid, signal.SIGTERM)
-        tcpdump.wait()
 finally:
     try:
         print >>sys.stderr, "Shutting down..."
@@ -534,6 +531,14 @@ finally:
         pass
     
     # tidy shutdown in every case - swallow exceptions
+
+    try:
+        if tcpdump:
+            os.kill(tcpdump.pid, signal.SIGTERM)
+            tcpdump.wait()
+    except:
+        pass
+
     try:
         modeinfo['stop'](tun_path, tun_name)
     except: