Add arg "--local-port" for motd

Author: WillowSauceR

api.py

@@ -85,13 +85,12 @@ def decode_unicode(string: str):
         return string.encode("utf-8").decode("unicode-escape")
 
 
-def get_udp_socket(port=random.randint(1024, 65535)):
+def get_udp_socket(port=random.randint(1024, 65535), timeout: int=1) -> socket.socket:
     if not port:
         port = random.randint(1024, 65535)
     sockets = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    sockets.settimeout(1)
-    if sys.platform.startswith('win32'):
-        sockets.bind(("", port))
+    sockets.settimeout(timeout)
+    sockets.bind(("", port))
     return sockets
 
 

motd.py

@@ -1,10 +1,10 @@
 import argparse
+import socket
 from api import get_udp_socket, log, parse_raw_pkt, MOTD_PKT
 
 
-def send_pkt(addr, port, timeout: float=3.0):
-    udp_skt = get_udp_socket()
-    udp_skt.settimeout(timeout)
+def send_pkt(addr, port, timeout: float=3.0, local_port: int=None):
+    udp_skt = get_udp_socket(local_port, timeout)
     udp_skt.sendto(
         MOTD_PKT,
         (addr, port))
@@ -36,16 +36,19 @@ def recv_pkt(sk_send):
                         help="target server port")
     parser.add_argument("-t", "--timeout", default=3.0, type=float,
                         help="timeout")
+    parser.add_argument("-lp", "--local-port", default=None, type=int,
+                        help="local port to send motd packet")
 
     args = parser.parse_args()
 
     addr = args.addr
     port = args.port
     timeout = args.timeout
+    local_port = args.local_port
 
     try:
-        send_pkt(addr, port, timeout)
-    except TimeoutError:
+        send_pkt(addr, port, timeout, local_port)
+    except (TimeoutError, socket.timeout):
         log(f"Timeout! Server may be offline or blocked motd request.")
     except ConnectionResetError:
         log(f"Connection Reset! Server may be offline or blocked motd request.")