X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=a863b08a96701e02c288b2892704f8c82a0cda16;hb=da2c51a552ec4aba7af7696fa631324337286949;hp=18d7bdb5ae4bea70c4adfcea392b8e58a6f9aae4;hpb=a58b356bd36167baa576ac7a762abe8f9f4a86f9;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 18d7bdb5..a863b08a 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -41,10 +41,11 @@ 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
+			$next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug
 		   );
 
 $pc11_max_age = 1*3600;			# the maximum age for an incoming 'real-time' pc11
@@ -62,23 +63,23 @@ $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;
 $pingint = 5*60;
 $obscount = 2;
-$chatdupeage = 20 * 60 * 60;
+$chatdupeage = 20 * 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
+$pc92_update_period = 60*60;	# the period between outgoing PC92 C updates
 $pc92_short_update_period = 15*60; # shorten the update period after a connection
 %pc92_find = ();				# outstanding pc92 find operations
 $pc92_find_timeout = 30;		# maximum time to wait for a reply
-$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
-
+#$pc92_obs_timeout = $pc92_update_period; # the time between obscount countdowns
+$pc92_obs_timeout = 60*60; # the time between obscount for incoming countdowns
+$next_pc92_obs_timeout = $main::systime + 60*60; # the time between obscount countdowns
 
 
 @checklist =
@@ -209,6 +210,7 @@ sub update_pc92_next
 	my $self = shift;
 	my $period = shift || $pc92_update_period;
 	$self->{next_pc92_update} = $main::systime + $period - int rand($period / 4);
+	dbg("ROUTE: update_pc92_next: $self->{call} " . atime($self->{next_pc92_update})) if isdbg('obscount');
 }
 
 sub init
@@ -341,7 +343,7 @@ sub start
 	$script->run($self) if $script;
 
 	# set next_pc92_update time for this node sooner
-	$self->update_pc92_next($pc92_short_update_period);
+	$self->update_pc92_next($self->{outbound} ? $pc92_short_update_period : $pc92_update_period);
 }
 
 #
@@ -351,7 +353,7 @@ sub start
 sub sendinit
 {
 	my $self = shift;
-	$self->send(pc18());
+	$self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
 }
 
 #
@@ -461,9 +463,9 @@ sub process
 		eph_clean();
 		import_chat();
 
-		if ($main::systime >= $pc92_obs_timeout) {
+		if ($main::systime >= $next_pc92_obs_timeout) {
 			time_out_pc92_routes();
-			$pc92_obs_timeout = $main::systime + $pc92_update_period;
+			$next_pc92_obs_timeout = $main::systime + $pc92_obs_timeout;
 		}
 
 		$last10 = $t;
@@ -475,11 +477,19 @@ sub process
 			# send out a PC92 config record if required for me and
 			# all my non pc9x dependent nodes.
 			if ($main::systime >= $dxchan->{next_pc92_update}) {
-				if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+				dbg("ROUTE: pc92 broadcast candidate: $dxchan->{call}") if isdbg('obscount');
+				if ($dxchan == $main::me || !$dxchan->{do_pc9x}) {
 					$dxchan->broadcast_pc92_update($dxchan->{call});
 				}
 			}
 		}
+
+		if ($pc92_slug_changes && $main::systime >= $last_pc92_slug + $pc92_slug_changes) {
+			my ($add, $del) = gen_pc92_changes();
+			$main::me->route_pc92d($main::mycall, undef, $main::routeroot, @$del) if @$del;
+			$main::me->route_pc92a($main::mycall, undef, $main::routeroot, @$add) if @$add;
+			clear_pc92_changes();
+		}
 	}
 
 	if ($main::systime - 3600 > $last_hour) {
@@ -624,6 +634,7 @@ sub send_announce
 	my $target = $_[6];
 	my $to = 'To ';
 	my $text = unpad($_[2]);
+	my $from = $_[0];
 
 	if ($_[3] eq '*') {	# sysops
 		$target = "SYSOP";
@@ -640,7 +651,7 @@ sub send_announce
 
 
 	# obtain country codes etc
-	my @a = Prefix::cty_data($_[0]);
+	my @a = Prefix::cty_data($from);
 	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
 		my ($filter, $hops) =
@@ -653,12 +664,21 @@ sub send_announce
 		}
 	}
 
