bit more sophisticated

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 41c38f1aea9fd62a850934ee882fccd79fadc265..4b32a7150c35440747ed1d8a0c8e4c8d75f0b356 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -235,6 +235,14 @@ sub new
        # add this node to the table, the values get filled in later
        my $pkg = shift;
        my $call = shift;
+
+       # if we have an entry already, then send a PC21 to all connect
+       # old style connections, because we are about to get the real deal
+       if (my $ref = Route::Node::get($call)) {
+               dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
+               my @rout = $ref->delete;
+               $self->route_pc21($main::mycall, undef, @rout) if @rout;
+       }
        $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
 
        return $self;
@@ -349,7 +357,7 @@ sub normal
        
        # process PC frames, this will fail unless the frame starts PCnn
        my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
-       unless (defined $pcno && $pcno >= 10 && $pcno <= 99) {
+       unless (defined $pcno && $pcno >= 10 && $pcno <= 89) { # reject PC9x messages
                dbg("PCPROT: unknown protocol") if isdbg('chanerr');
                return;
        }
@@ -739,7 +747,11 @@ sub handle_16
        }
        # is it me?
        if ($ncall eq $main::mycall) {
-               dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
+               dbg("PCPROT: trying to alter my config from outside!") if isdbg('chanerr');
+               return;
+       }
+       if (DXChannel::get($ncall) && $ncall ne $self->{call}) {
+               dbg("PCPROT: trying to alter locally connected $ncall from $self->{call}, ignored") if isdbg('chanerr');
                return;
        }
 
@@ -917,25 +929,23 @@ sub handle_17
        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;
        }
 
        # 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;
@@ -946,7 +956,6 @@ sub handle_17
                return;
        }
 
-       $uref = Route->new($ucall) unless $uref; # throw away
        $self->route_pc17($origin, $line, $parent, $uref);
 }
                
@@ -1478,6 +1487,10 @@ 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');
+                       return;
+               }
                $user->name($_[3]);
        } elsif ($_[2] == 2) {
                $user->qth($_[3]);