added show sun

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c039659bd96dbfab15373c542cf92578f449e503..d9b03a907d1768420574dcb9ffb51e19266cc983 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -24,6 +24,7 @@ use DXProtout;
 use DXDebug;
 use Filter;
 use Local;
+use DXDb;
 
 use Carp;
 
@@ -181,7 +182,7 @@ sub normal
                                my $ref = DXChannel->get($call);
                                $ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
                        } else {
-                               route($field[2], $line); # relay it on its way
+                               $self->route($field[2], $line); # relay it on its way
                        }
                        return;
                }
@@ -191,7 +192,7 @@ sub normal
                        # route 'foreign' pc26s 
                        if ($pcno == 26) {
                                if ($field[7] ne $main::mycall) {
-                                       route($field[7], $line);
+                                       $self->route($field[7], $line);
                                        return;
                                }
                        }
@@ -267,7 +268,7 @@ sub normal
                if ($pcno == 12) {              # announces
                        # announce duplicate checking
                        my $text = substr(uc unpad($field[3]), 0, $pc12_dup_lth);
-                       my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
+                       my $dupkey = $field[1].$field[2].$text;
                        if ($anndup{$dupkey}) {
                                dbg('chan', "Duplicate Announce ignored\n");
                                return;
@@ -291,11 +292,11 @@ sub normal
                                if ($decode_dk0wcy && $field[1] eq $decode_dk0wcy) {
                                        my ($hour, $k, $next, $a, $r, $sfi, $alarm) = $field[3] =~ /^Aurora Beacon\s+(\d+)UTC,\s+Kiel\s+K=(\d+),.*ed\s+K=(\d+),\s+A=(\d+),\s+R=(\d+),\s+SFI=(\d+),.*larm:\s+(\w+)/;
                                        $alarm = ($alarm =~ /^Y/i) ? ', Aurora in DE' : ''; 
-                                       my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
+                                       my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r) if $sfi && $r;
                                }
                                
                        } else {
-                               route($field[2], $line);
+                               $self->route($field[2], $line);
                        }
                        
                        return;
@@ -498,7 +499,7 @@ sub normal
                        # route 'foreign' pc27s 
                        if ($pcno == 27) {
                                if ($field[8] ne $main::mycall) {
-                                       route($field[8], $line);
+                                       $self->route($field[8], $line);
                                        return;
                                }
                        }
@@ -548,7 +549,7 @@ sub normal
                
                if ($pcno == 25) {      # merge request
                        if ($field[1] ne $main::mycall) {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                                return;
                        }
                        if ($field[2] eq $main::mycall) {
@@ -582,7 +583,7 @@ sub normal
                        if ($pcno == 49 || $field[1] eq $main::mycall) {
                                DXMsg::process($self, $line);
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -612,7 +613,7 @@ sub normal
                                        $self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
                                }
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -626,7 +627,7 @@ sub normal
                                        delete $rcmds{$field[2]} if !$dxchan;
                                }
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -670,11 +671,7 @@ sub normal
                        last SWITCH;
                }
                if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47) {
-                       if ($field[1] eq $main::mycall) {
-                               ;
-                       } else {
-                               route($field[1], $line);
-                       }
+                       DXDb::process($self, $line);
                        return;
                }
                
@@ -699,15 +696,17 @@ sub normal
                                        # it's a reply, look in the ping list for this one
                                        my $ref = $pings{$field[2]};
                                        if ($ref) {
-                                               my $r = shift @$ref;
-                                               my $dxchan = DXChannel->get($r->{call});
-                                               $dxchan->send($dxchan->msg('pingi', $field[2], atime($main::systime), $main::systime - $r->{t})) if $dxchan;
+                                               while (@$ref) {
+                                                       my $r = shift @$ref;
+                                                       my $dxchan = DXChannel->get($r->{call});
+                                                       $dxchan->send($dxchan->msg('pingi', $field[2], atime($main::systime), $main::systime - $r->{t})) if $dxchan;
+                                               }
                                        }
                                }
                                
                        } else {
                                # route down an appropriate thingy
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
                        }
                        return;
                }
@@ -721,7 +720,7 @@ sub normal
         #        REBROADCAST!!!!
         #
         
-       if (!$self->{isolate}) {
+       unless ($self->{isolate}) {
                broadcast_ak1a($line, $self); # send it to everyone but me
        }
 }
@@ -744,7 +743,7 @@ sub process
                if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
                        $dxchan->send(pc50());
                        $dxchan->pc50_t($t);
-               }
+               } 
        }
        
        my $key;
@@ -1003,9 +1002,13 @@ sub send_local_config
 #
 sub route
 {
-       my ($call, $line) = @_;
+       my ($self, $call, $line) = @_;
        my $cl = DXCluster->get_exact($call);
-       if ($cl) {
+       if ($cl) {       # don't route it back down itself
+               if (ref $self && $call eq $self->{call}) {
+                       dbg('chan', "Trying to route back to source, dropped");
+                       return;
+               }
                my $hops;
                my $dxchan = $cl->{dxchan};
                if ($dxchan) {
@@ -1212,7 +1215,7 @@ sub addping
        my $r = {};
        $r->{call} = $from;
        $r->{t} = $main::systime;
-       route($to, pc51($to, $main::mycall, 1));
+       route(undef, $to, pc51($to, $main::mycall, 1));
        push @$ref, $r;
 }
 
@@ -1224,7 +1227,7 @@ sub addrcmd
        $r->{call} = $from;
        $r->{t} = $main::systime;
        $r->{cmd} = $cmd;
-       route($to, pc34($main::mycall, $to, $cmd));
+       route(undef, $to, pc34($main::mycall, $to, $cmd));
        $rcmds{$to} = $r;
 }
 1;