X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=d8e9f2f78e8f341ebfe3525e004b56b0ac347cc9;hb=38e5ac5a541f1bdf1f373d59cc3dcd0c993ae800;hp=44a1ecc25d01ced0e4e555fa70ee75d47e8e14f0;hpb=cbda6153fad2adddb58ee5a87f3981aa2ad754ad;p=spider.git

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 44a1ecc2..d8e9f2f7 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -105,6 +105,12 @@ sub handle_10
 	RouteDB::update($_[6], $self->{call});
 #	RouteDB::update($to, $_[6]);
 
+	# convert this to a PC93 and process it as such
+	$self->normal(pc93($to, $from, $via, $_[3], $_[6]));
+	return;
+	
+	# this is all redundant but kept for now for reference
+
 	# it is here and logged on
 	$dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall;
 	$dxchan = DXChannel::get($to) unless $dxchan;
@@ -534,27 +540,23 @@ sub handle_17
 
 	RouteDB::delete($ncall, $self->{call});
 
-	unless ($ncall eq $self->{call}) {
-		dbg("PCPROT: PC17 from non-local $ncall, ignored") if isdbg('chanerr');
-		return;
-	}
-
 	my $uref = Route::User::get($ucall);
 	unless ($uref) {
 		dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+		return;
 	}
 	my $parent = Route::Node::get($ncall);
 	unless ($parent) {
 		dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
+		return;
 	}			
 
-	$dxchan = $parent->dxchan if $parent;
+	$dxchan = DXChannel::get($ncall);
 	if ($dxchan && $dxchan ne $self) {
 		dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
 		return;
 	}
 
-	$dxchan = DXChannel::get($ncall);
 	unless ($dxchan) {
 		if ($parent->via_pc92) {
 			dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr');
@@ -568,12 +570,8 @@ sub handle_17
 	}
 
 	# input filter if required and then remove user if present
-	if ($parent) {
 #		return unless $self->in_filter_route($parent);	
-		$parent->del_user($uref) if $uref;
-	} else {
-		$parent = Route->new($ncall);  # throw away
-	}
+	$parent->del_user($uref);
 
 	# send info to all logged in thingies
 	$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
@@ -584,7 +582,6 @@ sub handle_17
 		return;
 	}
 
-	$uref = Route->new($ucall) unless $uref; # throw away
 	$self->route_pc17($origin, $line, $parent, $uref);
 #	$self->route_pc92d($main::mycall, undef, $parent, $uref) if $dxchan;
 }
@@ -611,7 +608,8 @@ sub handle_18
 		}
 		$self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
 		if ($_[1] =~ /\bpc9x/) {
-			$self->{do_pc9x}++;
+			$self->{do_pc9x} = 1;
+			dbg("Do px9x set on $self->{call}");
 		}
 	} else {
 		$self->version(50.0);
@@ -1148,15 +1146,22 @@ sub handle_41
 	$user = DXUser->new($call) unless $user;
 			
 	if ($_[2] == 1) {
+		if (($_[3] =~ /spotter/i || $_[3] =~ /self/i) && $user->name && $user->name ne $_[3]) {
+			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($_[3]);
 	} elsif ($_[2] == 2) {
 		$user->qth($_[3]);
 	} elsif ($_[2] == 3) {
 		if (is_latlong($_[3])) {
 			my ($lat, $long) = DXBearing::stoll($_[3]);
-			$user->lat($lat);
-			$user->long($long);
-			$user->qra(DXBearing::lltoqra($lat, $long));
+			$user->lat($lat) if $lat;
+			$user->long($long) if $long;
+			$user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra;
 		} else {
 			dbg('PCPROT: not a valid lat/long') if isdbg('chanerr');
 			return;
@@ -1166,8 +1171,8 @@ sub handle_41
 	} elsif ($_[2] == 5) {
 		if (is_qra(uc $_[3])) {
 			my ($lat, $long) = DXBearing::qratoll(uc $_[3]);
-			$user->lat($lat);
-			$user->long($long);
+			$user->lat($lat) if $lat && !$user->lat;
+			$user->long($long) if $long && !$user->long;
 			$user->qra(uc $_[3]);
 		} else {
 			dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr');
@@ -1462,8 +1467,6 @@ sub handle_92
 
 	my (@radd, @rdel);
 	
-	$self->{do_pc9x} ||= 1;
-
 	my $pcall = $_[1];
 	unless ($pcall) {
 		dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr');
@@ -1480,12 +1483,17 @@ sub handle_92
 
 	if ($pcall eq $self->{call} && $self->{state} eq 'init') {
 		$self->state('init92');
+		$self->{do_pc9x} = 1;
+		dbg("Do pc9x set on $pcall");
+	} 
+	unless ($self->{do_pc9x}) {
+		dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
+		return;
 	}
 
 	my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
 	my $oparent = $parent;
 	
-	$parent->lastid->{92} = $t;
 	$parent->do_pc9x(1);
 	$parent->via_pc92(1);
 
@@ -1610,7 +1618,7 @@ sub handle_93
 	my $line = shift;
 	my $origin = shift;
 
-	$self->{do_pc9x} ||= 1;
+#	$self->{do_pc9x} ||= 1;
 
 	my $pcall = $_[1];
 	unless (is_callsign($pcall)) {
@@ -1624,6 +1632,8 @@ sub handle_93
 	my $from = $_[4];
 	my $via = $_[5];
 	my $text = $_[6];
+	my $onode = $_[7];
+	$onode = $pcall if @_ <= 8;
 
 	# will we allow it at all?
 	if ($censorpc) {
@@ -1648,7 +1658,7 @@ sub handle_93
 		$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);
+			$dxchan->talk($from, $to, $via, $text, $onode);
 			return;
 		}
 
@@ -1660,7 +1670,7 @@ sub handle_93
 				if ($dxchan->{do_pc9x}) {
 					$dxchan->send($line);
 				} else {
-					$dxchan->talk($from, $to, $via, $text);
+					$dxchan->talk($from, $to, $via, $text, $onode);
 				}
 			}
 			return;