chocolate-doom/master-server
0
0
Fork 0
mirror of https://github.com/chocolate-doom/master-server.git synced 2024-11-21 20:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow alternate port to be specified for tests.

Browse source 
For testing the server may be running on a different port.
This commit is contained in:
Simon Howard 2019-02-09 21:33:41 -05:00
parent 4c7861b2e0
commit df0fc0e7bd
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
chocolate-master-test.py
View file

@ -39,7 +39,16 @@ NET_MASTER_PACKET_TYPE_SIGN_START_RESPONSE = 7
NET_MASTER_PACKET_TYPE_SIGN_END = 8 NET_MASTER_PACKET_TYPE_SIGN_END = 8
NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE = 9 NET_MASTER_PACKET_TYPE_SIGN_END_RESPONSE = 9
UDP_PORT = 5000 # DO NOT SUBMIT UDP_PORT = 2342
def parse_address(addr_str):
if ":" in addr_str:
addr_str, port = addr_str.split(":", 1)
port = int(port)
else:
port = UDP_PORT
return (socket.gethostbyname(addr_str), port)
def send_message(sock, addr, message_type, payload=None): def send_message(sock, addr, message_type, payload=None):
header = struct.pack(">h", message_type) header = struct.pack(">h", message_type)
@ -78,7 +87,7 @@ def read_string(packet):
def add_to_master(addr_str): def add_to_master(addr_str):
""" Add self to master at specified IP address. """ """ Add self to master at specified IP address. """
addr = (socket.gethostbyname(addr_str), UDP_PORT) addr = parse_address(addr_str)
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Send request # Send request
@ -115,7 +124,7 @@ def decode_string_list(packet):
def query_master(addr_str): def query_master(addr_str):
""" Query a master server for its list of server IP addresses. """ """ Query a master server for its list of server IP addresses. """
addr = (socket.gethostbyname(addr_str), UDP_PORT) addr = parse_address(addr_str)
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Send request # Send request
@ -140,7 +149,7 @@ def query_master(addr_str):
def get_metadata(addr_str): def get_metadata(addr_str):
""" Query a master server for metadata about its servers. """ """ Query a master server for metadata about its servers. """
addr = (socket.gethostbyname(addr_str), UDP_PORT) addr = parse_address(addr_str)
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Send request # Send request
@ -171,7 +180,7 @@ def get_metadata(addr_str):
def sign_start(addr_str): def sign_start(addr_str):
""" Request a signed start message from the master. """ """ Request a signed start message from the master. """
addr = (socket.gethostbyname(addr_str), UDP_PORT) addr = parse_address(addr_str)
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Send request # Send request
@ -194,7 +203,7 @@ def sign_start(addr_str):
def sign_end(addr_str): def sign_end(addr_str):
""" Request a signed end message from the server. """ """ Request a signed end message from the server. """
addr = (socket.gethostbyname(addr_str), UDP_PORT) addr = parse_address(addr_str)
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
print("Paste the start message, then type ^D") print("Paste the start message, then type ^D")