various DXCluster->get alterations

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 58dfd4973877731827c87d9695274917f0b3f13c..ed5e417150724e9c1bb91ce75efeee1a4de2cba8 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -104,9 +104,10 @@ sub normal
                                
                                # yes, it is
                                my $text = unpad($field[3]);
+                               Log('talk', $call, $field[1], $field[6], $text);
+                               $call = $main::myalias if $call eq $main::mycall;
                                my $ref = DXChannel->get($call);
                                $ref->send("$call de $field[1]: $text") if $ref;
-                               Log('talk', $call, $field[1], $field[6], $text);
                        } else {
                                route($field[2], $line); # relay it on its way
                        }
@@ -294,7 +295,11 @@ sub normal
                }
                
                if ($pcno == 22) {
-                       last SWITCH;
+                       $self->state('normal');
+                       
+                       # queue mail
+                       DXMsg::queue_msg();
+                       return;
                }
                
                if ($pcno == 23 || $pcno == 27) { # WWV info