From bffc829dcfa15d84330e1938726739d6902ecbeb Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Tue, 19 Jul 2011 15:20:44 +0200 Subject: [PATCH] Always kill tcpdumps, even on errors --- src/nepi/testbeds/planetlab/scripts/tun_connect.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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: -- 2.47.0