chocolate-doom
/
master-server
mirror of https://github.com/chocolate-doom/master-server.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add new request type for HOLE_PUNCH_ALL. 

In the setup tool when querying all servers from the master server, we also
need to hole punch all servers which need it. Rather than doing this with
many individual hole punch requests to the master server, add a single new
message type to hole punch all servers.

This could have been done as part of the normal query request handling,
automatically hole punching all servers unrequested by the client.
However, clients need to hole punch again when connecting and older clients
do not know how to do this. Separating out the functionality means that
hole punching will only be performed for newer clients which know about it.
This commit is contained in:
Simon Howard 2019-02-10 00:37:12 -05:00
parent 9dca3ddca1
commit 0777aac061
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chocolate-master
View File

@ -55,6 +55,7 @@ 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
NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH = 10 NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH = 10
NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL = 11
def bind_socket_to(sock, config): def bind_socket_to(sock, config):
""" Bind the specified socket to the address/port configuration from """ Bind the specified socket to the address/port configuration from
@ -288,14 +289,12 @@ class MasterServer:
# Generate a list of strings representing servers. Only include # Generate a list of strings representing servers. Only include
# verified servers. # verified servers.
verified_servers = filter(lambda s: s.verified, self.servers.values()) verified_servers = [s for s in self.servers.values() if s.verified]
strings = [ str(server) for server in verified_servers] strings = [str(server) for server in verified_servers]
# Send response packets. # Send response packets.
for packet in self.strings_to_packets(strings): for packet in self.strings_to_packets(strings):
self.send_message(addr, self.send_message(addr, NET_MASTER_PACKET_TYPE_QUERY_RESPONSE,
NET_MASTER_PACKET_TYPE_QUERY_RESPONSE,
packet) packet)
def process_metadata_request(self, addr): def process_metadata_request(self, addr):
@ -393,6 +392,16 @@ class MasterServer:
# Forward hole punch request to the server: # Forward hole punch request to the server:
self.send_hole_punch(self.servers[server_addr], addr) self.send_hole_punch(self.servers[server_addr], addr)
def process_hole_punch_all(self, addr):
"""Process a hole punch request for all servers."""
# For NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL, we send hole punch
# requests on behalf of the client to all servers we have flagged as
# requiring hole punch assistance to contact.
self.log_output(addr, "Mass hole punch request")
for server in self.servers.values():
if server.needs_hole_punch:
self.send_hole_punch(server, addr)
def process_packet(self, data, addr): def process_packet(self, data, addr):
""" Process a packet received from a server. """ """ Process a packet received from a server. """
@ -410,6 +419,8 @@ class MasterServer:
self.sign_end_message(data[2:], addr) self.sign_end_message(data[2:], addr)
elif packet_type == NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH: elif packet_type == NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH:
self.process_hole_punch(data[2:], addr) self.process_hole_punch(data[2:], addr)
elif packet_type == NET_MASTER_PACKET_TYPE_NAT_HOLE_PUNCH_ALL:
self.process_hole_punch_all(addr)
def is_blocked(self, addr): def is_blocked(self, addr):
addr_str = "%s:%i" % addr addr_str = "%s:%i" % addr