X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=96d6c353317b6835bdef03fe89b4d6c10b0ee2c2;hb=cf0e4eb14cf2d18ce8012e20288f20abcbae665f;hp=aaa070480ac3808b65f8dab29ce342b42ae06f06;hpb=4fd5f55c3716bfef803aec68a4a632e220e54862;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index aaa07048..96d6c353 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -32,18 +32,12 @@ use DXHash;
 use Route;
 use Route::Node;
 use Script;
-use Investigate;
 use RouteDB;
 use DXProtHandle;
 
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
@@ -53,6 +47,8 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$eph_pc15_restime $pc92_update_period $last_pc92_update
 		   );
 
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc23
 
@@ -79,8 +75,8 @@ $chatdupeage = 20 * 60 * 60;
 $chatimportfn = "$main::root/chat_import";
 $investigation_int = 12*60*60;	# time between checks to see if we can see this node
 $pc19_version = 5466;			# the visible version no for outgoing PC19s generated from pc59
-$pc92_update_period = 60*60;	# the period between PC92 C updates
-$last_pc92_update = time;		# the last time a PC92 config update
+$pc92_update_period = 30*60;	# the period between PC92 C updates
+$last_pc92_update = time + int rand(180);		# the last time a PC92 config update
 
 
 @checklist = 
@@ -225,6 +221,8 @@ sub init
 	$main::me->{registered} = 1;
 	$main::me->{version} = $main::version;
 	$main::me->{build} = $main::build;
+	$main::me->{do_pc92} = 1;
+	$main::me->{via_pc92} = 1;
 }
 
 #
@@ -434,8 +432,10 @@ sub process
 		import_chat();
 
 		if ($main::systime >= $last_pc92_update + $pc92_update_period) {
+			dbg("ROUTE: sending pc92 update") if isdbg('route');
 			send_pc92_update();
-			$last_pc92_update = $main::systime;
+			time_out_pc92_routes();
+			$last_pc92_update = $main::systime + int rand(180);
 		}
 		
 		$last10 = $t;
@@ -779,17 +779,16 @@ sub gen_pc92_update
 	my $node;
 	my @lines;
 	
-	dbg('DXProt::send_pc92_update') if isdbg('trace');
+	dbg('DXProt::gen_pc92_update') if isdbg('trace');
 
 	# send 'my' configuration for all users and pc92 capable nodes
 	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
 	my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-#	push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
 	push @lines, pc92c($main::routeroot, @localnodes);
 
 
 	if ($with_pc92_nodes) {
-		# send out the configuration of all the PC92 nodes with current configuration
+		# send out the configuration of all the directly connected PC92 nodes with current configuration
 		# but with the dates that the last config came in with.
 		@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes();
 		@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
@@ -801,7 +800,7 @@ sub gen_pc92_update
 		}
 	}
 	
-	# send the configuration of all the 'external' nodes that don't handle PC92
+	# send the configuration of all the directly connected 'external' nodes that don't handle PC92
 	# out with the 'external' marker on the first node.
 	@dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes();
 	@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
@@ -835,10 +834,38 @@ sub send_pc92_update
 	
 	# broadcast the lines to all PC92 nodes
 	for (@out) {
-		$main::me->broadcast_route_pc9x('', undef, $_, 0);
+		$main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
 	}
 } 
 
+sub time_out_pc92_routes
+{
+	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
+	my @rdel;
+	foreach my $n (@nodes) {
+		my $o = $n->dec_obs;
+		if ($o <= 0) {
+			if (my $dxchan = DXChannel::get($n->call)) {
+				dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+				$dxchan->disconnect;
+				next;
+			}
+			my @parents = map {Route::Node::get($_)} $n->parents;
+			for (@parents) {
+				if ($_) {
+					dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+					push @rdel, $n->del($_);
+				}
+			}
+		} else {
+			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+		}
+	}
+	for (@rdel) {
+		$main::me->route_pc21($main::mycall, undef, $_) if $_;
+	}
+}
+
 #
 # route a message down an appropriate interface for a callsign
 #
@@ -1206,15 +1233,15 @@ sub broadcast_route_pc9x
 	my @dxchan = DXChannel::get_all_nodes();
 	my $dxchan;
 
-	if ($origin eq $main::mycall) {
+	if ($origin eq $main::mycall && $generate && !$line) {
 		$line = &$generate(@_);
 	} 
 
 	$line =~ /\^H(\d+)\^\~?$/;
 	unless ($1 > 0 && $self->{isolate}) {
 		foreach $dxchan (@dxchan) {
-			next if $dxchan == $self;
-			next if $dxchan == $main::me;
+			next if $dxchan == $self || $dxchan == $main::me;
+			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
 			next unless $dxchan->{do_pc92};
 			next unless $dxchan->isa('DXProt');