X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=9736379197f774b7d1653458c46d2aa41a07aee3;hb=ef2bc0f99b5022339b14dcc56f49547220b79f11;hp=ba4f21d94f71bfbe98211a6c2775face7c245f9f;hpb=a313d9c8eb2ea8bbdbe9b5d6e49583d0d422a621;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index ba4f21d9..97363791 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -50,6 +50,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$investigation_int $pc19_version $myprot_version
 			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
 			$allowzero $decode_dk0wcy $send_opernam @checklist
+			$eph_pc15_restime
 		   );
 
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -70,6 +71,7 @@ $ann_to_talk = 1;
 $rspfcheck = 1;
 $eph_restime = 180;
 $eph_info_restime = 60*60;
+$eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
@@ -771,9 +773,24 @@ sub send_pc92_config
 	dbg('DXProt::send_pc92_config') if isdbg('trace');
 
 	# send 'my' configuration for all users and pc92 capable nodes
-	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $self->{do_pc92} } DXChannel::get_all();
+	my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
 	my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-	$self->send_route_pc92($main::mycall, \&pc92c, scalar @localnodes, @localnodes);
+#	push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
+	$self->send_route_pc92($main::mycall, \&pc92c, (scalar @localnodes)+1, $main::routeroot, @localnodes);
+
+	# send out the configuration of all the 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;
+	foreach $node (@localnodes) {
+		if ($node && $node->lastid->{92}) {
+			my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
+			my $line = gen_pc29_with_time($node->call, 'C', $node->lastid->{92}, @rout);
+			$self->send($line);
+		} else {
+			dbg("sent a null value") if isdbg('chanerr');
+		}
+	}
 
 	# send the configuration of all the 'external' nodes that don't handle PC92
 	# out with the 'external' marker on the first node.
@@ -1027,7 +1044,7 @@ sub disconnect
 	# broadcast to all other nodes that all the nodes connected to via me are gone
 	unless ($pc39flag && $pc39flag == 2)  {
 		$self->route_pc21($main::mycall, undef, @rout) if @rout;
-		$self->route_pc92d($main::mycall, undef, $node) if $node;
+		$self->route_pc92d($main::mycall, undef, $main::routeroot, $node) if $node;
 	}
 
 	# remove outstanding pings