Final resolving with new configuration entry

Author: Steven

main.py

@@ -37,10 +37,10 @@ def main():
         kick_message = ""
         samples = configuration["samples"]
         try:
-            show_ip = configuration["show_ip_if_hostname_available"]
+            show_hostname = configuration["show_hostname_if_available"]
         except KeyError:
-            configuration["show_ip_if_hostname_available"] = True
-            show_ip = True
+            configuration["show_hostname_if_available"] = True
+            show_hostname = True
             with open("config.json", 'w') as file:
                 json.dump(configuration, file, sort_keys=True, indent=4, ensure_ascii=False)
 
@@ -57,7 +57,7 @@ def main():
         try:
             global server
             logger.info("Setting up server...")
-            server = SocketServer(ip, port, motd, version_text, kick_message, samples, server_icon, logger, show_ip)
+            server = SocketServer(ip, port, motd, version_text, kick_message, samples, server_icon, logger, show_hostname)
             server.start()
         except KeyboardInterrupt:
             logger.info("Shutting down server...")

socket_server.py

@@ -1,14 +1,13 @@
-import _thread
 import json
 import socket
 import uuid
+from threading import Thread
 
 import byte_utils
 
 
 class SocketServer:
-
-    def __init__(self, ip, port, motd, version_text, kick_message, samples, server_icon, logger, show_ip):
+    def __init__(self, ip, port, motd, version_text, kick_message, samples, server_icon, logger, show_hostname):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.ip = ip
         self.port = port
@@ -18,7 +17,7 @@ def __init__(self, ip, port, motd, version_text, kick_message, samples, server_i
         self.samples = samples
         self.server_icon = server_icon
         self.logger = logger
-        self.show_ip = show_ip
+        self.show_hostname = show_hostname
 
     def on_new_client(self, client_socket, addr):
         data = client_socket.recv(1024)
@@ -42,8 +41,8 @@ def on_new_client(self, client_socket, addr):
                 (port, i) = byte_utils.read_ushort(data, i)
                 (state, i) = byte_utils.read_varint(data, i)
 
-                fqdn = socket.getfqdn(addr[0])
-                if self.show_ip and client_ip != fqdn:
+                fqdn = socket.getfqdn(client_ip)
+                if self.show_hostname and client_ip != fqdn:
                     client_ip = fqdn + "/" + client_ip
 
                 if state == 1:
@@ -112,7 +111,7 @@ def start(self):
         self.logger.info("Server started on %s:%s! Waiting for incoming connections..." % (self.ip, self.port))
         while 1:
             (client, address) = self.sock.accept()
-            _thread.start_new_thread(self.on_new_client, (client, address,))
+            Thread(target=self.on_new_client, daemon=True, args=(client, address,)).start()
 
     def close(self):
         self.sock.close()