Leahnaya/dwc_network_server_emulator
1
0
Fork 0
mirror of https://github.com/barronwaffles/dwc_network_server_emulator.git synced 2026-08-21 10:04:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added the address check to natneg

Browse Source 
- Added address check to natneg. It's untested but it should hopefully
be to spec.
- Removed debug statement from QR server that was way noiser than it
really needed to be.
This commit is contained in:
polaris
2014-04-27 17:36:49 -04:00
parent 6b09bee47d
commit 85e0273e93
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gamespy_natneg_server.py
View File

@@ -64,8 +64,8 @@ class GameSpyNatNegServer(object):
self.session_list[gameid][session_id][client_id]['addr'] = addr
clients = len(self.session_list[gameid][session_id])
if self.session_list[gameid][session_id][client_id]['connected'] == False:
for client in self.session_list[gameid][session_id]:
for client in self.session_list[gameid][session_id]:
if self.session_list[gameid][session_id][client]['connected'] == False:
if client == client_id:
continue
@@ -106,7 +106,22 @@ class GameSpyNatNegServer(object):
if client_id not in self.session_list[gameid][session_id]:
pass
self.session_list[gameid][session_id][client_id]['connected'] = True
#self.session_list[gameid][session_id][client_id]['connected'] = True
elif recv_data[7] == '\x0a': # Address check. Note: UNTESTED!
client_id = "%02x" % ord(recv_data[13])
logger.log(logging.DEBUG, "Received address check command from %s:%s..." % (addr[0], addr[1]))
output = bytearray(recv_data[0:15])
output += bytearray([int(x) for x in addr[0].split('.')])
output += utils.get_bytes_from_short_be(addr[1])
output += bytearray(recv_data[len(output):])
output[7] = 0x0b
s.sendto(output, addr)
logger.log(logging.DEBUG, "Sent address check response to %s:%d..." % (self.session_list[gameid][session_id][client]['addr'][0], self.session_list[gameid][session_id][client]['addr'][1]))
logger.log(logging.DEBUG, utils.pretty_print_hex(output))
elif recv_data[7] == '\x0d':
client_id = "%02x" % ord(recv_data[13])

2
gamespy_qr_server.py
View File

@@ -200,7 +200,7 @@ class GameSpyQRServer(object):
# It may be safe to ignore "unknown" keys because the proper key names get filled in later...
k = {}
for i in range(0, len(d), 2):
self.log(logging.DEBUG, address, "%s = %s" % (d[i], d[i+1]))
#self.log(logging.DEBUG, address, "%s = %s" % (d[i], d[i+1]))
k[d[i]] = d[i+1]
if "gamename" in k: