X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FRBN.pm;h=bb64330bc06ef9bfa33e94c5887b2fb3467f8653;hb=431c8a14cdecd0ec455b6619380687dbe84e2a35;hp=f6c1bc5389144403d1944a465b6f716745116f27;hpb=50485e9bffe712e7f920942c1da4c4ac10fb8278;p=spider.git

diff --git a/perl/RBN.pm b/perl/RBN.pm
index f6c1bc53..bb64330b 100644
--- a/perl/RBN.pm
+++ b/perl/RBN.pm
@@ -19,6 +19,7 @@ use DXChannel;
 use Math::Round qw(nearest);
 use Date::Parse;
 use Time::HiRes qw(clock_gettime CLOCK_REALTIME);
+use Spot;
 
 our @ISA = qw(DXChannel);
 
@@ -36,6 +37,11 @@ our $beacontime = 5*60;			# same as minspottime, but for beacons (and shorter)
 our $dwelltime = 6; 			# the amount of time to wait for duplicates before issuing
                                 # a spot to the user (no doubt waiting with bated breath).
 
+our $filterdef = $Spot::filterdef; # we use the same filter as the Spot system. Can't think why :-).
+
+my $spots;						# the GLOBAL spot cache
+
+my %runtime;					# how long each channel has been running
 
 sub new 
 {
@@ -45,18 +51,27 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 
-	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1, undef, undef, $self->hostname], );
-	$self->{d} = {};
-	$self->{spot} = {};
+	$spots ||= {};
 	$self->{last} = 0;
 	$self->{noraw} = 0;
 	$self->{nospot} = 0;
+	$self->{nouser} = {};
 	$self->{norbn} = 0;
+	$self->{noraw10} = 0;
+	$self->{nospot10} = 0;
+	$self->{nouser10} = {};
+	$self->{norbn10} = 0;
+	$self->{nospothour} = 0;
+	$self->{nouserhour} = {};
+	$self->{norbnhour} = 0;
+	$self->{norawhour} = 0;
 	$self->{sort} = 'N';
 	$self->{lasttime} = $main::systime;
 	$self->{minspottime} = $minspottime;
 	$self->{beacontime} = $beacontime;
 	$self->{showstats} = 0;
+	$self->{pingint} = 0;
+	$self->{nopings} = 0;
 
 	return $self;
 }
@@ -67,8 +82,6 @@ sub start
 	my $user = $self->{user};
 	my $call = $self->{call};
 	my $name = $user->{name};
-	my $dref = $self->{d};
-	my $spotref = $self->{spot};
 		
 	# log it
 	my $host = $self->{conn}->peerhost;
@@ -85,7 +98,10 @@ sub start
 			($h) = $line =~ /host=([\da..fA..F:]+)/;
 			$line =~ s/\s*host=[\da..fA..F:]+// if $h;
 		}
-		$self->{hostname} = $h if $h;
+		if ($h) {
+			$h =~ s/^::ffff://;
+			$self->{hostname} = $h;
+		}
 	}
 	$self->{width} = 80 unless $self->{width} && $self->{width} > 80;
 	$self->{consort} = $line;	# save the connection type
@@ -100,11 +116,10 @@ sub start
 	# get the filters
 	my $nossid = $call;
 	$nossid =~ s/-\d+$//;
-	
-	$self->{spotsfilter} = Filter::read_in('spots', $call, 0) 
-		|| Filter::read_in('spots', $nossid, 0)
-			|| Filter::read_in('spots', 'user_default', 0);
 
+	$self->{inrbnfilter} = Filter::read_in('rbn', $call, 1) 
+		|| Filter::read_in('rbn', 'node_default', 1);
+	
 	# clean up qra locators
 	my $qra = $user->qra;
 	$qra = undef if ($qra && !DXBearing::is_qra($qra));
@@ -114,8 +129,8 @@ sub start
 		$user->qra(DXBearing::lltoqra($lat, $long)) if (defined $lat && defined $long);  
 	}
 
