X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=938d0fbca136cb84aedd245e03c3ebc011ffc54f;hb=aeb4c8591de710bd8de14f33817d2f0aabbd5e28;hp=fcc30cfe2255ce9b71cf9db3d935b8b50b413e6d;hpb=2712b7f62c605559eba46781d793a63591a7d5d3;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index fcc30cfe..938d0fbc 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -423,6 +423,10 @@ sub handle_16
 	my $h;
 	$h = 1 if DXChannel::get($ncall);
 	RouteDB::update($ncall, $self->{call}, $h);
+	if ($h && $self->{call} ne $ncall) {
+		dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr');
+		return;
+	}
 
 	if (eph_dup($line)) {
 		dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
@@ -607,7 +611,10 @@ sub handle_18
 		}
 		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
 		my ($pc9x) = $_[1] =~ /\bpc9\[(\d+)\]/;
-		$self->{do_pc92}++ if defined $pc9x && $pc9x =~ /2/;
+		if (defined $pc9x) {
+			$self->{do_pc92}++ if $pc9x =~ /2/;
+			$self->{do_pc93}++ if $pc9x =~ /3/;
+		}
 	} else {
 		$self->version(50.0);
 		$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
@@ -764,7 +771,7 @@ sub handle_19
 	# but remember there will only be one (pair) these because any extras will be
 	# thrown away.
 	if (@rout) {
-		$self->route_pc21($self->{call}, $line, @rout);
+#		$self->route_pc21($self->{call}, $line, @rout);
 		$self->route_pc19($self->{call}, $line, @rout);
 	}
 	if (@pc92out) {
@@ -776,9 +783,15 @@ sub send_delayed_pc92
 {
 	my $self = shift;
 	
-	# send out delayed PC92 config for this node if it is external
-	my $line = $main::me->gen_my_pc92_config;
+	# send out new PC92 config to everyone else 
+	my $line = gen_my_pc92_config($main::me);
 	$self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
+
+	# if this is an external node then send out the external config
+	unless ($self->{do_pc92}) {
+		$line = gen_my_pc92_config(Route::Node::get($self->{call}));
+		$self->broadcast_route_pc9x($main::mycall, undef, $line, 0);
+	}
 }
 
 # send local configuration
@@ -881,19 +894,10 @@ sub handle_22
 			$self->disconnect;
 			return;
 		}
-#		my $ref = Route::Node::get($self->{call});
-#		if ($ref) {
-#			$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref);
-#		} else {
-#			dbg("PCPROT: disconnecting because pc92 for $self->{call} received") if isdbg('chanerr');
-#			$self->disconnect;
-#			return;
-#		}
-#	} else {
-		$self->send_delayed_pc92;
 	}
 	$self->{lastping} = 0;
 	$self->state('normal');
+	$self->send_delayed_pc92;
 }
 				
 # WWV info
@@ -1552,6 +1556,7 @@ sub handle_92
 			dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('route');
 		}
 
+		# 
 		foreach my $r (@nent) {
 #			my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);			
 			if ($r->[0]) {
@@ -1595,10 +1600,82 @@ sub handle_92
 	}
 	my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd;
 	my @pc16 = grep { $_ && $_->isa('Route::User') } @radd;
+	unshift @pc19, $parent if $self->{state} eq 'init92' && $oparent == $parent;
 	$self->route_pc19($pcall, undef, @pc19) if @pc19;
 	$self->route_pc16($pcall, undef, $parent, @pc16) if @pc16;
 }
 
+sub handle_93
+{
+	my $self = shift;
+	my $pcno = shift;
+	my $line = shift;
+	my $origin = shift;
+
+	$self->{do_pc93} ||= 1;
+
+	my $pcall = $_[1];
+	unless (is_callsign($pcall)) {
+		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
+		return;
+	}
+	my $t = $_[2];
+	my $parent = check_pc9x_t($pcall, $t, 93, 1) || return;
+
+	my $to = $_[3];
+	my $from = $_[4];
+	my $via = $_[5];
+	my $text = $_[6];
+
+	# will we allow it at all?
+	if ($censorpc) {
+		my @bad;
+		if (@bad = BadWords::check($text)) {
+			dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr');
+			return;
+		}
+	}
+	
+	# if this is a 'bad spotter' user then ignore it
+	my $nossid = $from;
+	$nossid =~ s/-\d+$//;
+	if ($badspotter->in($nossid)) {
+		dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+		return;
+	}
+
+	if (is_callsign($to)) {
+		# local talks 
+		my $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
+		$dxchan = DXChannel::get($to) unless $dxchan;
+		if ($dxchan && $dxchan->is_user) {
+			$dxchan->talk($from, $to, $via, $text);
+			return;
+		}
+
+		# convert to PC10 talks where appropriate
+		my $ref = Route::get($to);
+		if ($ref) {
+			my @dxchan = $ref->alldxchan;
+			for $dxchan (@dxchan) {
+				if ($dxchan->{do_pc93}) {
+					$dxchan->send($line);
+				} else {
+					$dxchan->talk($from, $to, $via, $text);
+				}
+			}
+			return;
+		}
+
+		# otherwise, drop through and allow it to be broadcast
+	} elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') {
+		# announces
+	} else {
+		# chat messages
+	}
+	$self->broadcast_route_pc9x($pcall, undef, $line, 0);
+}
+
 # if get here then rebroadcast the thing with its Hop count decremented (if
 # there is one). If it has a hop count and it decrements to zero then don't
 # rebroadcast it.
@@ -1617,8 +1694,19 @@ sub handle_default
 	if (eph_dup($line)) {
 		dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
 	} else {
-		unless ($self->{isolate}) {
-			DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+		if ($pcno >= 90) {
+			my $pcall = $_[1];
+			unless (is_callsign($pcall)) {
+				dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
+				return;
+			}
+			my $t = $_[2];
+			my $parent = check_pc9x_t($pcall, $t, $pcno, 1) || return;
+			$self->broadcast_route_pc9x($pcall, undef, $line, 0);
+		} else {
+			unless ($self->{isolate}) {
+				DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
+			}
 		}
 	}
 }