X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=ecb6cfc638edad38d15fc4b509fb838cc748b595;hb=f7ce6f45eae627c1368ffea0e1e56e84fec676be;hp=c14c9bbefdc64879402412bac78f826e2a6ff374;hpb=6ea05be3ca5b4857bb319782c408d5784658ec20;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c14c9bbe..ecb6cfc6 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 = 20;				# 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
@@ -72,7 +72,8 @@ sub init
 	@today = Julian::sub(@today, 1);
 	push @spots, Spot::readfile(@today);
 	for (@spots) {
-		my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
+		my $duptext = length $_->[3] > $pc11duptext ? substr($_->[3], 0, $pc11duptext) : $_->[3] ;
+		my $dupkey = "$_->[0]$_->[1]$_->[2]$duptext$_->[4]";
 		$spotdup{$dupkey} = $_->[2];
 	}
 
@@ -126,18 +127,29 @@ sub start
 	$self->send_now('B',"0");
 	$self->send_now('E',"0");
 	
+	# ping neighbour node stuff
+	my $ping = $user->pingint;
+	$ping = 5*60 unless defined $ping;
+	$self->{pingint} = $ping;
+	$self->{nopings} = $user->nopings || 2;
+	$self->{pingtime} = [ ];
+	$self->{pingave} = 0;
+
 	# send initialisation string
-	if (!$self->{outbound}) {
+	unless ($self->{outbound}) {
 		$self->send(pc38()) if DXNode->get_all();
 		$self->send(pc18());
+		$self->{lastping} = $main::systime;
+	} else {
+		# remove from outstanding connects queue
+		@main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
+		$self->{lastping} = $main::systime + $self->pingint / 2;
 	}
 	$self->state('init');
 	$self->pc50_t(time);
-	$self->pingint($user->pingint || 3*60);
-	$self->nopings(3);
-	$self->lastping($main::systime);
-	$self->pingtime(0);
-	$self->pingrec(0);
+
+	# send info to all logged in thingies
+	$self->tell_login('loginn');
 
 	Log('DXProt', "$call connected");
 }
@@ -180,7 +192,7 @@ sub normal
 			
 			# is it for me or one of mine?
 			my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
-			if ($call eq $main::mycall || grep $_ eq $call, get_all_user_calls()) {
+			if ($call eq $main::mycall || grep $_ eq $call, DXChannel::get_all_user_calls()) {
 				
 				# yes, it is
 				my $text = unpad($field[3]);
@@ -219,6 +231,7 @@ sub normal
 			}
 
 			# strip off the leading & trailing spaces from the comment
+			my $duptext = length $field[5] > $pc11duptext ? substr($field[5], 0, $pc11duptext) : $field[5];
 			my $text = unpad($field[5]);
 			
 			# store it away
@@ -646,7 +659,7 @@ sub normal
 		}
 		
 		if ($pcno == 39) {		# incoming disconnect
-			$self->disconnect();
+			$self->disconnect(1);
 			return;
 		}
 		
@@ -677,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;
 		}
@@ -703,6 +716,7 @@ sub normal
 					# it's a reply, look in the ping list for this one
 					my $ref = $pings{$field[2]};
 					if ($ref) {
+						my $tochan =  DXChannel->get($field[2]);
 						while (@$ref) {
 							my $r = shift @$ref;
 							my $dxchan = DXChannel->get($r->{call});
@@ -710,14 +724,18 @@ sub normal
 							my $t = tv_interval($r->{t}, [ gettimeofday ]);
 							if ($dxchan->is_user) {
 								my $s = sprintf "%.2f", $t; 
-								$dxchan->send($dxchan->msg('pingi', $field[2], $s))
+								my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+								$dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
 							} elsif ($dxchan->is_ak1a) {
-								my $tochan =  DXChannel->get($field[2]);
 								if ($tochan) {
-									$tochan->nopings(3); # pump up the timer
-									$tochan->{pingtime} += $t;
-									$tochan->{pingrec} += 1;
-									$tochan->{pingave} = $tochan->{pingtime} / $tochan->{pingrec};
+									$tochan->{nopings} = 2; # pump up the timer
+									push @{$tochan->{pingtime}}, $t;
+									shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
+									my $st;
+									for (@{$tochan->{pingtime}}) {
+										$st += $_;
+									}
+									$tochan->{pingave} = $st / @{$tochan->{pingtime}};
 								}
 							} 
 						}
@@ -760,18 +778,18 @@ 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);
 		} 
 
 		# send a ping out on this channel
-		if ($t >= $dxchan->pingint + $dxchan->lastping) {
-			if ($dxchan->nopings <= 0) {
+		if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
+			if ($dxchan->{nopings} <= 0) {
 				$dxchan->disconnect;
 			} else {
 				addping($main::mycall, $dxchan->call);
-				$dxchan->nopings($dxchan->nopings - 1);
-				$dxchan->lastping($t);
+				$dxchan->{nopings} -= 1;
+				$dxchan->{lastping} = $t;
 			}
 		}
 	}
@@ -803,8 +821,11 @@ sub finish
 {
 	my $self = shift;
 	my $call = $self->call;
+	my $nopc39 = shift;
 	my $ref = DXCluster->get_exact($call);
 	
+	$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op"))) unless $nopc39;
+	
 	# unbusy and stop and outgoing mail
 	my $mref = DXMsg::get_busy($call);
 	$mref->stop_msg($call) if $mref;
@@ -824,7 +845,13 @@ 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');
+
 	Log('DXProt', $call . " Disconnected");
 	$ref->del() if $ref;
 }
@@ -1056,7 +1083,7 @@ sub broadcast_ak1a
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = get_all_ak1a();
+	my @dxchan = DXChannel::get_all_ak1a();
 	my $dxchan;
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1073,7 +1100,7 @@ sub broadcast_all_ak1a
 {
 	my $s = shift;				# the line to be rebroadcast
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = get_all_ak1a();
+	my @dxchan = DXChannel::get_all_ak1a();
 	my $dxchan;
 	
 	# send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1092,7 +1119,7 @@ sub broadcast_users
 	my $sort = shift;           # the type of transmission
 	my $fref = shift;           # a reference to an object to filter on
 	my @except = @_;			# to all channels EXCEPT these (dxchannel refs)
-	my @dxchan = get_all_users();
+	my @dxchan = DXChannel::get_all_users();
 	my $dxchan;
 	my @out;
 	
@@ -1133,43 +1160,6 @@ sub broadcast_list
 	}
 }
 
-#
-# gimme all the ak1a nodes
-#
-sub get_all_ak1a
-{
-	my @list = DXChannel->get_all();
-	my $ref;
-	my @out;
-	foreach $ref (@list) {
-		push @out, $ref if $ref->is_ak1a;
-	}
-	return @out;
-}
-
-# return a list of all users
-sub get_all_users
-{
-	my @list = DXChannel->get_all();
-	my $ref;
-	my @out;
-	foreach $ref (@list) {
-		push @out, $ref if $ref->is_user;
-	}
-	return @out;
-}
-
-# return a list of all user callsigns
-sub get_all_user_calls
-{
-	my @list = DXChannel->get_all();
-	my $ref;
-	my @out;
-	foreach $ref (@list) {
-		push @out, $ref->call if $ref->is_user;
-	}
-	return @out;
-}
 
 #
 # obtain the hops from the list for this callsign and pc no