Fix proxy and argparse

Author: AMEST

src/main.py

@@ -17,9 +17,7 @@
 logging.getLogger("docker").setLevel(logging.INFO)
 
 def getDockerHostFromContext():
-    current_context_name_cmd = subprocess.run(["docker", "context", "show"], capture_output=True)
-    current_context_name = current_context_name_cmd.stdout.decode().replace("\n", "")
-    current_context_cmd = subprocess.run(["docker", "context", "inspect", current_context_name], capture_output=True)
+    current_context_cmd = subprocess.run(["docker", "context", "inspect"], capture_output=True)
     current_context_json = json.loads(current_context_cmd.stdout.decode())
     return current_context_json[0]["Endpoints"]["docker"]["Host"]
 
@@ -70,7 +68,7 @@ def mainLoop(docker_host, listen_system_ports):
 if __name__ == "__main__":
     logging.info('Starting docker remote proxy!')
     parser = argparse.ArgumentParser(description='Remote docker context proxy')
-    parser.add_argument('--listen-system-ports', action=argparse.BooleanOptionalAction, default=False, help='Listen and Proxy system ports example: 22, 80, 443 etc.!')
+    parser.add_argument('--listen-system-ports', action='store_true', help='Listen and Proxy system ports example: 22, 80, 443 etc.!')
     parser.add_argument('--host', type=str, default=None, help='Docker host uri')
     args = parser.parse_args()
     if DOCKER_HOST_ENV != None:

src/proxy.py

@@ -3,7 +3,6 @@
 import threading
 import logging
 from enum import Enum, auto
-import fcntl, os
 import errno
 import time
 
@@ -41,7 +40,7 @@ def handle(self):
     def transferData(self, sock1 : socket, sock2 : socket, max_read_try = 10, receive_message_length = 2048):
         read_try = 0
         last_try = False
-        fcntl.fcntl(sock1, fcntl.F_SETFL, os.O_NONBLOCK)
+        sock1.setblocking(0)
         while True:
             try:
                 msg = sock1.recv(receive_message_length)
@@ -58,14 +57,13 @@ def transferData(self, sock1 : socket, sock2 : socket, max_read_try = 10, receiv
                     else:
                         last_try = True
             except error as e:
-                err = e.args[0]
-                if err == errno.EAGAIN or err == errno.EWOULDBLOCK:
-                    if read_try > max_read_try:
-                        return
-                    read_try += 1
-                    time.sleep(0.1)
-                    continue
-                raise e
+                if e.errno != errno.EAGAIN and e.errno != errno.EWOULDBLOCK:
+                    raise e
+                if read_try > max_read_try:
+                    return
+                read_try += 1
+                time.sleep(0.1)
+                continue
 
 class ThreadedTCPServer(ThreadingMixIn, TCPServer):
     pass