X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=03887493ffaa5b6b451d327b523250883d8d754b;hb=101516b420ac77cd9eb8294651104e43f3461c06;hp=3720008a03eb75770b9f7578251d54e20bc57317;hpb=1fae727d9da6945d99ccdcb79436eb579b47a3b7;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 3720008a..03887493 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -286,7 +286,7 @@ sub normal
 	# check for and dump bad protocol messages
 	my $n = check($pcno, @field);
 	if ($n) {
-		dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+		dbg("PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")") if isdbg('chan');
 		return;
 	}
 
@@ -295,7 +295,7 @@ sub normal
 	eval {
 		$pcr = Local::pcprot($self, $pcno, @field);
 	};
-#	dbg('local', "Local::pcprot error $@") if $@;
+#	dbg("Local::pcprot error $@") if isdbg('local') if $@;
 	return if $pcr;
 	
  SWITCH: {
@@ -305,7 +305,7 @@ sub normal
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -340,13 +340,13 @@ sub normal
 			
 			# if this is a 'nodx' node then ignore it
 			if ($badnode->in($field[7])) {
-				dbg('chan', "PCPROT: Bad Node, dropped");
+				dbg("PCPROT: Bad Node, dropped") if isdbg('chan');
 				return;
 			}
 			
 			# if this is a 'bad spotter' user then ignore it
 			if ($badspotter->in($field[6])) {
-				dbg('chan', "PCPROT: Bad Spotter, dropped");
+				dbg("PCPROT: Bad Spotter, dropped") if isdbg('chan');
 				return;
 			}
 			
@@ -354,13 +354,13 @@ sub normal
 			my $d = cltounix($field[3], $field[4]);
 			# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
 			if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
-				dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+				dbg("PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n") if isdbg('chan');
 				return;
 			}
 
 			# is it 'baddx'
 			if ($baddx->in($field[2])) {
-				dbg('chan', "PCPROT: Bad DX spot, ignored");
+				dbg("PCPROT: Bad DX spot, ignored") if isdbg('chan');
 				return;
 			}
 			
@@ -368,17 +368,17 @@ sub normal
 			$field[5] =~ s/^\s+//;      # take any leading blanks off
 			$field[2] = unpad($field[2]);	# take off leading and trailing blanks from spotted callsign
 			if ($field[2] =~ /BUST\w*$/) {
-				dbg('chan', "PCPROT: useless 'BUSTED' spot");
+				dbg("PCPROT: useless 'BUSTED' spot") if isdbg('chan');
 				return;
 			}
 			if (Spot::dup($field[1], $field[2], $d, $field[5])) {
-				dbg('chan', "PCPROT: Duplicate Spot ignored\n");
+				dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chan');
 				return;
 			}
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[5])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -388,7 +388,7 @@ sub normal
 			if ($self->{inspotsfilter}) {
 				my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
 				unless ($filter) {
-					dbg('chan', "PCPROT: Rejected by filter");
+					dbg("PCPROT: Rejected by filter") if isdbg('chan');
 					return;
 				}
 			}
@@ -455,7 +455,7 @@ sub normal
 			eval {
 				$r = Local::spot($self, @spot);
 			};
-#			dbg('local', "Local::spot1 error $@") if $@;
+#			dbg("Local::spot1 error $@") if isdbg('local') if $@;
 			return if $r;
 
 			# DON'T be silly and send on PC26s!
@@ -470,14 +470,14 @@ sub normal
 			# announce duplicate checking
 			$field[3] =~ s/^\s+//;  # remove leading blanks
 			if (AnnTalk::dup($field[1], $field[2], $field[3])) {
-				dbg('chan', "PCPROT: Duplicate Announce ignored");
+				dbg("PCPROT: Duplicate Announce ignored") if isdbg('chan');
 				return;
 			}
 
 			if ($censorpc) {
 				my @bad;
 				if (@bad = BadWords::check($field[3])) {
-					dbg('chan', "PCPROT: Bad words: @bad, dropped" );
+					dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chan');
 					return;
 				}
 			}