-	if (AnnTalk::dup($_[0], $_[1], $_[2])) {
-		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-		return;
+	# 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) {
+				$dxchan->send($dxchan->msg('dup'));
+				return;
+			}
+		} else {
+			dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
-	Log('ann', $target, $_[0], $text);
+	Log('ann', $target, $from, $text);
 
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
@@ -672,7 +692,7 @@ sub send_announce
 	}
 }
 
-my $msgid = 0;
+my $msgid = int rand(1000);
 
 sub nextchatmsgid
 {
@@ -692,6 +712,7 @@ sub send_chat
 	my $target = $_[3];
 	my $text = unpad($_[2]);
 	my $ak1a_line;
+	my $from = $_[0];
 
 	# munge the group and recast the line if required
 	if ($target =~ s/\.LST$//) {
@@ -699,7 +720,7 @@ sub send_chat
 	}
 
 	# obtain country codes etc
-	my @a = Prefix::cty_data($_[0]);
+	my @a = Prefix::cty_data($from);
 	my @b = Prefix::cty_data($_[4]);
 	if ($self->{inannfilter}) {
 		my ($filter, $hops) =
@@ -712,13 +733,21 @@ sub send_chat
 		}
 	}
 
-	if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
-		dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-		return;
+	if (AnnTalk::dup($from, $target, $_[2], $main::systime + $chatdupeage)) {
+		my $dxchan = DXChannel::get($from);
+		if ($self == $main::me && $dxchan && $dxchan->is_user) {
+			if ($dxchan->priv < 5) {
+				$dxchan->send($dxchan->msg('dup'));
+				return;
+			}
+		} else {
+			dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+			return;
+		}
 	}
 
 
-	Log('chat', $target, $_[0], $text);
+	Log('chat', $target, $from, $text);
 
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
@@ -760,7 +789,21 @@ sub announce
 
 sub chat
 {
-	goto &announce;
+	my $self = shift;
+	my $line = shift;
+	my $isolate = shift;
+	my $to = shift;
+	my $target = shift;
+	my $text = shift;
+	my ($filter, $hops);
+
+	if ($self->{annfilter}) {
+		($filter, $hops) = $self->{annfilter}->it(@_);
+		return unless $filter;
+	}
+	if (($self->is_spider || $self->is_ak1a) && $_[1] ne $main::mycall) {
+		send_prot_line($self, $filter, $hops, $isolate, $line);
+	}
 }
 
 
@@ -800,13 +843,13 @@ sub send_local_config
 		my $node;
 		my @rawintcalls = map { $_->nodes } @localnodes if @localnodes;
 		my @intcalls;
