Leahnaya/dwc_network_server_emulator
1
0
Fork 0
mirror of https://github.com/barronwaffles/dwc_network_server_emulator.git synced 2026-04-23 09:07:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge d5be4cf36c into 2c65a9f6af

Browse Source
This commit is contained in:
sepalani 2024-08-03 00:17:15 +04:00 committed by GitHub
commit 86ef0ded26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gamespy_natneg_server.py
View File

@ -122,6 +122,12 @@ def handle_natneg_init(nn, recv_data, addr, socket):
if client_session['connected'] or client == client_id:
continue
def get_ip(obj):
"""Get the public or local IP address when needed."""
if client_session['addr'][0] == client_id_session['addr'][0]:
return obj['localaddr'][0]
return obj['addr'][0]
# --- Send to requesting client
# Get server info
serveraddr = nn.get_server_addr(gameid, session_id, client)
@ -139,7 +145,7 @@ def handle_natneg_init(nn, recv_data, addr, socket):
client_session['addr'][1]
output = bytearray(recv_data[0:12])
output += utils.get_bytes_from_ip_str(client_session['addr'][0])
output += utils.get_bytes_from_ip_str(get_ip(client_session))
output += utils.get_bytes_from_short(publicport, True)
# Unknown, always seems to be \x42\x00
@ -169,7 +175,7 @@ def handle_natneg_init(nn, recv_data, addr, socket):
client_id_session['addr'][1]
output = bytearray(recv_data[0:12])
output += utils.get_bytes_from_ip_str(client_id_session['addr'][0])
output += utils.get_bytes_from_ip_str(get_ip(client_id_session))
output += utils.get_bytes_from_short(publicport, True)
# Unknown, always seems to be \x42\x00