X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=256eb9c76235c141d1810b423e744f5b55670739;hb=0bd9d2811cc42417676a1b11b121681c2377d70a;hp=710a3dbf84129a4b0405fc92597c8ff2cd7e2161;hpb=638d9efe6fe3d3c4eec08d5e985fce4dd760423b;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 710a3dbf..256eb9c7 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -27,11 +27,9 @@ use Local;
 use DXDb;
 use Time::HiRes qw(gettimeofday tv_interval);
 
-use Carp;
-
 use strict;
 use vars qw($me $pc11_max_age $pc23_max_age $pc11_dup_age $pc23_dup_age
-			%spotdup %wwvdup $last_hour %pings %rcmds
+			%spotdup %wwvdup $last_hour %pings %rcmds $pc11duptext
 			%nodehops @baddx $baddxfn $pc12_dup_age
 			%anndup $allowzero $pc12_dup_lth $decode_dk0wcy);
 
@@ -43,6 +41,8 @@ $pc11_dup_age = 3*3600;			# the maximum time to keep the spot dup list for
 $pc23_dup_age = 3*3600;			# the maximum time to keep the wwv dup list for
 $pc12_dup_age = 24*3600;		# the maximum time to keep the ann dup list for
 $pc12_dup_lth = 60;				# the length of ANN text to save for deduping 
+$pc11duptext = 27;				# maximum lth of the text field in PC11 to use for duduping
+
 %spotdup = ();				    # the pc11 and 26 dup hash 
 %wwvdup = ();				    # the pc23 and 27 dup hash
 %anndup = ();                               # the PC12 dup hash
@@ -79,7 +79,8 @@ sub init
 	# now prime the wwv duplicates file with just this month's data
 	my @wwv = Geomag::readfile(time);
 	for (@wwv) {
-		my $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]";
+		my $duptext = substr $_->[3], 0, $pc11duptext;
+		my $dupkey = "$_->[1].$_->[2]$duptext$_->[4]";
 		$wwvdup{$dupkey} = $_->[1];
 	}
 
@@ -238,7 +239,8 @@ sub normal
 			
 			# do some de-duping
 			my $freq = $field[1] - 0;
-			my $dupkey = "$freq$field[2]$d$text$spotter";
+			my $duptext = substr $text, 0, $pc11duptext;
+			my $dupkey = "$freq$field[2]$d$duptext$spotter";
 			if ($spotdup{$dupkey}) {
 				dbg('chan', "Duplicate Spot ignored\n");
 				return;
@@ -657,7 +659,7 @@ sub normal
 		}
 		
 		if ($pcno == 39) {		# incoming disconnect
-			$self->disconnect();
+			$self->disconnect(1);
 			return;
 		}
 		
@@ -688,7 +690,7 @@ sub normal
 		if ($pcno == 43) {
 			last SWITCH;
 		}
-		if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) {
+		if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) {
 			DXDb::process($self, $line);
 			return;
 		}
@@ -776,7 +778,7 @@ sub process
 		
 		# send a pc50 out on this channel
 		if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
-			$dxchan->send(pc50());
+			$dxchan->send(pc50(scalar DXChannel::get_all_users));
 			$dxchan->pc50_t($t);
 		} 
 
@@ -844,6 +846,9 @@ sub finish
 	# now broadcast to all other ak1a nodes that I have gone
 	broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
 
+	# I was the last node visited
+    $self->user->node($main::mycall);
+
 	# send info to all logged in thingies
 	$self->tell_login('logoutn');