Massive improvements on efficiency, robustness, security, reliability and more

1 files changed, 36 insertions, 111 deletions

diff --git a/lib/MasterServer/UDP/BeaconChecker.pm b/lib/MasterServer/UDP/BeaconChecker.pm
index a99be72..f74378d 100755
--- a/lib/MasterServer/UDP/BeaconChecker.pm
+++ b/lib/MasterServer/UDP/BeaconChecker.pm
@@ -6,93 +6,7 @@ use warnings;
 use AnyEvent::Handle::UDP;
 use Exporter 'import';
 
-our @EXPORT = qw| beacon_checker query_udp_server|;
-
-################################################################################
-##   When addresses are stored in the 'pending' list, they are supposed to be
-##   queried immediately with the secure/validate challenge to testify that
-##   the server is genuine and alive.
-##
-##   Some servers do not support the secure-challenge on the Uplink port. These
-##   servers are verified with a secure-challenge on their heartbeat ports, 
-##   which are designed to respond to secure queries, as well as status queries.
-##
-##   Addresses collected by other scripts, whether from the UCC applet or manual
-##   input via the website, are added to the pending list. It is more 
-##   important to verify pending beacons and new server addresses, than to 
-##   update the status of existing addresses. Therefore, pending addresses are
-##   prioritized.
-################################################################################
-sub beacon_checker {
-  my $self = shift;
-  $self->log("load", "UDP Beacon Checker is loaded.");
-
-  # queue -- which address is next in line?
-  my %q = ( pending_id => 0, server_id => 0,
-            start_time => time+$self->{beacon_checker_time}[0]-1); #time+grace
-
-  # go through all servers one by one, new and old
-  my $server_info = AnyEvent->timer (
-    after     => $self->{beacon_checker_time}[0],
-    interval  => $self->{beacon_checker_time}[1],
-    cb        => sub {
-        
-        # first of all, check whether we exceeded our time cap limit
-        if ( (time - $q{start_time}) >= $self->{beacon_checker_time}[2] ){
-          # reset queue variables          
-          $q{pending_id} = 0;
-          $q{server_id}  = 0;
-          $q{start_time} = time;
-        }
-        
-        # See if there are pending servers, and use existing secure string for
-        # the challenge.
-        my $n = $self->get_next_pending($q{pending_id});
-        
-        # if any entries were found, proceed
-        if ( $n->[0] ) {
-          
-          # next pending id will be > $n
-          $q{pending_id} = $n->[0];
-          
-          # query the server
-          $self->query_udp_server($n->[1], $n->[2], $n->[3]);
-          
-          # work done. Wait for the next round for the next timer tick.
-          return;
-        }
-        
-        # if no pending servers left, update the other entries
-        $n = $self->get_next_server($q{server_id});  
-        
-        # if any entries were found, proceed
-        if ( $n->[0] ) {
-
-          # next server id will be > $n
-          $q{server_id} = $n->[0];
-          
-          # query the server (no secure string)
-          $self->query_udp_server($n->[1], $n->[2], "");
-          
-          # work done. Wait for the next round for the next task.
-          return;
-        }
-        
-        # At this point, we are out of server entries. When new servers are 
-        # added, they are immediately queried on the next round.
-        # From here on, just count down until the cycle is complete and handle
-        # new entries while they are added to the list.
-
-    }
-  );
-  
-  # at the start of the module, remind host how often this happens
-  $self->log("info", "Verifying servers every $self->{beacon_checker_time}[2] seconds.");
-  
-  # return the timer object to keep it alive outside of this scope
-  return $server_info;
-}
-
+our @EXPORT = qw| query_udp_server|;
 
 ################################################################################
 ## Get the server status from any server over UDP and store the received 
@@ -100,11 +14,11 @@ sub beacon_checker {
 ## secure/pending or information.
 ################################################################################
 sub query_udp_server {
-  my ($self, $ip, $port, $secure) = @_;
+  my ($self, $id, $ip, $port, $secure, $message_type) = @_;
   my $buf = "";
   
   # debug spamming
-  $self->log("udp", "Query server $ip:$port");
+  $self->log("udp", "Query server $id ($ip:$port)");
   
   # connect with UDP server
   my $udp_client; $udp_client = AnyEvent::Handle::UDP->new(
@@ -118,40 +32,51 @@ sub query_udp_server {
       # add packet to buffer
       $buf .= $_[0];
       
+      # message type 0: \basic\\info\
+      # if gamename, ver, hostname and hostport are available, but NOT the value 
+      # "listenserver", it would have been \basic\info
+      if ($buf =~ m/\\gamename\\/ && 
+          $buf =~ m/\\hostname\\/ && 
+          $buf =~ m/\\hostport\\/ &&
+          $buf !~ m/\\listenserver\\/ ) {
+        $self->process_query_response($buf, $ip, $port);
+      }
+      
+      # message type 1: \basic\\secure\wookie
       # if validate, assume that we sent a \basic\secure request.
       if ($buf =~ m/\\validate\\/){
         $self->process_udp_validate($buf, $ip, undef, $port);
       }
-      # if gamename, ver, hostname and hostport are available, it should 
-      # have been \basic\info
-      elsif ($buf =~ m/\\gamename\\/ && $buf =~ m/\\gamever\\/ 
-          && $buf =~ m/\\hostname\\/ && $buf =~ m/\\hostport\\/) {
-        $self->process_query_response($buf, $ip, $port);
+      
+      # message type 2: \status\
+      # contains same info as \basic\\info, but also "listenserver". Only for UT.
+      if ($buf =~ m/\\gamename\\ut/ && 
+          $buf =~ m/\\hostname\\/   && 
+          $buf =~ m/\\hostport\\/   &&
+          $buf =~ m/\\listenserver\\/ ) {
+        $self->process_status_response($buf, $ip, $port);
       }
+
       # else partial information received. wait for more.
-      else{ }
+      # else { }
     },
   );
 
   #
   # Send secure message or status, depending on provided variables
-  #  
+  # Message types can be 
+  #   0: \basic\\info\
+  #   1: \basic\\secure\wookie
+  #   2: \status\
+  #
   
-  # secure servers enabled and secure key provided
-  if ($secure ne "" && $self->{require_secure_beacons} > 0) {
-    # send secure
-    $udp_client->push_send("\\basic\\\\secure\\$secure");
-    
-    # and log that we sent it
-    $self->log("udp", "sending secure=\"$secure\" to $ip:$port");
-  }
-  else {
-    # send information request
-    $udp_client->push_send("\\basic\\\\info\\");  
-    
-    # and log that we sent it
-    $self->log("udp","sending basic request to $ip:$port");
-  }
+  # determine the message
+  my $message = "\\basic\\\\info\\"; # default 0
+     $message = "\\basic\\\\secure\\$secure" if ($secure ne "" && $self->{require_secure_beacons} > 0); # message_type 1
+     $message = "\\status\\" if ($message_type == 2);
+
+  # send selected message
+  $udp_client->push_send($message);
 }
 
 1;