attempt to avoid %FA characters in incoming data

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 78e0e0d1262a984052057cd3f872bf546b358394..30b1b27899a773acd6c12930719acf8e6377d73c 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -421,7 +421,7 @@ sub normal
                                
                                # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect)
                                my $mref = DXMsg::get_busy($call);
-                               $mref->stop_msg($self) if $mref;
+                               $mref->stop_msg($call) if $mref;
                                
                                # add this station to the user database, if required (don't remove SSID from nodes)
                                my $user = DXUser->get_current($call);
@@ -437,8 +437,6 @@ sub normal
                                $user->put;
                        }
                        
-                       # queue up any messages
-                       DXMsg::queue_msg(0) if $self->state eq 'normal';
                        return if $newline eq "PC19^";
 
                        # add hop count 
@@ -451,10 +449,6 @@ sub normal
                        $self->send_local_config();
                        $self->send(pc22());
                        $self->state('normal');
-                       
-                       # queue mail
-                       DXMsg::queue_msg(0);
-
                        return;
                }
                
@@ -483,12 +477,9 @@ sub normal
                
                if ($pcno == 22) {
                        $self->state('normal');
-                       
-                       # queue mail
-                       DXMsg::queue_msg(0);
                        return;
                }
-               
+                               
                if ($pcno == 23 || $pcno == 27) { # WWV info
                        
                        # route 'foreign' pc27s 
@@ -772,7 +763,7 @@ sub finish
        
        # unbusy and stop and outgoing mail
        my $mref = DXMsg::get_busy($call);
-       $mref->stop_msg($self) if $mref;
+       $mref->stop_msg($call) if $mref;
        
        # broadcast to all other nodes that all the nodes connected to via me are gone
        my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();