X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=4c28575365fee363b478e5cce3fcbd4c1e338ee4;hb=refs%2Fheads%2Ftest;hp=87cedaa71c73447a78d174e988094f6aeff08897;hpb=6e3c63cde45923c99f21b312a440e373bc23e679;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index 87cedaa7..6924626f 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -172,9 +172,9 @@ sub start
 	my $name = $user->{name};
 		
 	# log it
-	my $host = $self->{conn}->peerhost;
-	$host ||= "unknown";
-	$self->{hostname} = $host;
+	unless ($self->{hostname}) {
+		$self->{hostname} = $self->{conn}->peerhost || 'unknown';
+	}
 
 	$self->{name} = $name ? $name : $call;
 	$self->state('prompt');		# a bit of room for further expansion, passwords etc
@@ -194,7 +194,7 @@ sub start
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
 
-	LogDbg('DXCommand', "$call connected from $self->{hostname}");
+	LogDbg('err', "$call connected from $self->{hostname}");
 
 	# set some necessary flags on the user if they are connecting
 	$self->{registered} = 1;
@@ -202,11 +202,10 @@ sub start
 	$self->{priv} = 0;
 
 	# get the filters
-	my $nossid = $call;
-	$nossid =~ s/-\d+$//;
+#	$self->{inrbnfilter} = Filter::read_in('rbn', $call, 1) 
+#		|| Filter::read_in('rbn', 'node_default', 1);
 
-	$self->{inrbnfilter} = Filter::read_in('rbn', $call, 1) 
-		|| Filter::read_in('rbn', 'node_default', 1);
+	Filter::load_dxchan($self, 'rbn', 1);
 	
 	# clean up qra locators
 	my $qra = $user->qra;
@@ -247,6 +246,15 @@ sub normal
 
 	my (undef, undef, $origin, $qrg, $call, $mode, $s, $m, $spd, $u, $sort, $t, $tx) = split /[:\s]+/, $line;
 
+	# fix up "direct" (from a "skimmer server") connections
+	# basically the $mode is missing so everything is shifted down one
+	# so "cheat" and modify the line and do it again
+	if ($mode =~ /^\d+$/) {
+		$line =~ s/ $mode\s+dB/CW $mode dB/i;
+		(undef, undef, $origin, $qrg, $call, $mode, $s, $m, $spd, $u, $sort, $t, $tx) = split /[:\s]+/, $line;
+		dbg "RBN: inserted CW for missing mode" if $dbgrbn;
+	}
+	
 	# fix up FT8 spots from 7001
 	$t = $u, $u = '' if !$t && is_ztime($u);
 	$t = $sort, $sort = '' if !$t && is_ztime($sort);
@@ -259,6 +267,14 @@ sub normal
 		return;
 	}
 
+	# is it 'baddx'
+	if ($DXProt::baddx->in($call)) {
+		dbg("RBN: Bad DX spot '$call', ignored");
+		dbg($line) if isdbg('nologchan');
+		return;
+	}
+
+	
 	# remove all extraneous crap from the origin - just leave the base callsign
 	my $norigin = basecall($origin);
 	unless ($norigin) {
@@ -361,7 +377,7 @@ sub normal
 						dbg("seeme: result '$buf'") if isdbg('seeme');
 						$uchan->local_send('S', $buf);
 					} else {
-						LogDbg("RBN Someone is playing silly persons $rcall is not a user and cannot do 'seeme', ignored and reset");
+						LogDbg('err',"RBN Someone is playing silly persons $rcall is not a user and cannot do 'seeme', ignored and reset");
 						del_seeme($rcall);
 					}
 				}
@@ -844,7 +860,7 @@ sub per_minute
 		next unless $dxchan->is_rbn;
 		dbg "RBN:STATS minute $dxchan->{call} raw: $dxchan->{noraw} retrieved spots: $dxchan->{norbn} delivered: $dxchan->{nospot} after filtering to users: " . scalar keys %{$dxchan->{nousers}} if isdbg('rbnstats');
 		if ($dxchan->{noraw} == 0 && $dxchan->{lasttime} > 60) {
-			LogDbg('RBN', "RBN: no input from $dxchan->{call}, disconnecting");
+			LogDbg('err', "RBN: no input from $dxchan->{call}, disconnecting");
 			$dxchan->disconnect;
 		}
 		$dxchan->{noraw} = $dxchan->{norbn} = $dxchan->{nospot} = 0; $dxchan->{nousers} = {};
@@ -900,7 +916,10 @@ sub finish
 
 sub write_cache
 {
+	return unless $json;
+
 	my $ta = [ gettimeofday ];
+	
 	$json->indent(1)->canonical(1) if isdbg 'rbncache';
 	my $s = eval {$json->encode($spots)};
 	if ($s) {