X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=712b478539c79973e47895fdcfc17a98a97e5952;hb=efdf578cb0e69807c50a93427a34ab36a23f3823;hp=53695e51846a0bf140f75efe0ff3bf6cd42af065;hpb=e4a8ea5a407f640bc6e1efd6ef6b5f88f8f0980a;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 53695e51..712b4785 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -41,7 +41,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 			$last_hour $last10 %eph  %pings %rcmds $ann_to_talk
 			$pingint $obscount %pc19list $chatdupeage $chatimportfn
 			$investigation_int $pc19_version $myprot_version
-			%nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
+			%nodehops $baddx $badspotter $badnode $censorpc
 			$allowzero $decode_dk0wcy $send_opernam @checklist
 			$eph_pc15_restime $pc92_update_period $pc92_obs_timeout
 			%pc92_find $pc92_find_timeout $pc92_short_update_period
@@ -63,8 +63,7 @@ $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
 $ann_to_talk = 1;
-$rspfcheck = 1;
-$eph_restime = 180;
+$eph_restime = 60;
 $eph_info_restime = 60*60;
 $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
@@ -659,7 +658,8 @@ sub send_announce
 		}
 	}
 
-	if (AnnTalk::dup($from, $target, $_[2])) {
+	# the sysop ('*') thing is an attempt to minimise the damage caused by non-updated PC93 generators
+	if (AnnTalk::dup($from, $target, $_[2]) || ($_[3] eq '*' && AnnTalk::dup($from, 'ALL', $_[2]))) {
 		my $dxchan = DXChannel::get($from);
 		if ($self == $main::me && $dxchan && $dxchan->is_user) {
 			if ($dxchan->priv < 5) {
@@ -893,6 +893,10 @@ sub broadcast_pc92_update
 	dbg("ROUTE: broadcast_pc92_update $call") if isdbg('obscount');
 
 	my $nref = Route::Node::get($call);
+	unless ($nref) {
+		dbg("ERROR: broadcast_pc92_update - Route::Node $call disappeared");
+		return;
+	}
 	my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
 	$main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
 	$self->update_pc92_next($pc92_update_period);
@@ -1144,16 +1148,6 @@ sub disconnect
 
 	# do routing stuff, remove me from routing table
 	my $node = Route::Node::get($call);
-	my @rout;
-	if ($node) {
-		@rout = $node->del($main::routeroot);
-
-		# and all my ephemera as well
-		for (@rout) {
-			my $c = $_->call;
-			eph_del_regex("^PC1[679].*$c");
-		}
-	}
 
 	RouteDB::delete_interface($call);
 
@@ -1161,12 +1155,6 @@ sub disconnect
 	my $mref = DXMsg::get_busy($call);
 	$mref->stop_msg($call) if $mref;
 
-	# 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, $main::routeroot, $node) if $node;
-	}
-
 	# remove outstanding pings
 	delete $pings{$call};
 
@@ -1179,6 +1167,43 @@ sub disconnect
 	Log('DXProt', $call . " Disconnected");
 
 	$self->SUPER::disconnect;
+
+	# here we determine what needs to go out of the routing table
+	my @rout;
+	if ($node) {
+		dbg('%Route::Node::List = ' . join(',', sort keys %Route::Node::list)) if isdbg('routedisc');
+
+		@rout = $node->del($main::routeroot);
+
+		dbg('@rout = ' . join(',', sort map {$_->call} @rout)) if isdbg('routedisc');
+
+		# now we need to see what can't be routed anymore and came
+		# in via this node (probably).
+		my $n = 0;
+		while ($n != @rout) {
+			$n = @rout;
+			for (Route::Node::get_all()) {
+				unless ($_->dxchan) {
+					push @rout, $_->delete;
+				}
+			}
+			dbg('@rout = ' . join(',', sort map {$_->call} @rout)) if isdbg('routedisc');
+		}
+
+		dbg('%Route::Node::List = ' . join(',', sort keys %Route::Node::list)) if isdbg('routedisc');
+
+		# and all my ephemera as well
+		for (@rout) {
+			my $c = $_->call;
+			eph_del_regex("^PC1[679].*$c");
+		}
+	}
+
+	# 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, $main::routeroot, $node) if $node;
+	}
 }
 
 
@@ -1213,6 +1238,12 @@ sub send_route
 	for (; @_ && $no; $no--) {
 		my $r = shift;
 
+		# don't send messages with $self's call in back to them
+		if ($r->call eq $self->{call}) {
+			dbg("PCPROT: trying to send $self->{call} back itself") if isdbg('chanerr');
+			next;
+		}
+
 		if (!$self->{isolate} && $self->{routefilter}) {
 			$filter = undef;
 			if ($r) {
@@ -1289,8 +1320,9 @@ sub broadcast_route_nopc9x
 			next if $origin eq $dxchan->{call};	# don't route some from this call back again.
 			next unless $dxchan->isa('DXProt');
 			next if $dxchan->{do_pc9x};
-			next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
-
+			if ($generate == \&pc16 || $generate==\&pc17) {
+				next unless $dxchan->user->wantsendpc16;
+			}
 			$dxchan->send_route($origin, $generate, @_);
 		}
 	}
@@ -1541,7 +1573,7 @@ sub import_chat
 				Log('ann', $target, $main::mycall, $text);
 				$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
 			} else {
-				$main::me->send_chats($target, $text);
+				DXCommandmode::send_chats($main::me, $target, $text);
 			}
 		}
 	}