-		for $node (@rawintcalls) {
-			push @intcalls, $node unless grep $node eq $_, @intcalls;
+		foreach $node (@rawintcalls) {
+			push @intcalls, $node if grep $_ && $node != $_, @intcalls;
 		}
 		my $ref = Route::Node::get($self->{call});
 		my @rnodes = $ref->nodes;
-		for $node (@intcalls) {
-			push @remotenodes, Route::Node::get($node) unless grep $node eq $_, @rnodes, @remotenodes;
+		foreach $node (@intcalls) {
+			push @remotenodes, Route::Node::get($node) if grep $_ && $node != $_, @rnodes, @remotenodes;
 		}
 		$self->send_route($main::mycall, \&pc19, scalar(@remotenodes), @remotenodes);
 	}
@@ -829,11 +872,12 @@ sub gen_my_pc92_config
 	my $node = shift;
 
 	if ($node->{call} eq $main::mycall) {
+		clear_pc92_changes();		# remove any slugged data, we are generating it as now
 		my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
 		dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
 		my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
 		dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-		return pc92c($main::routeroot, @localnodes);
+		return pc92c($node, @localnodes);
 	} else {
 		my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
 		return pc92c($node, @rout);
@@ -867,9 +911,13 @@ sub broadcast_pc92_update
 	my $self = shift;
 	my $call = shift;
 
-	dbg('DXProt::broadcast_pc92_update') if isdbg('trace');
+	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);
@@ -883,14 +931,14 @@ sub time_out_pc92_routes
 		my $o = $n->dec_obs;
 		if ($o <= 0) {
 			if (my $dxchan = DXChannel::get($n->call)) {
-				dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
+				dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
 				$dxchan->disconnect;
 				next;
 			}
 			my @parents = map {Route::Node::get($_)} $n->parents;
 			for (@parents) {
 				if ($_) {
-					dbg("deleting pc92 $_->{call} from $n->{call} on obscount")  if isdbg('obscount');
+					dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount")  if isdbg('obscount');
 					push @rdel, $n->del($_);
 				}
 			}
@@ -981,7 +1029,7 @@ sub adjust_hops
 	my $call = $self->{call};
 	my $hops;
 
-	if (($hops) = $s =~ /\^H(\d+)\^?~?$/o) {
+	if (($hops) = $s =~ /\^H([-\d]+)\^?~?$/o) {
 		my ($pcno) = $s =~ /^PC(\d\d)/o;
 		confess "$call called adjust_hops with '$s'" unless $pcno;
 		my $ref = $nodehops{$call} if %nodehops;
@@ -990,8 +1038,11 @@ sub adjust_hops
 			return "" if defined $newhops && $newhops == 0;
 			$newhops = $ref->{default} unless $newhops;
 			return "" if defined $newhops && $newhops == 0;
-			$newhops = $hops if !$newhops;
-			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops;
+			$newhops = $hops unless $newhops;
+			return "" unless $newhops > 0;
+			$s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops != $hops;
+		} else {
+			return "" unless $hops > 0;
 		}
 	}
 	return $s;
@@ -1121,16 +1172,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);
 
@@ -1138,12 +1179,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};
 
@@ -1156,6 +1191,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 && $pc39flag != 2) {
+		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;
+	}
 }
 
 
@@ -1190,6 +1262,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) {
@@ -1266,8 +1344,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, @_);
 		}
 	}
@@ -1510,18 +1589,15 @@ sub import_chat
 
 		foreach my $text (@msg) {
 			next unless $text && $text !~ /^\s*#/;
-			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP') {
-				my $sysopflag = $target eq 'SYSOP' ? '*' : ' ';
-				if ($target ne 'LOCAL') {
-					send_announce($main::me, pc12($main::mycall, $text, '*', $sysopflag), $main::mycall, '*', $text, $sysopflag, $main::mycall, '0');
-				} else {
-					Log('ann', 'LOCAL', $main::mycall, $text);
-					DXChannel::broadcast_list("To LOCAL de ${main::mycall}: $text\a", 'ann', undef, DXCommandmode->get_all());
-				}
+			if ($target eq 'ALL' || $target eq 'LOCAL' || $target eq 'SYSOP' || $target eq 'WX') {
+				my $sysop = uc $target eq 'SYSOP' ? '*' : ' ';
+				my $wx = uc $target eq 'WX' ? '1' : '0';
+				my $via = $target;
+				$via = '*' if $target eq 'ALL' || $target eq 'SYSOP';
+				Log('ann', $target, $main::mycall, $text);
+				$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
 			} else {
-				my $msgid = nextchatmsgid();
-				$text = "#$msgid $text";
-				send_chat($main::me, pc12($main::mycall, $text, '*', $target), $main::mycall, '*', $text, $target, $main::mycall, '0');
+				DXCommandmode::send_chats($main::me, $target, $text);
 			}
 		}
 	}