From 9f7924c8b0b9f3aad34ed0e2f7da779521d555b2 Mon Sep 17 00:00:00 2001 From: Claudio-Daniel Freire Date: Tue, 10 May 2011 10:54:41 +0200 Subject: [PATCH] Try connecting to the FD-passing unix socket twice - to alleviate synchronization issues --- src/nepi/testbeds/planetlab/scripts/tun_connect.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/nepi/testbeds/planetlab/scripts/tun_connect.py b/src/nepi/testbeds/planetlab/scripts/tun_connect.py index 59f9eb23..9918fc31 100644 --- a/src/nepi/testbeds/planetlab/scripts/tun_connect.py +++ b/src/nepi/testbeds/planetlab/scripts/tun_connect.py @@ -549,13 +549,19 @@ try: import passfd sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - sock.connect(options.pass_fd) + try: + sock.connect(options.pass_fd) + except socket.error: + # wait a while, retry + time.sleep(1) + sock.connect(options.pass_fd) passfd.sendfd(sock, tun.fileno(), '0') # just wait forever def tun_fwd(tun, remote): while True: time.sleep(1) + remote = None elif options.udp: # connect to remote endpoint if remaining_args and not remaining_args[0].startswith('-'): -- 2.47.0