Rework with asyncio. Requires Python 3.7.

masterserver.py

@@ -1,9 +1,9 @@
+import asyncio
 import logging
 import socket
-import threading
 import datetime
-import time
+import signal
-import traceback
+import sys
 
 # List of servers always up
 DEDICATED_SERVERS = [{"ip": "136.143.97.184", "port": 19711, "last": datetime.datetime.now()},
@@ -11,6 +11,7 @@ DEDICATED_SERVERS = [{"ip": "136.143.97.184", "port": 19711, "last": datetime.da
                      {"ip": "artolsheim.hipstercat.fr", "port": 19711, "last": datetime.datetime.now()}]
 
 SERVERS = DEDICATED_SERVERS.copy()
+running = True
 
 
 def setup_logger(name):
@@ -19,54 +20,32 @@ def setup_logger(name):
     _ch.setLevel("DEBUG")
     _formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
     _ch.setFormatter(_formatter)
-    logger = logging.getLogger(name)
+    log = logging.getLogger(name)
-    logger.addHandler(_ch)
+    log.addHandler(_ch)
-    logger.setLevel("DEBUG")
+    log.setLevel("DEBUG")
-    logger.debug("Logger initialized")
+    log.debug("Logger initialized")
-    return logger
+    return log
 
 
 logger = setup_logger(__name__)
 
 
-def main():
+class QueryServerProtocol(asyncio.Protocol):
-    listen_ip = "0.0.0.0"
+    def __init__(self):
+        super().__init__()
+        self.transport = None
 
-    # register socket. dedicated servers send packets to this socket to register.
+    def connection_made(self, transport):
-    registersock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        peername = transport.get_extra_info('peername')
-    registersock.bind((listen_ip, 27900))
+        logger.info('Connection from {}'.format(peername))
-    logger.info("Register server listening on %s UDP %s", listen_ip, 27900)
+        self.transport = transport
 
-    # query socket. clients use this socket to query available servers.
+    def data_received(self, data):
-    querysock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        clean()
-    querysock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        ip = self.transport.get_extra_info("peername")
-    querysock.bind((listen_ip, 28900))
-    print("Query server listening on %s TCP %s", listen_ip, 28900)
-    querysock.listen(5)
 
-    # everything is threaded.
-    registerthread = threading.Thread(target=registerloop, args=(registersock,))
-    querythread = threading.Thread(target=queryloop, args=(querysock,))
-
-    # clean thread is used to clean older server that haven't updated in a while
-    cleanthread = threading.Thread(target=cleanloop)
-
-    # start everything
-    querythread.start()
-    registerthread.start()
-    cleanthread.start()
-
-    # wait until everything is finished (which will never happen because they are all running in a loop)
-    querythread.join()
-    registerthread.join()
-    cleanthread.join()
-
-
-def queryloop(querysock):
-    while True:
         # new query incoming from a client
-        (clientsocket, (_, _)) = querysock.accept()
+        logger.info("Query from %s", ip)
-        logger.info("Query from %s:%s", clientsocket[0], clientsocket[1])
 
         # forge the response
         b = b''
@@ -78,30 +57,39 @@ def queryloop(querysock):
             b += b'\xac'
             b += str(SERVERS[i]["port"]).encode("ascii")
             b += b'\x00'
-        logger.info("Sending back %s", b.decode('utf8'))
+        logger.info("Sending back %s", b)
 
         # send it
-        clientsocket.send(b)
+        self.transport.write(b)
 
         # close the socket
-        clientsocket.close()
+        self.transport.close()
 
 
-def registerloop(registersock):
+class RegisterServerProtocol(asyncio.DatagramProtocol):
-    while True:
+    def __init__(self):
-        # new register incoming from a server
+        super().__init__()
-        data, (ip, port) = registersock.recvfrom(1024)
+        self.transport = None
-        try:
+
-            # first byte is some kind of opcode, so we leave it. the rest is the game port
+    def connection_made(self, transport):
+        self.transport = transport
+
+    def datagram_received(self, data, addr):
+        clean()  # remove old servers
+        ip = addr[0]
+        logger.info("Received %s from %s", data.decode("utf8"), ip)
         gameport = data[1:].decode("ascii")
         if int(gameport):
+            gameport = int(gameport)
+            try:
                 # game port sent. now we try to reach the server to avoid registering of servers unreachable.
                 tempsocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
                 tempsocket.settimeout(5)
 
                 # we try to send a "status" packet to the server.
-                tempsocket.sendto("\\status\\".encode("ascii"), (ip, port))
+                tempsocket.sendto("\\status\\".encode("ascii"), (ip, gameport))
-                tempsocket.recvfrom(1024)
+                tempsocket.recvfrom(1024)  # discard received message and suppose it was okay
+                tempsocket.close()
 
                 # server will be None if it has not been seen before, or something else if it has been seen
                 server = next((x for x in SERVERS if x["ip"] == ip and x["port"] == gameport), None)
@@ -111,20 +99,30 @@ def registerloop(registersock):
                 else:
                     server["last"] = datetime.datetime.now()
                     logger.info("Keepalive from: %s:%s" % (ip, gameport))
-                tempsocket.close()
+
+            except socket.timeout:
+                logger.info("Could not connect to %s:%s after timeout", ip, gameport)
         else:
             # server sent shit, discard it
-                print("Fuck it, wasn't int: ", data)
+            logger.info("Fuck it, wasn't int: ", data)
-        except Exception as e:
-            # something wrong happened but we don't know what
-            print("Exception")
-            traceback.print_exc()
 
 
-def cleanloop():
+def signal_handler(sig, frame):
-    # clean loop removes servers that haven't registered or sent a packet in the last 2 minutes
+    # called when CTRL+C received
-    # but don't remove known dedicated servers
+    del sig, frame
+    logger.info('Shutting down...')
+    sys.exit(0)
+
+
+async def wakeup():
+    # hack to allow CTRL+C on Windows
     while True:
+        await asyncio.sleep(1)
+
+
+def clean():
+    # clean function removes servers that haven't registered or sent a packet in the last 2 minutes
+    # but don't remove known dedicated servers
     now = datetime.datetime.now()
     for server in SERVERS:
         if now > server["last"] + datetime.timedelta(minutes=2) and server not in DEDICATED_SERVERS:
@@ -133,7 +131,30 @@ def cleanloop():
                 SERVERS.remove(server)
             except ValueError:
                 pass
-        time.sleep(10)
+
+
+def main():
+    signal.signal(signal.SIGINT, signal_handler)
+    listen_ip = "0.0.0.0"
+    queryport = 28900
+    registerport = 27900
+
+    loop = asyncio.get_event_loop()
+
+    query_coro = loop.create_server(QueryServerProtocol, listen_ip, queryport)
+    loop.create_task(query_coro)
+    logger.info("Query server listening on %s TCP %s", listen_ip, queryport)
+
+    register_coro = loop.create_datagram_endpoint(lambda: RegisterServerProtocol(),
+                                                  local_addr=(listen_ip, registerport))
+    loop.create_task(register_coro)
+    logger.info("Register server listening on %s UDP %s", listen_ip, registerport)
+
+    # add wakeup hack
+    # https://stackoverflow.com/questions/27480967/why-does-the-asyncios-event-loop-suppress-the-keyboardinterrupt-on-windows
+    loop.create_task(wakeup())
+
+    loop.run_forever()
 
 
 if __name__ == '__main__':

querytest.py

@@ -0,0 +1,23 @@
+import socket
+
+HOST = '127.0.0.1'
+PORT = 28900
+
+client = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+client.connect((HOST, PORT))
+print('Connection to ' + HOST + ':' + str(PORT) + ' successful.')
+
+message = b"query"
+print("Sending: %s" % message)
+n = client.send(message)
+if n != len(message):
+        print('Error while sending.')
+else:
+        print('Sent.')
+
+print('Receiving...')
+donnees = client.recv(1024)
+print('Received:', donnees)
+
+print('Disconnection.')
+client.close()

registertest.py

@@ -0,0 +1,21 @@
+import socket
+import time
+
+UDP_IP = "127.0.0.1"
+MY_UDP = 27901
+UDP_PORT = 27900
+
+sock = socket.socket(socket.AF_INET, # Internet
+                     socket.SOCK_DGRAM) # UDP
+sock.bind((UDP_IP, MY_UDP))
+
+MESSAGE = b"\x0127901"
+
+while True:
+    print("Sending register/keep alive packet")
+    sock.sendto(MESSAGE, (UDP_IP, UDP_PORT))  # simulate register/keepalive packet
+    data, addr = sock.recvfrom(1024)  # master server will query server
+    print("Received data %s" % data)
+    sock.sendto(MESSAGE, addr)  # simulate "status" response
+    print("Sending \"status\" reponse")
+    time.sleep(30)