get regex for pc9[2] right in handle_18

[spider.git] / perl / DXProtHandle.pm

diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index a91c3ce63df5535f803fe90b860e5499cba44b76..241b7c3a4b316b33e229f8f13004e4bcba0a305d 100644 (file)
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -558,6 +558,11 @@ sub handle_17
                }
        }
 
+       if (DXChannel::get($ucall)) {
+               dbg("PCPROT: trying do disconnect local user, ignored") if isdbg('chanerr');
+               return;
+       }
+
        # input filter if required and then remove user if present
        if ($parent) {
 #              return unless $self->in_filter_route($parent);  
@@ -600,9 +605,9 @@ sub handle_18
                        $self->user->put;
                        $self->sort('S');
                }
-               $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml\b/;
-               my ($pc9x) = $_[1] =~ /\bpc9\[(\d+)\]\b/;
-               $self->{do_pc92}++ if (defined $pc9x && $pc9x =~ /2/) || $_[1] =~ /\bpc92\b/;
+               $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/;
+               my ($pc9x) = $_[1] =~ /\bpc9\[(\d+)\]/;
+               $self->{do_pc92}++ if defined $pc9x && $pc9x =~ /2/;
        } else {
                $self->version(50.0);
                $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
@@ -763,7 +768,7 @@ sub handle_19
                $self->route_pc19($self->{call}, $line, @rout);
        }
        if (@pc92out) {
-#              $self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal';
+               $self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal';
        }
 }
                
@@ -1354,7 +1359,7 @@ sub _add_thingy
 {
        my $parent = shift;
        my $s = shift;
-       my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+       my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
        my @rout;
 
        if ($call) {
@@ -1371,7 +1376,7 @@ sub _del_thingy
 {
        my $parent = shift;
        my $s = shift;
-       my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s);
+       my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s;
        my @rout;
        if ($call) {
                if ($is_node) {
@@ -1440,7 +1445,7 @@ sub handle_92
        my $t = $_[2];
        my $sort = $_[3];
        
-       my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_];
+       my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
        
        if ($pcall eq $main::mycall) {
                dbg("PCPROT: looped back, ignored") if isdbg('chanerr');
@@ -1458,13 +1463,18 @@ sub handle_92
 
                # look at the first one which will always be a node of some sort
                # and update any information that needs to be done. 
-               my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($ent[0]);
+               my ($call, $is_node, $is_extnode, $here, $version, $build) = @{$ent[0]}; 
                if ($call && $is_node) {
                        if ($call eq $main::mycall) {
                                dbg("PCPROT: looped back on node entry, ignored") if isdbg('chanerr');
                                return;
                        }
                        if ($is_extnode) {
+                               # this is only accepted from my "self"
+                               if (DXChannel::get($call) && $call ne $self->{call}) {
+                                       dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr');
+                                       return;
+                               }
                                # reparent to external node (note that we must have received a 'C' or 'A' record
                                # from the true parent node for this external before we get one for the this node
                                unless ($parent = Route::Node::get($call)) {
@@ -1485,25 +1495,36 @@ sub handle_92
                shift @ent;
        }
 
+       # do a pass through removing any references to either locally connected nodes or mycall
+       my @nent;
+       for (@ent) {
+               next unless $_;
+               if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) {
+                       dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr');
+                       next;
+               } 
+               push @nent, $_;
+       }
+
        my (@radd, @rdel);
        
        if ($sort eq 'A') {
-               for (@ent) {
+               for (@nent) {
                        push @radd, _add_thingy($parent, $_);
                }
        } elsif ($sort eq 'D') {
-               for (@ent) {
+               for (@nent) {
                        push @rdel, _del_thingy($parent, $_);
                }
        } elsif ($sort eq 'C') {
                my (@nodes, @users);
-               for (@ent) {
-                       my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
-                       if ($call) {
-                               if ($is_node) {
-                                       push @nodes, $call;
+               foreach my $r (@nent) {
+#                      my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);                     
+                       if ($r->[0]) {
+                               if ($r->[1]) {
+                                       push @nodes, $r->[0];
                                } else {
-                                       push @users, $call;
+                                       push @users, $r->[0];
                                }
                        } else {
                                dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); 
@@ -1512,11 +1533,11 @@ sub handle_92
 
                my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users);
 
-               for (@ent) {
-                       my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
+               foreach my $r (@nent) {
+                       my $call = $r->[0];
                        if ($call) {
-                               push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers);
-                               push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers);
+                               push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
+                               push @rdel,_del_thingy($parent, $r) if grep $call eq $_, (@$dnodes, @$dusers);
                        }
                }
        } else {