@@ -502,7 +502,7 @@ sub normal
 					my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
 													$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
 					unless ($filter) {
-						dbg('chan', "PCPROT: Rejected by filter");
+						dbg("PCPROT: Rejected by filter") if isdbg('chan');
 						return;
 					}
 				}
@@ -534,17 +534,17 @@ sub normal
 			my $newline = "PC16^";
 			
 			if ($ncall eq $main::mycall) {
-				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
 			if ($dxchan && $dxchan ne $self) {
-				dbg('chan', "PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!");
+				dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chan');
 				return;
 			}
 			my $parent = Route::Node::get($ncall); 
 			unless ($parent) {
-				dbg('chan', "PCPROT: Node $ncall not in config");
+				dbg("PCPROT: Node $ncall not in config") if isdbg('chan');
 				return;
 			}
 			my $i;
@@ -587,17 +587,17 @@ sub normal
 			my $ncall = $field[2];
 			my $ucall = $field[1];
 			if ($ncall eq $main::mycall) {
-				dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+				dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chan');
 				return;
 			}
 			$dxchan = DXChannel->get($ncall);
 			if ($dxchan && $dxchan ne $self) {
-				dbg('chan', "PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!");
+				dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chan');
 				return;
 			}
 			my $parent = Route::Node::get($ncall);
 			unless ($parent) {
-				dbg('chan', "PCPROT: Route::Node $ncall not in config");
+				dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chan');
 				return;
 			}
 			my @rout = $parent->del_user($ucall);
@@ -610,11 +610,7 @@ sub normal
 
 			# first clear out any nodes on this dxchannel
 			my $parent = Route::Node::get($self->{call});
-			my @rout;
-			for ($parent->nodes) {
-				my $r = Route::Node::get($_);
-				push @rout, $r->del_node if $r;
-			}
+			my @rout = $parent->del_nodes;
 			$self->route_pc21(@rout, $parent);
 			$self->send_local_config();
 			$self->send(pc20());
@@ -696,21 +692,21 @@ sub normal
 			my @rout;
 			my $parent = Route::Node::get($self->{call});
 			unless ($parent) {
-				dbg('chan', "PCPROT: Route::Node $call not in config");
+				dbg("PCPROT: Route::Node $call not in config") if isdbg('chan');
 				return;
 			}
 			my $node = Route::Node::get($call);
 			
 			if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
 				if ($call eq $self->{call}) {
-					dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
+					dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chan');
 					return;
 				}
 
 				# routing objects
 				push @rout, $node->del($parent) if $node;
 			} else {
-				dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+				dbg("PCPROT: I WILL _NOT_ be disconnected!") if isdbg('chan');
 				return;
 			}
 			$self->route_pc21(@rout) if @rout;
@@ -740,11 +736,11 @@ sub normal
 			my ($r) = $field[6] =~ /R=(\d+)/;
 			$r = 0 unless $r;
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
+				dbg("PCPROT: WWV Date ($field[1] $field[2]) out of range") if isdbg('chan');
 				return;
 			}
 			if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
-				dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
+				dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chan');
 				return;
 			}
 			$field[7] =~ s/-\d+$//o;            # remove spotter's ssid
@@ -755,7 +751,7 @@ sub normal
 			eval {
 				$rep = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8], $r);
 			};
-#			dbg('local', "Local::wwv2 error $@") if $@;
+#			dbg("Local::wwv2 error $@") if isdbg('local') if $@;
 			return if $rep;
 
 			# DON'T be silly and send on PC27s!
@@ -783,7 +779,7 @@ sub normal
 				return;
 			}
 			if ($field[2] eq $main::mycall) {
-				dbg('chan', "PCPROT: Trying to merge to myself, ignored");
+				dbg("PCPROT: Trying to merge to myself, ignored") if isdbg('chan');
 				return;
 			}
 
@@ -886,7 +882,7 @@ sub normal
 			if ($field[1] eq $self->{call}) {
 				$self->disconnect(1);
 			} else {
-				dbg('chan', "PCPROT: came in on wrong channel");
+				dbg("PCPROT: came in on wrong channel") if isdbg('chan');
 			}
 			return;
 		}
@@ -912,11 +908,14 @@ sub normal
 			$user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
 			$user->put;
 			my $ref = Route::get($call);
