more pc41 hardening

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index a1e552f7620097ce70eaa4e7513191b5ca47f2d2..d8e9f2f78e8f341ebfe3525e004b56b0ac347cc9 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -540,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');
@@ -574,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;
@@ -590,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;
 }
@@ -1155,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;
@@ -1173,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');