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

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index f4e4e0d5..96d6c353 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -432,6 +432,7 @@ sub process
 		import_chat();
 
 		if ($main::systime >= $last_pc92_update + $pc92_update_period) {
+			dbg("ROUTE: sending pc92 update") if isdbg('route');
 			send_pc92_update();
 			time_out_pc92_routes();
 			$last_pc92_update = $main::systime + int rand(180);
@@ -778,7 +779,7 @@ 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();
@@ -833,18 +834,19 @@ 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 {$_->do_pc92 || $_->via_pc92} Route::Node::get_all();
+	my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
 	my @rdel;
 	foreach my $n (@nodes) {
-		if ($n->dec_obs <= 0) {
+		my $o = $n->dec_obs;
+		if ($o <= 0) {
 			if (my $dxchan = DXChannel::get($n->call)) {
-				dbg("ROUTE: disconnecting local pc92 $_->{call} on obscount") if isdbg('route');
+				dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
 				$dxchan->disconnect;
 				next;
 			}
@@ -855,6 +857,8 @@ sub time_out_pc92_routes
 					push @rdel, $n->del($_);
 				}
 			}
+		} else {
+			dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
 		}
 	}
 	for (@rdel) {
@@ -1229,14 +1233,14 @@ 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 || $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');