X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=21f94aae8a66835da46f3d33e1e0de3d64733b34;hb=9b65e70322b24190bb5f677ccedcc000ab4625d2;hp=213e9b4008053d0d7eeb2efdfb1838f2f3c7730e;hpb=67e8ed5e4e28a5af4cec3bc1b43ce97ef51c90be;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 213e9b40..21f94aae 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -49,7 +49,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
 
 $pc9x_dupe_age = 60;			# catch loops of circular (usually) D records
 $pc10_dupe_age = 45;			# just something to catch duplicate PC10->PC93 conversions
-$pc92_slug_changes = 60;		# slug any changes going outward for this long
+$pc92_slug_changes = 60*5;		# slug any changes going outward for this long
 $last_pc92_slug = 0;			# the last time we sent out any delayed add or del PC92s
 $pc9x_time_tolerance = 15*60;	# the time on a pc9x is allowed to be out by this amount
 $pc9x_past_age = (122*60)+		# maximum age in the past of a px9x (a config record might be the only
@@ -1137,6 +1137,16 @@ sub handle_41
 		return;
 	}
 
+	if ($call eq $main::mycall && $call eq $main::myalias) {
+		dbg "DXPROT: PC41 trying to update $call from outside via $origin, ignored";
+		return;
+	}
+	my $chan = DXChannel::get($call);
+	if ($chan) {
+		dbg "DXPROT: PC41 trying to update online $call from outside via $origin, ignored";
+		return;
+	}
+
 	# add this station to the user database, if required
 	my $user = DXUser::get_current($call);
 	$user = DXUser->new($call) unless $user;
@@ -1144,9 +1154,6 @@ sub handle_41
 	if ($sort == 1) {
 		if (($val =~ /spotter/i || $val =~ /self/i) && $user->name && $user->name ne $val) {
 			dbg("PCPROT: invalid name") if isdbg('chanerr');
-			if ($main::mycall eq 'GB7DJK' || $main::mycall eq 'GB7BAA' || $main::mycall eq 'WR3D') {
-				DXChannel::broadcast_nodes(pc41($_[1], 1, $user->name)); # send it to everyone including me
-			}
 			return;
 		}
 		$user->name($val);
@@ -1993,8 +2000,8 @@ sub handle_93
 		$self->send_announce(1, pc12($from, $text, $local, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef);
 		return if $via eq 'LOCAL';
 	} elsif (!is_callsign($to) && $text =~ /^#\d+ /) {
-		# chat messages to non-pc9x nodes
-		$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
+		# chat messages really only locally connected users
+		$self->send_chat(1, $line, $from, '*', $text, $to, $pcall, '0');
 	}
 
 	# broadcast this chat sentence everywhere unless it is targetted to 'LOCAL'