From d1af97646d2391f9630874bcfb9e669c7aa66958 Mon Sep 17 00:00:00 2001 From: polaris Date: Thu, 17 Apr 2014 17:57:02 -0400 Subject: [PATCH] Get server info from master list --- gamespy_server_browser_server.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gamespy_server_browser_server.py b/gamespy_server_browser_server.py index 66f286e..69d57f2 100644 --- a/gamespy_server_browser_server.py +++ b/gamespy_server_browser_server.py @@ -351,8 +351,8 @@ class Session(LineReceiver): self.transport.write(bytes(data)) logger.log(logging.DEBUG, "Sent server list message to %s:%s..." % (self.address.host, self.address.port)) - if "publicip" in server and "publicport" in server: - self.server_cache[str(server['publicip']) + str(server['publicport'])] = server + # if "publicip" in server and "publicport" in server: + # self.server_cache[str(server['publicip']) + str(server['publicport'])] = server def find_server_in_cache(self, addr, port, console): if console != 0: @@ -363,11 +363,13 @@ class Session(LineReceiver): logger.log(logging.DEBUG, "IP: %s, Console: %d" % (ip, console)) # Get server based on ip/port - server = None - logger.log(logging.DEBUG, self.server_cache) - logger.log(logging.DEBUG, "Searching for: %s %s" % (ip + str(port), addr)) - if (str(ip) + str(port)) in self.server_cache: - server = self.server_cache[ip + str(port)] - #self.server_cache.pop((publicip + str(self.forward_client[1]))) + # server = None + # logger.log(logging.DEBUG, self.server_cache) + # logger.log(logging.DEBUG, "Searching for: %s %s" % (ip + str(port), addr)) + # if (str(ip) + str(port)) in self.server_cache: + # server = self.server_cache[ip + str(port)] + # #self.server_cache.pop((publicip + str(self.forward_client[1]))) + + server = self.server_manager.find_server_by_address(ip, self.forward_client[1])._getvalue() return server, ip \ No newline at end of file