-	# start inrush timer
-	$self->{inrushpreventor} = $main::systime + $startup_delay;
+	# if we have been running and stopped for a while 
+	$self->{inrushpreventor} = exists $runtime{$call} && $runtime{$call} > $startup_delay ? 0 : $main::systime + $startup_delay;
 }
 
 my @queue;						# the queue of spots ready to send
@@ -125,7 +140,7 @@ sub normal
 	my $self = shift;
 	my $line = shift;
 	my @ans;
-	my $spots = $self->{spot};
+#	my $spots = $self->{spot};
 	
 	# save this for them's that need it
 	my $rawline = $line;
@@ -159,6 +174,9 @@ sub normal
 	$qra ||= '';
     dbg qq{or:$origin qr:$qrg ca:$call mo:$mode s:$s m:$m sp:$spd u:$u sort:$sort t:$t tx:$tx qra:$qra} if isdbg('rbn');
 
+	++$self->{noraw};
+	++$self->{noraw10};
+	++$self->{norawhour};
 	
 	my $b;
 	
@@ -214,8 +232,8 @@ sub normal
 
 		# do we have it?
 		my $spot = $spots->{$sp};
-		$spot = $spots->{$spp}, $sp = $spp, dbg('RBN: SPP using $spp for $sp') if !$spot && exists $spots->{$spp};
-		$spot = $spots->{$spm}, $sp = $spm, dbg('RBN: SPM using $spm for $sp') if !$spot && exists $spots->{$spm};
+		$spot = $spots->{$spp}, $sp = $spp, dbg(qq{RBN: SPP using $spp for $sp}) if isdbg('rbn') && !$spot && exists $spots->{$spp};
+		$spot = $spots->{$spm}, $sp = $spm, dbg(qq{RBN: SPM using $spm for $sp}) if isdbg('rbn') && !$spot && exists $spots->{$spm};
 		
 
 		# if we have one and there is only one slot and that slot's time isn't expired for respot then return
@@ -228,8 +246,11 @@ sub normal
 				}
 				
 				dbg("RBN: key: '$sp' RESPOTTING call: $call qrg: $qrg last seen \@ ". atime(int $spot->[0])) if isdbg('rbn');
+				undef $spot;	# it's about to be recreated (in one place)
 				++$respot;
 			}
+
+			# otherwise we have a spot being built up at the moment
 		} elsif ($spot) {
 			dbg("RBN: key '$sp' = '$spot' not ref");
 			return;
@@ -237,9 +258,8 @@ sub normal
 
 		# here we either have an existing spot record buildup on the go, or we need to create the first one
 		unless ($spot) {
-			$spot = [clock_gettime(CLOCK_REALTIME)];
-			$spots->{$sp} = $spot;
-			dbg("RBN: key: '$sp' call: $call qrg: $qrg NEW") if isdbg('rbn');
+			$spots->{$sp} = $spot = [clock_gettime(CLOCK_REALTIME)];;
+			dbg("RBN: key: '$sp' call: $call qrg: $qrg NEW" . $respot ? ' RESPOT' : '') if isdbg('rbn');
 		}
 
 		# add me to the display queue unless we are waiting for initial in rush to finish
@@ -255,6 +275,12 @@ sub normal
 		# create record and add into the buildup
 		my $r = [$origin, nearest(.1, $qrg), $call, $mode, $s, $t, $utz, $respot, $u];
 		dbg("RBN: key: '$sp' ADD RECORD call: $call qrg: $qrg origin: $origin") if isdbg('rbn');
+		my @s =  Spot::prepare($r->[1], $r->[2], $r->[6], '', $r->[0]);
+		if ($self->{inrbnfilter}) {
+			my ($want, undef) = $self->{inrbnfilter}->it($s);
+			next unless $want;	
+		}
+		$r->[9] = \@s;
 
 		push @$spot, $r;
 
@@ -281,7 +307,7 @@ sub normal
 				$quality = 9 if $quality > 9;
 				$quality = "Q:$quality";
 				if (isdbg('progress')) {
-					my $s = "RBN: SPOT key: '$sp' = $r->[2] on $r->[1] \@ $r->[5] $quality";
+					my $s = "RBN: SPOT key: '$sp' = $r->[2] on $r->[1] by $r->[0] \@ $r->[5] $quality";
 					$s .=  " route: $self->{call}";
 					dbg($s);
 				}
@@ -297,36 +323,54 @@ sub normal
 				dbg sprintf("RBN: QUEUE key: '$sp' SEND time not yet reached %.1f secs left", $spot->[0] + $dwelltime - $now) if isdbg 'rbnqueue'; 
 			}
 		}