-			$self->route_pc41($ref, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line);
+			$self->route_pc41($ref, $call, $field[2], $field[3], $field[4]) if $ref && !eph_dup($line);
+			return;
 		}
+
 		if ($pcno == 43) {
 			last SWITCH;
 		}
+
 		if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) {
 			DXDb::process($self, $line);
 			return;
@@ -992,12 +991,12 @@ sub normal
 			# do some de-duping
 			my $d = cltounix($call, sprintf("%02d18Z", $field[2]));
 			if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
-				dbg('chan', "PCPROT: WCY Date ($call $field[2]) out of range");
+				dbg("PCPROT: WCY Date ($call $field[2]) out of range") if isdbg('chan');
 				return;
 			}
 			@field = map { unpad($_) } @field;
 			if (WCY::dup($d,@field[3..7])) {
-				dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
+				dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chan');
 				return;
 			}
 		
@@ -1007,7 +1006,7 @@ sub normal
 			eval {
 				$rep = Local::wwv($self, @field[1..12]);
 			};
-			# dbg('local', "Local::wcy error $@") if $@;
+			# dbg("Local::wcy error $@") if isdbg('local') if $@;
 			return if $rep;
 
 			# broadcast to the eager world
@@ -1090,7 +1089,7 @@ sub normal
 	#
 
 	if (eph_dup($line)) {
-		dbg('chan', "PCPROT: Ephemeral dup, dropped");
+		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chan');
 	} else {
 		unless ($self->{isolate}) {
 			broadcast_ak1a($line, $self); # send it to everyone but me
@@ -1407,7 +1406,7 @@ sub send_local_config
 	my @localnodes;
 	my @remotenodes;
 
-	dbg('trace', 'DXProt::send_local_config');
+	dbg('DXProt::send_local_config') if isdbg('trace');
 	
 	# send our nodes
 	if ($self->{isolate}) {
@@ -1431,7 +1430,11 @@ sub send_local_config
 	
 	# get all the users connected on the above nodes and send them out
 	foreach $n (@localnodes, @remotenodes) {
-		send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+		if ($n) {
+			send_route($self, \&pc16, 1, $n, map {my $r = Route::User::get($_); $r ? ($r) : ()} $n->users);
+		} else {
+			dbg("sent a null value") if isdbg('chan');
+		}
 	}
 }
 
@@ -1445,7 +1448,7 @@ sub route
 	my ($self, $call, $line) = @_;
 
 	if (ref $self && $call eq $self->{call}) {
-		dbg('chan', "PCPROT: Trying to route back to source, dropped");
+		dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
 		return;
 	}
 
@@ -1456,7 +1459,7 @@ sub route
 		$dxchan = $cl->dxchan if $cl;
 		if (ref $dxchan) {
 			if (ref $self && $dxchan eq $self) {
-				dbg('chan', "PCPROT: Trying to route back to source, dropped");
+				dbg("PCPROT: Trying to route back to source, dropped") if isdbg('chan');
 				return;
 			}
 		}
@@ -1467,7 +1470,7 @@ sub route
 			$dxchan->send($routeit);
 		}
 	} else {
-		dbg('chan', "PCPROT: No route available, dropped");
+		dbg("PCPROT: No route available, dropped") if isdbg('chan');
 	}
 }
 
@@ -1664,9 +1667,11 @@ sub disconnect
 
 	# do routing stuff
 	my $node = Route::Node::get($call);
-	my @rout = $node->del_nodes;    # at the next level
-
-	@rout = $node->del($main::routeroot) if $node;
+	my @rout;
+	if ($node) {
+		@rout = $node->del_nodes;    # at the next level
+		@rout = $node->del($main::routeroot);
+	}
 	
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);
@@ -1718,8 +1723,12 @@ sub send_route
 	if ($self->{routefilter}) {
 		for (; @_ && $no; $no--) {
 			my $r = shift;
-			($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
-			push @rin, $r if $filter;
+			if ($r) {
+				($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq);
+				push @rin, $r if $filter;
+			} else {
+				dbg("was sent a null value") if isdbg('chan');
+			}
 		}
 	}
 	if (@rin) {