replaces socket.bind with utils.try_bind

Author: Federico Fissore

linux/bridge/console.py

@@ -1,12 +1,12 @@
-
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, gethostname
 from select import select
+import utils
 
 class Console:
   def __init__(self, port=6571):
     server = socket(AF_INET, SOCK_STREAM)
     server.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
-    server.bind(('127.0.0.1', port))
+    utils.try_bind(server, '127.0.0.1', port)
     server.listen(1)  # No connection backlog
     server.setblocking(0)
     self.server = server
@@ -118,7 +118,7 @@ def init(command_processor):
   command_processor.register('p', READ_Command())
   command_processor.register('a', CONNECTED_Command())
   command_processor.register_runner(console)
-  
+
 def test():
   while True:
     console.process(1)

linux/bridge/sockets.py

@@ -1,6 +1,7 @@
-
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, gethostname
 from select import select
+import utils
+
 
 class SocketClient:
   def __init__(self, sock):
@@ -69,14 +70,14 @@ def run(self):
     for id in self.clients:
       self.clients[id].run()
 
-  def listen(self, addr, port):
+  def listen(self, address, port):
     if not self.server is None:
       self.server.close()
       self.server = None
     try:
       server = socket(AF_INET, SOCK_STREAM)
       server.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
-      server.bind((addr, port))
+      utils.try_bind(server, address, port)
       server.listen(1) # No connection backlog
       server.setblocking(0)
       self.server = server

linux/bridge/tcp.py

@@ -2,7 +2,9 @@
 from socket import socket, AF_INET, SOCK_STREAM, SOL_SOCKET, SO_REUSEADDR, gethostname
 from select import select
 from collections import deque
-import json, time
+import json
+import utils
+
 
 class TCPClient:
   def __init__(self, address, port):
@@ -54,7 +56,7 @@ class TCPServer:
   def __init__(self, address, port):
     server = socket(AF_INET, SOCK_STREAM)
     server.setsockopt(SOL_SOCKET, SO_REUSEADDR, 1)
-    self.try_bind(server, address, port, 30)
+    utils.try_bind(server, address, port)
     server.listen(5)
     server.setblocking(0)
     self.server = server
@@ -63,16 +65,6 @@ def __init__(self, address, port):
     self.clients_recvbuffer = { }
     self.sockets = [ server ]
 
-  def try_bind(self, socket, address, port, timeout=10):
-    start_time = time.time()
-    while (time.time() - start_time) < timeout:
-      try:
-        return socket.bind((address, port))
-      except:
-        time.sleep(1)
-    # try one last time, just to throw up an exception...
-    return socket.bind((address, port))
-    
   def run(self):
     rd, wr, err = select(self.sockets, [], self.sockets, 0)
 

linux/bridge/utils.py

@@ -0,0 +1,12 @@
+import time
+
+
+def try_bind(socket, address, port, timeout=30):
+    start_time = time.time()
+    while (time.time() - start_time) < timeout:
+        try:
+            return socket.bind((address, port))
+        except:
+            time.sleep(1)
+            # try one last time, just to throw up an exception...
+    return socket.bind((address, port))