-		
-
 	} else {
 		dbg "RBN:DATA,$line" if isdbg('rbn');
 	}
+}
 
-	# 	# periodic clearing out of the two caches
-	if (($tim % 60 == 0 && $tim > $self->{last}) || ($self->{last} && $tim >= $self->{last} + 60)) {
-		my $count = 0;
-		my $removed = 0;
-		while (my ($k,$v) = each %{$spots}) {
-			if ($tim - $v->[0] > $self->{minspottime}*2) {
-				delete $spots->{$k};
-				++$removed;
-			}
-			else {
-				++$count;
-			}
+sub per_minute
+{
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		dbg "RBN:STATS minute $dxchan->{call} raw: $dxchan->{noraw} sent: $dxchan->{norbn} delivered: $dxchan->{nospot} users: " . scalar keys %{$dxchan->{nousers}} if isdbg('rbnstats');
+		if ($dxchan->{noraw} == 0 && $dxchan->{lasttime} > 60) {
+			LogDbg('RBN', "RBN: no input from $dxchan->{call}, disconnecting");
+			$dxchan->disconnect;
 		}
-		dbg "RBN:ADMIN,spot cache: $removed removed $count remain"; # if isdbg('rbn');
-		dbg "RBN:" . join(',', "STAT", $self->{noraw}, $self->{norbn}, $self->{nospot}) if $self->{showstats};
-		$self->{noraw} = $self->{norbn} = $self->{nospot} = 0;
-		$self->{last} = int($tim / 60) * 60;
+		$dxchan->{noraw} = $dxchan->{norbn} = $dxchan->{nospot} = 0; $dxchan->{nousers} = {};
+		$runtime{$dxchan->{call}} += 60;
 	}
 }
 
+sub per_10_minute
+{
+	my $count = 0;
+	my $removed = 0;
+	while (my ($k,$v) = each %{$spots}) {
+		if ($main::systime - $v->[0] > $minspottime*2) {
+			delete $spots->{$k};
+			++$removed;
+		}
+		else {
+			++$count;
+		}
+	}
+	dbg "RBN:STATS spot cache remain: $count removed: $removed"; # if isdbg('rbn');
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		dbg "RBN:STATS 10-minute $dxchan->{call} raw: $dxchan->{noraw10} sent: $dxchan->{norbn10} delivered: $dxchan->{nospot10} users: " . scalar keys %{$dxchan->{nousers10}};
+		$dxchan->{noraw10} = $dxchan->{norbn10} = $dxchan->{nospot10} = 0; $dxchan->{nousers10} = {};
+	}
+}
 
-
-# 	}
-# }
+sub per_hour
+{
+	foreach my $dxchan (DXChannel::get_all()) {
+		next unless $dxchan->is_rbn;
+		dbg "RBN:STATS hour $dxchan->{call} raw: $dxchan->{norawhour} sent: $dxchan->{norbnhour} delivered: $dxchan->{nospothour} users: " . scalar keys %{$dxchan->{nousershour}};
+		$dxchan->{norawhour} = $dxchan->{norbnhour} = $dxchan->{nospothour} = 0; $dxchan->{nousershour} = {};
+	}
+}
 
 # we should get the spot record minus the time, so just an array of record (arrays)
 sub send_dx_spot
@@ -335,6 +379,10 @@ sub send_dx_spot
 	my $quality = shift;
 	my $spot = shift;
 
+	++$self->{norbn};
+	++$self->{norbn10};
+	++$self->{norbnhour};
+	
 	# $r = [$origin, $qrg, $call, $mode, $s, $utz, $respot];
 
 	my $mode = $spot->[0]->[3]; # as all the modes will be the same;
