make sure we really do have a parent in PC16s

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index efa5ff9b57d5e058eb3ac64c3a727e4296044bda..2fe92625701aec7d7b57674acdc08adf3ca274ec 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -670,7 +670,7 @@ sub normal
                                                                $parent = Route::Node::get($_->[0]);
                                                                $dxchan = $parent->dxchan if $parent;
                                                                if ($dxchan && $dxchan ne $self) {
-                                                                       dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+                                                                       dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
                                                                        $parent = undef;
                                                                }
                                                                if ($parent) {
@@ -685,6 +685,10 @@ sub normal
                                                        # route the pc19 - this will cause 'stuttering PC19s' for a while
                                                        $self->route_pc19(@nrout) if @nrout ;
                                                        $parent = Route::Node::get($ncall);
+                                                       unless ($parent) {
+                                                               dbg("PCPROT: lost $ncall after sending PC19 for it?");
+                                                               return;
+                                                       }
                                                } else {
                                                        return;
                                                }
@@ -729,11 +733,12 @@ sub normal
                                my $flags = Route::here($here)|Route::conf($conf);
                                
                                if ($r) {
+                                       my $au = $r->addparent($parent);                                        
                                        if ($r->flags != $flags) {
                                                $r->flags($flags);
-                                               push @rout, $r;
+                                               $au = $r;
                                        }
-                                       $r->addparent($parent);
+                                       push @rout, $r if $au;
                                } else {
                                        push @rout, $parent->add_user($call, $flags);
                                }
@@ -1140,7 +1145,9 @@ sub normal
                if ($pcno == 41) {              # user info
                        my $call = $field[1];
 
-                       if (eph_dup($line, $eph_info_restime)) {
+                       my $l = $line;
+                       $l =~ s/[\x00-\x20\x7f-\xff]+//g; # remove all funny characters and spaces for dup checking
+                       if (eph_dup($l, $eph_info_restime)) {
                                dbg("PCPROT: dupe") if isdbg('chanerr');
                                return;
                        }
@@ -1893,8 +1900,8 @@ sub disconnect
                $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
        }
 
-       # get rid of any PC16/17/19/21s
-       eph_del_regex("^PC(?:1[679]|21).*$call");
+       # get rid of any PC16/17/19
+       eph_del_regex("^PC1[679]*$call");
 
        # do routing stuff, remove me from routing table
        my $node = Route::Node::get($call);
@@ -1905,7 +1912,7 @@ sub disconnect
                # and all my ephemera as well
                for (@rout) {
                        my $c = $_->call;
-                       eph_del_regex("^PC(?:1[679]|21).*$c");
+                       eph_del_regex("^PC1[679].*$c");
                }
        }
        
@@ -1919,7 +1926,7 @@ sub disconnect
                }
                
                # and the ephemera
-               eph_del_regex("^PC(?:1[679]|21).*$k");
+               eph_del_regex("^PC1[679].*$k");
        }
 
        # unbusy and stop and outgoing mail