From bf52d80b650ae4f420005c547ae7e1fced39f673 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Tue, 9 Aug 2011 19:58:58 +0200 Subject: [PATCH] Do not stay alive indefinitely, PL cleans up itself, but only IF tun_connect eventually dies. --- src/nepi/testbeds/planetlab/scripts/tun_connect.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nepi/testbeds/planetlab/scripts/tun_connect.py b/src/nepi/testbeds/planetlab/scripts/tun_connect.py index 84934aeb..98fc3112 100644 --- a/src/nepi/testbeds/planetlab/scripts/tun_connect.py +++ b/src/nepi/testbeds/planetlab/scripts/tun_connect.py @@ -393,7 +393,12 @@ def pl_vif_stop(tun_path, tun_name): out.append(stdout.read()) stdout.close() - while True: + if options.mode.startswith('pl-gre'): + lim = 120 + else: + lim = 2 + + for i in xrange(lim): ifaces = set(map(str.strip,os.popen("ip a | grep -o '%s'" % (tun_name,)).read().strip().split('\n'))) if tun_name in ifaces: time.sleep(1) -- 2.47.0