@@ -369,6 +417,8 @@ sub dx_spot
 	my $dxchan = shift;
 	my $quality = shift;
 	my $spot = shift;
+	my $call = $dxchan->{call};
+	
 
 	my $strength = 100;		# because it could if we talk about FTx
 	my $saver;
@@ -377,7 +427,11 @@ sub dx_spot
 	my %qrg;
 	my $respot;
 	my $qra;
-		
+
+	++$self->{nousers}->{$call};
+	++$self->{nousers10}->{$call};
+	++$self->{nousershour}->{$call};
+	
 	foreach my $r (@$spot) {
 		# $r = [$origin, $qrg, $call, $mode, $s, $t, $utz, $respot, $qra];
 		# Spot::prepare($qrg, $call, $utz, $comment, $origin);
@@ -386,28 +440,30 @@ sub dx_spot
 		$respot = 1 if $r->[7];
 		$qra = $r->[8] if !$qra && $r->[8] && is_qra($r->[8]);
 
-		my @s =  Spot::prepare($r->[1], $r->[2], $r->[6], $comment, $r->[0]);
-
-		++$zone{$s[11]};		# save the spotter's zone
-		++$qrg{$s[0]};			# and the qrg
+		my $s = $r->[9];		# the prepared spot
+		$s->[3] = $comment;		# apply new generated comment
+		
+		
+		++$zone{$s->[11]};		# save the spotter's zone
+		++$qrg{$s->[0]};		# and the qrg
 
-		# save the highest strength one
-		if ($r->[4] < $strength) {
-			$strength = $r->[4];
-			$saver = \@s;
-			dbg("RBN: STRENGTH call: $s[1] qrg: $s[0] origin: $s[4] dB: $r->[4]") if isdbg 'rbn';
-		}
  
-		my $filter = 0;
-
-		if ($dxchan->{rbnfilter}) {
-			($filter, undef) = $dxchan->{rbnfilter}->it(\@s);
-			next unless $filter;
-			$saver = \@s;
-			dbg("RBN: FILTERED call: $s[1] qrg: $s[0] origin: $s[4] dB: $r->[4]") if isdbg 'rbn';
+		my $want = 0;
+		my $rf = $dxchan->{rbnfilter} || $dxchan->{spotsfilter};
+		if ($rf) {
+			($want, undef) = $rf->it($s);
+			next unless $want;
+			$saver = $s;
+			dbg("RBN: FILTERED call: $s->[1] qrg: $s->[0] origin: $s->[4] dB: $r->[4]") if isdbg 'rbn';
 			last;
 		}
 
+		# save the lowest strength one
+		if ($r->[4] < $strength) {
+			$strength = $r->[4];
+			$saver = $s;
+			dbg("RBN: STRENGTH call: $s->[1] qrg: $s->[0] origin: $s->[4] dB: $r->[4]") if isdbg 'rbn';
+		}
 	}
 
 	if ($saver) {
@@ -431,16 +487,24 @@ sub dx_spot
 		
 		dbg("RBN: SENDING call: $saver->[1] qrg: $saver->[0] origin: $saver->[4] $saver->[3]") if isdbg 'rbn';
 		if ($dxchan->{ve7cc}) {
-			my $call = $saver->[1];
-			$saver->[1] .= '-#';
+			my $call = $saver->[4];
+			$saver->[4] .= '-#';
 			$buf = VE7CC::dx_spot($dxchan, @$saver);
-			$saver->[1] = $call;
+			$saver->[4] = $call;
 		} else {
+			my $call = $saver->[4];
+			$saver->[4] = substr($call, 0, 6);
+			$saver->[4] .= '-#';
 			$buf = $dxchan->format_dx_spot(@$saver);
+			$saver->[4] = $call;
 		}
-		$buf =~ s/^DX/RB/;
+#		$buf =~ s/^DX/RB/;
 		$dxchan->local_send('N', $buf);
 
+		++$self->{nospot};
+		++$self->{nospot10};
+		++$self->{nospothour};
+		
 		if ($qra) {
 			my $user = DXUser::get_current($saver->[1]) || DXUser->new($saver->[1]);
 			unless ($user->qra && is_qra($user->qra)) {