made the censoring of PC10,11,12 optional with $censorpc = 0
[spider.git] / perl / DXProt.pm
index 16b67023a7f09d579ff8bfd01ac2246f3188f74a..60e0391f2e34e7e3bb73a061e40b7d0b274a9ea6 100644 (file)
@@ -24,31 +24,149 @@ use DXProtout;
 use DXDebug;
 use Filter;
 use Local;
-
-use Carp;
+use DXDb;
+use AnnTalk;
+use Geomag;
+use WCY;
+use Time::HiRes qw(gettimeofday tv_interval);
+use BadWords;
 
 use strict;
-use vars qw($me $pc11_max_age $pc11_dup_age $pc23_dup_age 
-                       %spotdup %wwvdup $last_hour %pings %rcmds 
-                       %nodehops @baddx $baddxfn $pc12_dup_age
-                       %anndup $allowzero);
+use vars qw($me $pc11_max_age $pc23_max_age
+                       $last_hour %pings %rcmds
+                       %nodehops @baddx $baddxfn $censorpc
+                       $allowzero $decode_dk0wcy $send_opernam @checklist);
 
 $me = undef;                                   # the channel id for this cluster
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
-$pc11_dup_age = 24*3600;               # the maximum time to keep the spot dup list for
-$pc23_dup_age = 24*3600;               # the maximum time to keep the wwv dup list for
-$pc12_dup_age = 24*3600;               # the maximum time to keep the ann dup list for
-%spotdup = ();                             # the pc11 and 26 dup hash 
-%wwvdup = ();                              # the pc23 and 27 dup hash
-%anndup = ();                               # the PC12 dup hash
+$pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
+
 $last_hour = time;                             # last time I did an hourly periodic update
 %pings = ();                    # outstanding ping requests outbound
 %rcmds = ();                    # outstanding rcmd requests outbound
 %nodehops = ();                 # node specific hop control
 @baddx = ();                    # list of illegal spotted callsigns
+$censorpc = 0;                                 # Do a BadWords::check on text fields and reject things
 
 $baddxfn = "$main::data/baddx.pl";
 
+@checklist = 
+(
+ [ qw(c c m bp bc c) ],                        # pc10
+ [ qw(f m d t m c c h) ],              # pc11
+ [ qw(c bc m bp bm p h) ],             # pc12
+ [ qw(c h) ],                                  # 
+ [ qw(c h) ],                                  # 
+ [ qw(c m h) ],                                        # 
+ undef ,                                               # pc16 has to be validated manually
+ [ qw(c c h) ],                                        # pc17
+ [ qw(m n) ],                                  # pc18
+ undef ,                                               # pc19 has to be validated manually
+ undef ,                                               # pc20 no validation
+ [ qw(c m h) ],                                        # pc21
+ undef ,                                               # pc22 no validation
+ [ qw(d n n n n m c c h) ],            # pc23
+ [ qw(c p h) ],                                        # pc24
+ [ qw(c c n n) ],                              # pc25
+ [ qw(f m d t m c c bc) ],             # pc26
+ [ qw(d n n n n m c c bc) ],   # pc27
+ [ qw(c c c c d t p m bp n p bp bc) ], # pc28
+ [ qw(c c n m) ],                              # pc29
+ [ qw(c c n) ],                                        # pc30
+ [ qw(c c n) ],                                        # pc31
+ [ qw(c c n) ],                                        # pc32
+ [ qw(c c n) ],                                        # pc33
+ [ qw(c c m) ],                                        # pc34
+ [ qw(c c m) ],                                        # pc35
+ [ qw(c c m) ],                                        # pc36
+ [ qw(c c n m) ],                              # pc37
+ undef,                                                        # pc38 not interested
+ [ qw(c m) ],                                  # pc39
+ [ qw(c c m p n) ],                            # pc40
+ [ qw(c n m h) ],                              # pc41
+ [ qw(c c n) ],                                        # pc42
+ undef,                                                        # pc43 don't handle it
+ [ qw(c c n m m c) ],                  # pc44
+ [ qw(c c n m) ],                              # pc45
+ [ qw(c c n) ],                                        # pc46
+ undef,                                                        # pc47
+ undef,                                                        # pc48
+ [ qw(c m h) ],                                        # pc49
+ [ qw(c n h) ],                                        # pc50
+ [ qw(c c n) ],                                        # pc51
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,                                                        # pc60
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,                                                        # pc70
+ undef,
+ undef,
+ [ qw(d n n n n n n m m m c c h) ],    # pc73
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,
+ undef,                                                        # pc80
+ undef,
+ undef,
+ undef,
+ [ qw(c c c m) ],                              # pc84
+ [ qw(c c c m) ],                              # pc85
+);
+
+# use the entry in the check list to check the field list presented
+# return OK if line NOT in check list (for now)
+sub check
+{
+       my $n = shift;
+       $n -= 10;
+       return 0 if $n < 0 || $n > @checklist; 
+       my $ref = $checklist[$n];
+       return 0 unless ref $ref;
+       
+       my $i;
+       shift;    # not interested in the first field
+       for ($i = 0; $i < @$ref; $i++) {
+               my ($blank, $act) = $$ref[$i] =~ /^(b?)(\w)$/;
+               return 0 unless $act;
+               next if $blank && $_[$i] =~ /^[ \*]$/;
+               if ($act eq 'c') {
+                       return $i+1 unless is_callsign($_[$i]);
+               } elsif ($act eq 'm') {
+                       return $i+1 unless is_pctext($_[$i]);
+               } elsif ($act eq 'p') {
+                       return $i+1 unless is_pcflag($_[$i]);
+               } elsif ($act eq 'f') {
+                       return $i+1 unless is_freq($_[$i]);
+               } elsif ($act eq 'n') {
+                       return $i+1 unless $_[$i] =~ /^[\d ]+$/;
+               } elsif ($act eq 'h') {
+                       return $i+1 unless $_[$i] =~ /^H\d\d?$/;
+               } elsif ($act eq 'd') {
+                       return $i+1 unless $_[$i] =~ /^\s*\d+-\w\w\w-[12][90]\d\d$/;
+               } elsif ($act eq 't') {
+                       return $i+1 unless $_[$i] =~ /^[012]\d[012345]\dZ$/;
+               }
+       }
+       return 0;
+}
+
 sub init
 {
        my $user = DXUser->get($main::mycall);
@@ -58,24 +176,16 @@ sub init
        $me->{state} = "indifferent";
        do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
        confess $@ if $@;
-       #  $me->{sort} = 'M';    # M for me
-
-       # now prime the spot duplicates file with today's and yesterday's data
-    my @today = Julian::unixtoj(time);
-       my @spots = Spot::readfile(@today);
-       @today = Julian::sub(@today, 1);
-       push @spots, Spot::readfile(@today);
-       for (@spots) {
-               my $dupkey = "$_->[0]$_->[1]$_->[2]$_->[3]$_->[4]";
-               $spotdup{$dupkey} = $_->[2];
-       }
+       $me->{sort} = 'S';    # S for spider
 
-       # now prime the wwv duplicates file with just this month's data
-       my @wwv = Geomag::readfile(time);
-       for (@wwv) {
-               my $dupkey = "$_->[1].$_->[2]$_->[3]$_->[4]";
-               $wwvdup{$dupkey} = $_->[1];
-       }
+       # now prime the spot and wwv  duplicates file with data
+#    my @today = Julian::unixtoj(time);
+#      for (Spot::readfile(@today), Spot::readfile(Julian::sub(@today, 1))) {
+#              Spot::dup(@{$_}[0..3]);
+#      }
+#      for (Geomag::readfile(time)) {
+#              Geomag::dup(@{$_}[1..5]);
+#      }
 
        # load the baddx file
        do "$baddxfn" if -e "$baddxfn";
@@ -89,7 +199,6 @@ sub init
 sub new 
 {
        my $self = DXChannel::alloc(@_);
-       $self->{'sort'} = 'A';          # in absence of how to find out what sort of an object I am
        return $self;
 }
 
@@ -105,29 +214,46 @@ sub start
        # remember type of connection
        $self->{consort} = $line;
        $self->{outbound} = $sort eq 'O';
-       $self->{priv} = $user->priv;
-       $self->{lang} = $user->lang;
+       $self->{priv} = $user->priv || 1;     # other clusters can always be 'normal' users
+       $self->{lang} = $user->lang || 'en';
        $self->{isolate} = $user->{isolate};
        $self->{consort} = $line;       # save the connection type
        $self->{here} = 1;
 
-       # get the filters
-       $self->{spotfilter} = Filter::read_in('spots', $call);
-       $self->{wwvfilter} = Filter::read_in('wwv', $call);
-       $self->{annfilter} = Filter::read_in('ann', $call);
+       # get the INPUT filters (these only pertain to Clusters)
+       $self->{inspotfilter} = Filter::read_in('spots', $call, 1);
+       $self->{inwwvfilter} = Filter::read_in('wwv', $call, 1);
+       $self->{inwcyfilter} = Filter::read_in('wcy', $call, 1);
+       $self->{inannfilter} = Filter::read_in('ann', $call, 1);
        
        # set unbuffered and no echo
        $self->send_now('B',"0");
        $self->send_now('E',"0");
        
+       # ping neighbour node stuff
+       my $ping = $user->pingint;
+       $ping = 5*60 unless defined $ping;
+       $self->{pingint} = $ping;
+       $self->{nopings} = $user->nopings || 2;
+       $self->{pingtime} = [ ];
+       $self->{pingave} = 0;
+
        # send initialisation string
-       if (!$self->{outbound}) {
-               $self->send(pc38()) if DXNode->get_all();
+       unless ($self->{outbound}) {
+#              $self->send(pc38()) if DXNode->get_all();
                $self->send(pc18());
+               $self->{lastping} = $main::systime;
+       } else {
+               # remove from outstanding connects queue
+               @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
+               $self->{lastping} = $main::systime + $self->pingint / 2;
        }
        $self->state('init');
        $self->pc50_t(time);
 
+       # send info to all logged in thingies
+       $self->tell_login('loginn');
+
        Log('DXProt', "$call connected");
 }
 
@@ -138,6 +264,8 @@ sub normal
 {
        my ($self, $line) = @_;
        my @field = split /\^/, $line;
+       return unless @field;
+       
        pop @field if $field[-1] eq '~';
        
 #      print join(',', @field), "\n";
@@ -148,8 +276,15 @@ sub normal
        # process PC frames
        my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number
        return unless $pcno;
-       return if $pcno < 10 || $pcno > 51;
-       
+       return if $pcno < 10 || $pcno > 99;
+
+       # check for and dump bad protocol messages
+       my $n = check($pcno, @field);
+       if ($n) {
+               dbg('chan', "bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+               return;
+       }
+
        # local processing 1
        my $pcr;
        eval {
@@ -160,19 +295,30 @@ sub normal
        
  SWITCH: {
                if ($pcno == 10) {              # incoming talk
-                       
+
+                       # will we allow it at all?
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[3])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
+                       }
+
                        # is it for me or one of mine?
-                       my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
-                       if ($call eq $main::mycall || grep $_ eq $call, get_all_user_calls()) {
-                               
-                               # 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 && $ref->{talk};
+                       my ($to, $via, $call, $dxchan);
+                       if ($field[5] gt ' ') {
+                               $call = $via = $field[2];
+                               $to = $field[5];
                        } else {
-                               route($field[2], $line); # relay it on its way
+                               $call = $to = $field[2];
+                       }
+                       $dxchan = DXChannel->get($call);
+                       if ($dxchan && $dxchan->is_user) {
+                               $field[3] =~ s/\%5E/^/g;
+                               $dxchan->talk($field[1], $to, $via, $field[3]);
+                       } else {
+                               $self->route($field[2], $line); # relay it on its way
                        }
                        return;
                }
@@ -182,13 +328,16 @@ sub normal
                        # route 'foreign' pc26s 
                        if ($pcno == 26) {
                                if ($field[7] ne $main::mycall) {
-                                       route($field[7], $line);
+                                       $self->route($field[7], $line);
                                        return;
                                }
                        }
                        
                        # if this is a 'nodx' node then ignore it
-                       last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
+                       if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
+                               dbg('chan', "Bad DXNode, dropped");
+                               return;
+                       }
                        
                        # convert the date to a unix date
                        my $d = cltounix($field[3], $field[4]);
@@ -198,30 +347,27 @@ sub normal
                                return;
                        }
 
-                       # strip off the leading & trailing spaces from the comment
-                       my $text = unpad($field[5]);
-                       
-                       # store it away
-                       my $spotter = $field[6];
-                       $spotter =~ s/-\d+$//o; # strip off the ssid from the spotter
+                       # is it 'baddx'
+                       if (grep $field[2] eq $_, @baddx) {
+                               dbg('chan', "Bad DX spot, ignored");
+                               return;
+                       }
                        
                        # do some de-duping
-                       my $freq = $field[1] - 0;
-                       my $dupkey = "$freq$field[2]$d$text$spotter";
-                       if ($spotdup{$dupkey}) {
+                       $field[5] =~ s/^\s+//;      # take any leading blanks off
+                       if (Spot::dup($field[1], $field[2], $d, $field[5])) {
                                dbg('chan', "Duplicate Spot ignored\n");
                                return;
                        }
-                       
-                       $spotdup{$dupkey} = $d;
-
-                       # is it 'baddx'
-                       if (grep $field[2] eq $_, @baddx) {
-                               dbg('chan', "Bad DX spot, ignored");
-                               return;
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[5])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
                        }
                        
-                       my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]);
+                       my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
 
             #
                        # @spot at this point contains:-
@@ -230,6 +376,49 @@ sub normal
                        # you should be able to route on any of these
             #
                        
+                       # fix up qra locators of known users 
+                       my $user = DXUser->get_current($spot[4]);
+                       if ($user) {
+                               my $qra = $user->qra;
+                               unless ($qra && DXBearing::is_qra($qra)) {
+                                       my $lat = $user->lat;
+                                       my $long = $user->long;
+                                       if (defined $lat && defined $long) {
+                                               $user->qra(DXBearing::lltoqra($lat, $long)); 
+                                               $user->put;
+                                       }
+                               }
+
+                               # send a remote command to a distant cluster if it is visible and there is no
+                               # qra locator and we havn't done it for a month.
+
+                               unless ($user->qra) {
+                                       my $node;
+                                       my $to = $user->homenode;
+                                       my $last = $user->lastoper || 0;
+                                       if ($send_opernam && $main::systime > $last + $DXUser::lastoperinterval && $to && ($node = DXCluster->get_exact($to)) ) {
+                                               my $cmd = "forward/opernam $spot[4]";
+                                               # send the rcmd but we aren't interested in the replies...
+                                               if ($node && $node->dxchan && $node->dxchan->is_clx) {
+                                                       route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+                                               } else {
+                                                       route(undef, $to, pc34($main::mycall, $to, $cmd));
+                                               }
+                                               if ($to ne $field[7]) {
+                                                       $to = $field[7];
+                                                       $node = DXCluster->get_exact($to);
+                                                       if ($node && $node->dxchan && $node->dxchan->is_clx) {
+                                                               route(undef, $to, pc84($main::mycall, $to, $main::mycall, $cmd));
+                                                       } else {
+                                                               route(undef, $to, pc34($main::mycall, $to, $cmd));
+                                                       }
+                                               }
+                                               $user->lastoper($main::systime);
+                                               $user->put;
+                                       }
+                               }
+                       }
+                               
                        # local processing 
                        my $r;
                        eval {
@@ -247,58 +436,39 @@ sub normal
                }
                
                if ($pcno == 12) {              # announces
-                       # announce duplicate checking
-                       my $text = uc unpad($field[3]);
-                       my $dupkey = $field[1].$field[2].$text.$field[4].$field[6];
-                       if ($anndup{$dupkey}) {
-                               dbg('chan', "Duplicate Announce ignored\n");
+                       # announce duplicate checking
+                       $field[3] =~ s/^\s+//;  # remove leading blanks
+                       if (AnnTalk::dup($field[1], $field[2], $field[3])) {
+                               dbg('chan', "Duplicate Announce ignored");
                                return;
                        }
-                       $anndup{$dupkey} = $main::systime;
-                       
-                       # global ann filtering
-                       my ($filter, $hops) = Filter::it($self->{annfilter}, @field[1..6], $self->{call} ) if $self->{annfilter};
-                       if ($self->{annfilter} && !$filter) {
-                               dbg('chan', "Rejected by filter");
-                               return;
+
+                       if ($censorpc) {
+                               my @bad;
+                               if (@bad = BadWords::check($field[3])) {
+                                       dbg('chan', "Bad words: @bad, dropped" );
+                                       return;
+                               }
                        }
                        
                        if ($field[2] eq '*' || $field[2] eq $main::mycall) {
                                
-                               # strip leading and trailing stuff
-                               my $text = unpad($field[3]);
-                               my $target;
-                               my $to = 'To ';
-                               my @list;
-                               
-                               if ($field[4] eq '*') { # sysops
-                                       $target = "SYSOP";
-                                       @list = map { $_->priv >= 5 ? $_ : () } get_all_users();
-                               } elsif ($field[4] gt ' ') { # speciality list handling
-                                       my ($name) = split /\./, $field[4]; 
-                                       $target = "$name"; # put the rest in later (if bothered) 
-                               } 
-                               
-                               if ($field[6] eq '1') {
-                                       $target = "WX"; 
-                                       $to = '';
-                               }
-                               $target = "All" if !$target;
-                               
-                               if (@list > 0) {
-                                       broadcast_list("$to$target de $field[1]: $text", 'ann', undef, @list);
-                               } else {
-                                       broadcast_users("$target de $field[1]: $text", 'ann', undef);
+                               # global ann filtering on INPUT
+                               if ($self->{inannfilter}) {
+                                       my ($filter, $hops) = Filter::it($self->{inannfilter}, @field[1..6], $self->{call} );
+                                       unless ($filter) {
+                                               dbg('chan', "Rejected by filter");
+                                               return;
+                                       }
                                }
-                               Log('ann', $target, $field[1], $text);
-                               
-                               return if $field[2] eq $main::mycall; # it's routed to me
+
+                               # send it
+                               $self->send_announce($line, @field[1..6]);
                        } else {
-                               route($field[2], $line);
-                               return;                 # only on a routed one
+                               $self->route($field[2], $line);
                        }
                        
-                       last SWITCH;
+                       return;
                }
                
                if ($pcno == 13) {
@@ -313,20 +483,26 @@ sub normal
                
                if ($pcno == 16) {              # add a user
                        my $node = DXCluster->get_exact($field[1]); 
+                       my $dxchan;
+                       if (!$node && ($dxchan = DXChannel->get($field[1]))) {
+                               # add it to the node table if it isn't present and it's
+                               # connected locally
+                               $node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
+                               broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+                               
+                       }
                        return unless $node; # ignore if havn't seen a PC19 for this one yet
                        return unless $node->isa('DXNode');
                        if ($node->dxchan != $self) {
                                dbg('chan', "LOOP: $field[1] came in on wrong channel");
                                return;
                        }
-                       my $dxchan;
                        if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
                                dbg('chan', "LOOP: $field[1] connected locally");
                                return;
                        }
                        my $i;
-                       
-                       
+                                               
                        for ($i = 2; $i < $#field; $i++) {
                                my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
                                next if !$call || length $call < 3 || length $call > 8;
@@ -354,13 +530,20 @@ sub normal
                
                if ($pcno == 17) {              # remove a user
                        my $node = DXCluster->get_exact($field[2]);
+                       my $dxchan;
+                       if (!$node && ($dxchan = DXChannel->get($field[2]))) {
+                               # add it to the node table if it isn't present and it's
+                               # connected locally
+                               $node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
+                               broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+                               return;
+                       }
                        return unless $node;
                        return unless $node->isa('DXNode');
                        if ($node->dxchan != $self) {
                                dbg('chan', "LOOP: $field[2] came in on wrong channel");
                                return;
                        }
-                       my $dxchan;
                        if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
                                dbg('chan', "LOOP: $field[2] connected locally");
                                return;
@@ -371,9 +554,17 @@ sub normal
                }
                
                if ($pcno == 18) {              # link request
+                       $self->state('init');   
+
+                       # first clear out any nodes on this dxchannel
+                       my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
+                       foreach my $node (@gonenodes) {
+                               next if $node->dxchan == $DXProt::me;
+                               broadcast_ak1a(pc21($node->call, 'Gone, re-init') , $self) unless $self->{isolate}; 
+                               $node->del();
+                       }
                        $self->send_local_config();
                        $self->send(pc20());
-                       $self->state('init');   
                        return;             # we don't pass these on
                }
                
@@ -413,7 +604,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);
@@ -429,8 +620,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 
@@ -443,10 +632,6 @@ sub normal
                        $self->send_local_config();
                        $self->send(pc22());
                        $self->state('normal');
-                       
-                       # queue mail
-                       DXMsg::queue_msg(0);
-
                        return;
                }
                
@@ -455,12 +640,16 @@ sub normal
                        if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
                                my $node = DXCluster->get_exact($call);
                                if ($node) {
+                                       if ($call eq $self->{call}) {
+                                               dbg('chan', "LOOP: Trying to disconnect myself with PC21");
+                                               return;
+                                       } 
                                        if ($node->dxchan != $self) {
                                                dbg('chan', "LOOP: $call come in on wrong channel");
                                                return;
                                        }
                                        my $dxchan;
-                                       if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
+                                       if ($dxchan = DXChannel->get($call)) {
                                                dbg('chan', "LOOP: $call connected locally");
                                                return;
                                        }
@@ -475,18 +664,15 @@ 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 
                        if ($pcno == 27) {
                                if ($field[8] ne $main::mycall) {
-                                       route($field[8], $line);
+                                       $self->route($field[8], $line);
                                        return;
                                }
                        }
@@ -496,33 +682,33 @@ sub normal
                        my $sfi = unpad($field[3]);
                        my $k = unpad($field[4]);
                        my $i = unpad($field[5]);
-                       my $dupkey = "$d.$sfi$k$i";
-                       if ($wwvdup{$dupkey}) {
-                               dbg('chan', "Dup WWV Spot ignored\n");
+                       my ($r) = $field[6] =~ /R=(\d+)/;
+                       $r = 0 unless $r;
+                       if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
+                               dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
                                return;
                        }
-                       if ($d > $main::systime + 900 || $field[2] < 0 || $field[2] > 23) {
-                               dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
+                       if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
+                               dbg('chan', "Dup WWV Spot ignored\n");
                                return;
                        }
-                       $wwvdup{$dupkey} = $d;
-                       $field[6] =~ s/-\d+$//o;            # remove spotter's ssid
+                       $field[7] =~ s/-\d+$//o;            # remove spotter's ssid
                
-                       my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..$#field]);
+                       my $wwv = Geomag::update($d, $field[2], $sfi, $k, $i, @field[6..8], $r);
 
-                       my $r;
+                       my $rep;
                        eval {
-                               $r = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..$#field]);
+                               $rep = Local::wwv($self, $field[1], $field[2], $sfi, $k, $i, @field[6..8], $r);
                        };
 #                      dbg('local', "Local::wwv2 error $@") if $@;
-                       return if $r;
+                       return if $rep;
 
                        # DON'T be silly and send on PC27s!
                        return if $pcno == 27;
 
-                       # broadcast to the eager users
-                       broadcast_users("WWV de $field[7] <$field[2]>:   SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv );
-                       last SWITCH;
+                       # broadcast to the eager world
+                       send_wwv_spot($self, $line, $d, $field[2], $sfi, $k, $i, @field[6..8]);
+                       return;
                }
                
                if ($pcno == 24) {              # set here status
@@ -534,7 +720,11 @@ 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) {
+                               dbg('chan', "Trying to merge to myself, ignored");
                                return;
                        }
 
@@ -542,7 +732,7 @@ sub normal
                        
                        # spots
                        if ($field[3] > 0) {
-                               my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
+                               my @in = reverse Spot::search(1, undef, undef, 0, $field[3]);
                                my $in;
                                foreach $in (@in) {
                                        $self->send(pc26(@{$in}[0..4], $field[2]));
@@ -561,10 +751,10 @@ sub normal
                }
 
                if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
-                       if ($field[1] eq $main::mycall) {
+                       if ($pcno == 49 || $field[1] eq $main::mycall) {
                                DXMsg::process($self, $line);
                        } else {
-                               route($field[1], $line);
+                               $self->route($field[1], $line) unless $self->is_clx;
                        }
                        return;
                }
@@ -574,7 +764,7 @@ sub normal
                                my $ref = DXUser->get_current($field[2]);
                                my $cref = DXCluster->get($field[2]);
                                Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
-                               unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
+                               unless (!$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
                                        if ($ref->{priv}) {     # you have to have SOME privilege, the commands have further filtering
                                                $self->{remotecmd} = 1; # for the benefit of any command that needs to know
                                                my $oldpriv = $self->{priv};
@@ -594,7 +784,12 @@ sub normal
                                        $self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
                                }
                        } else {
-                               route($field[1], $line);
+                               my $ref = DXUser->get_current($field[1]);
+                               if ($ref && $ref->is_clx) {
+                                       route($field[1], pc84($field[2], $field[1], $field[2], $field[3]));
+                               } else {
+                                       $self->route($field[1], $line);
+                               }
                        }
                        return;
                }
@@ -606,9 +801,18 @@ sub normal
                                        my $dxchan = DXChannel->get($s->{call});
                                        $dxchan->send($field[3]) if $dxchan;
                                        delete $rcmds{$field[2]} if !$dxchan;
+                               } else {
+                                       # send unsolicited ones to the sysop
+                                       my $dxchan = DXChannel->get($main::myalias);
+                                       $dxchan->send($field[3]) if $dxchan;
                                }
                        } else {
-                               route($field[1], $line);
+                               my $ref = DXUser->get_current($field[1]);
+                               if ($ref && $ref->is_clx) {
+                                       route($field[1], pc85($field[2], $field[1], $field[2], $field[3]));
+                               } else {
+                                       $self->route($field[1], $line);
+                               }
                        }
                        return;
                }
@@ -620,7 +824,7 @@ sub normal
                }
                
                if ($pcno == 39) {              # incoming disconnect
-                       $self->disconnect();
+                       $self->disconnect(1);
                        return;
                }
                
@@ -642,21 +846,19 @@ sub normal
                                my ($lat, $long) = DXBearing::stoll($field[3]);
                                $user->lat($lat);
                                $user->long($long);
+                               $user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra && DXBearing::is_qra($user->qra);
                        } elsif ($field[2] == 4) {
                                $user->homenode($field[3]);
                        }
+                       $user->lastoper($main::systime);   # to cut down on excessive for/opers being generated
                        $user->put;
                        last SWITCH;
                }
                if ($pcno == 43) {
                        last SWITCH;
                }
-               if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 49) {
-                       if ($field[1] eq $main::mycall) {
-                               ;
-                       } else {
-                               route($field[1], $line);
-                       }
+               if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 48) {
+                       DXDb::process($self, $line);
                        return;
                }
                
@@ -681,29 +883,146 @@ 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;
+                                               my $tochan =  DXChannel->get($field[2]);
+                                               while (@$ref) {
+                                                       my $r = shift @$ref;
+                                                       my $dxchan = DXChannel->get($r->{call});
+                                                       next unless $dxchan;
+                                                       my $t = tv_interval($r->{t}, [ gettimeofday ]);
+                                                       if ($dxchan->is_user) {
+                                                               my $s = sprintf "%.2f", $t; 
+                                                               my $ave = sprintf "%.2f", $tochan ? ($tochan->{pingave} || $t) : $t;
+                                                               $dxchan->send($dxchan->msg('pingi', $field[2], $s, $ave))
+                                                       } elsif ($dxchan->is_node) {
+                                                               if ($tochan) {
+                                                                       $tochan->{nopings} = 2; # pump up the timer
+                                                                       push @{$tochan->{pingtime}}, $t;
+                                                                       shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
+                                                                       my $st;
+                                                                       for (@{$tochan->{pingtime}}) {
+                                                                               $st += $_;
+                                                                       }
+                                                                       $tochan->{pingave} = $st / @{$tochan->{pingtime}};
+                                                               }
+                                                       } 
+                                               }
                                        }
                                }
-                               
                        } else {
                                # route down an appropriate thingy
-                               route($field[1], $line);
+                               $self->route($field[1], $line);
+                       }
+                       return;
+               }
+
+               if ($pcno == 75) {              # dunno but route it
+                       if ($field[1] ne $main::mycall) {
+                               $self->route($field[1], $line);
+                       }
+                       return;
+               }
+
+               if ($pcno == 73) {  # WCY broadcasts
+                       
+                       # do some de-duping
+                       my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
+                       if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
+                               dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+                               return;
+                       }
+                       @field = map { unpad($_) } @field;
+                       if (WCY::dup($d,@field[3..7])) {
+                               dbg('chan', "Dup WCY Spot ignored\n");
+                               return;
+                       }
+               
+                       my $wcy = WCY::update($d, @field[2..12]);
+
+                       my $rep;
+                       eval {
+                               $rep = Local::wwv($self, @field[1..12]);
+                       };
+                       # dbg('local', "Local::wcy error $@") if $@;
+                       return if $rep;
+
+                       # broadcast to the eager world
+                       send_wcy_spot($self, $line, $d, @field[2..12]);
+                       return;
+               }
+
+               if ($pcno == 84) { # remote commands (incoming)
+                       if ($field[1] eq $main::mycall) {
+                               my $ref = DXUser->get_current($field[2]);
+                               my $cref = DXCluster->get($field[2]);
+                               Log('rcmd', 'in', $ref->{priv}, $field[2], $field[4]);
+                               unless ($field[4] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) {    # not allowed to relay RCMDS!
+                                       if ($ref->{priv}) {     # you have to have SOME privilege, the commands have further filtering
+                                               $self->{remotecmd} = 1; # for the benefit of any command that needs to know
+                                               my $oldpriv = $self->{priv};
+                                               $self->{priv} = $ref->{priv};     # assume the user's privilege level
+                                               my @in = (DXCommandmode::run_cmd($self, $field[4]));
+                                               $self->{priv} = $oldpriv;
+                                               for (@in) {
+                                                       s/\s*$//og;
+                                                       $self->send(pc85($main::mycall, $field[2], $field[3], "$main::mycall:$_"));
+                                                       Log('rcmd', 'out', $field[2], $_);
+                                               }
+                                               delete $self->{remotecmd};
+                                       } else {
+                                               $self->send(pc85($main::mycall, $field[2], $field[3], "$main::mycall:sorry...!"));
+                                       }
+                               } else {
+                                       $self->send(pc85($main::mycall, $field[2], $field[3],"$main::mycall:your attempt is logged, Tut tut tut...!"));
+                               }
+                       } else {
+                               my $ref = DXUser->get_current($field[1]);
+                               if ($ref && $ref->is_clx) {
+                                       $self->route($field[1], $line);
+                               } else {
+                                       route($field[1], pc34($field[2], $field[1], $field[4]));
+                               }
+                       }
+                       return;
+               }
+
+               if ($pcno == 85) {              # remote command replies
+                       if ($field[1] eq $main::mycall) {
+                               my $dxchan = DXChannel->get($field[3]);
+                               if ($dxchan) {
+                                       $dxchan->send($field[4]);
+                               } else {
+                                       my $s = $rcmds{$field[2]};
+                                       if ($s) {
+                                               $dxchan = DXChannel->get($s->{call});
+                                               $dxchan->send($field[4]) if $dxchan;
+                                               delete $rcmds{$field[2]} if !$dxchan;
+                                       } else {
+                                               # send unsolicited ones to the sysop
+                                               my $dxchan = DXChannel->get($main::myalias);
+                                               $dxchan->send($field[4]) if $dxchan;
+                                       }
+                               }
+                       } else {
+                               my $ref = DXUser->get_current($field[1]);
+                               if ($ref && $ref->is_clx) {
+                                       $self->route($field[1], $line);
+                               } else {
+                                       route($field[1], pc35($field[2], $field[1], $field[4]));
+                               }
                        }
                        return;
                }
        }
         
-        # if get here then rebroadcast the thing with its Hop count decremented (if
-        # there is one). If it has a hop count and it decrements to zero then don't
-        # rebroadcast it.
-        #
-        # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
-        #        REBROADCAST!!!!
-        #
+       # if get here then rebroadcast the thing with its Hop count decremented (if
+       # there is one). If it has a hop count and it decrements to zero then don't
+       # rebroadcast it.
+       #
+       # NOTE - don't arrive here UNLESS YOU WANT this lump of protocol to be
+       #        REBROADCAST!!!!
+       #
         
-       if (!$self->{isolate}) {
+       unless ($self->{isolate}) {
                broadcast_ak1a($line, $self); # send it to everyone but me
        }
 }
@@ -719,13 +1038,24 @@ sub process
        my $dxchan;
        
        foreach $dxchan (@dxchan) {
-               next unless $dxchan->is_ak1a();
+               next unless $dxchan->is_node();
                next if $dxchan == $me;
                
                # send a pc50 out on this channel
                if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
-                       $dxchan->send(pc50());
+                       $dxchan->send(pc50(scalar DXChannel::get_all_users));
                        $dxchan->pc50_t($t);
+               } 
+
+               # send a ping out on this channel
+               if ($dxchan->{pingint} && $t >= $dxchan->{pingint} + $dxchan->{lastping}) {
+                       if ($dxchan->{nopings} <= 0) {
+                               $dxchan->disconnect;
+                       } else {
+                               addping($main::mycall, $dxchan->call);
+                               $dxchan->{nopings} -= 1;
+                               $dxchan->{lastping} = $t;
+                       }
                }
        }
        
@@ -733,18 +1063,9 @@ sub process
        my $val;
        my $cutoff;
        if ($main::systime - 3600 > $last_hour) {
-               $cutoff  = $main::systime - $pc11_dup_age;
-               while (($key, $val) = each %spotdup) {
-                       delete $spotdup{$key} if $val < $cutoff;
-               }
-               $cutoff = $main::systime - $pc23_dup_age;
-               while (($key, $val) = each %wwvdup) {
-                       delete $wwvdup{$key} if $val < $cutoff;
-               }
-               $cutoff = $main::systime - $pc12_dup_age;
-               while (($key, $val) = each %anndup) {
-                       delete $anndup{$key} if $val < $cutoff;
-               }
+#              Spot::process;
+#              Geomag::process;
+#              AnnTalk::process;
                $last_hour = $main::systime;
        }
 }
@@ -756,11 +1077,12 @@ sub finish
 {
        my $self = shift;
        my $call = $self->call;
+       my $conn = shift;
        my $ref = DXCluster->get_exact($call);
        
        # 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();
@@ -777,7 +1099,13 @@ sub finish
        
        # now broadcast to all other ak1a nodes that I have gone
        broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-       
+
+       # I was the last node visited
+    $self->user->node($main::mycall);
+
+       # send info to all logged in thingies
+       $self->tell_login('logoutn');
+
        Log('DXProt', $call . " Disconnected");
        $ref->del() if $ref;
 }
@@ -796,8 +1124,14 @@ sub send_dx_spot
        # taking into account filtering and so on
        foreach $dxchan (@dxchan) {
                my $routeit;
-               my ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} ) if $dxchan->{spotfilter};
-               if ($dxchan->is_ak1a) {
+               my ($filter, $hops);
+
+               if ($dxchan->{spotfilter}) {
+                   ($filter, $hops) = Filter::it($dxchan->{spotfilter}, @_, $self->{call} );
+                       next unless $filter;
+               }
+               
+               if ($dxchan->is_node) {
                        next if $dxchan == $self;
                        if ($hops) {
                                $routeit = $line;
@@ -810,15 +1144,170 @@ sub send_dx_spot
                                $dxchan->send($routeit) if $routeit;
                        } else {
                                $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
-                               
                        }
                } elsif ($dxchan->is_user && $dxchan->{dx}) {
-                       my $buf = Spot::formatb($_[0], $_[1], $_[2], $_[3], $_[4]);
+                       my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
                        $buf .= "\a\a" if $dxchan->{beep};
-                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
-                               $dxchan->send($buf) if !$hops || ($hops && $filter);
+                       $buf =~ s/\%5E/^/g;
+                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+                               $dxchan->send($buf);
                        } else {
-                               $dxchan->delay($buf) if !$hops || ($hops && $filter);
+                               $dxchan->delay($buf);
+                       }
+               }                                       
+       }
+}
+
+sub send_wwv_spot
+{
+       my $self = shift;
+       my $line = shift;
+       my @dxchan = DXChannel->get_all();
+       my $dxchan;
+       
+       # send it if it isn't the except list and isn't isolated and still has a hop count
+       # taking into account filtering and so on
+       foreach $dxchan (@dxchan) {
+               my $routeit;
+               my ($filter, $hops);
+
+               if ($dxchan->{wwvfilter}) {
+                        ($filter, $hops) = Filter::it($dxchan->{wwvfilter}, @_, $self->{call} );
+                        next unless $filter;
+               }
+               if ($dxchan->is_node) {
+                       next if $dxchan == $self;
+                       if ($hops) {
+                               $routeit = $line;
+                               $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+                       } else {
+                               $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
+                               next unless $routeit;
+                       }
+                       if ($filter) {
+                               $dxchan->send($routeit) if $routeit;
+                       } else {
+                               $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+                               
+                       }
+               } elsif ($dxchan->is_user && $dxchan->{wwv}) {
+                       my $buf = "WWV de $_[6] <$_[1]>:   SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
+                       $buf .= "\a\a" if $dxchan->{beep};
+                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+                               $dxchan->send($buf);
+                       } else {
+                               $dxchan->delay($buf);
+                       }
+               }                                       
+       }
+}
+
+sub send_wcy_spot
+{
+       my $self = shift;
+       my $line = shift;
+       my @dxchan = DXChannel->get_all();
+       my $dxchan;
+       
+       # send it if it isn't the except list and isn't isolated and still has a hop count
+       # taking into account filtering and so on
+       foreach $dxchan (@dxchan) {
+               my $routeit;
+               my ($filter, $hops);
+
+               if ($dxchan->{wcyfilter}) {
+                        ($filter, $hops) = Filter::it($dxchan->{wcyfilter}, @_, $self->{call} );
+                        next unless $filter;
+               }
+               if ($dxchan->is_clx || $dxchan->is_spider) {
+                       next if $dxchan == $self;
+                       if ($hops) {
+                               $routeit = $line;
+                               $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+                       } else {
+                               $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
+                               next unless $routeit;
+                       }
+                       if ($filter) {
+                               $dxchan->send($routeit) if $routeit;
+                       } else {
+                               $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+                       }
+               } elsif ($dxchan->is_user && $dxchan->{wcy}) {
+                       my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
+                       $buf .= "\a\a" if $dxchan->{beep};
+                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+                               $dxchan->send($buf);
+                       } else {
+                               $dxchan->delay($buf);
+                       }
+               }                                       
+       }
+}
+
+# send an announce
+sub send_announce
+{
+       my $self = shift;
+       my $line = shift;
+       my @dxchan = DXChannel->get_all();
+       my $dxchan;
+       my $text = unpad($_[2]);
+       my $target;
+       my $to = 'To ';
+                               
+       if ($_[3] eq '*') {     # sysops
+               $target = "SYSOP";
+       } elsif ($_[3] gt ' ') { # speciality list handling
+               my ($name) = split /\./, $_[3]; 
+               $target = "$name"; # put the rest in later (if bothered) 
+       } 
+       
+       if ($_[5] eq '1') {
+               $target = "WX"; 
+               $to = '';
+       }
+       $target = "All" if !$target;
+       
+       Log('ann', $target, $_[0], $text);
+
+       # send it if it isn't the except list and isn't isolated and still has a hop count
+       # taking into account filtering and so on
+       foreach $dxchan (@dxchan) {
+               my $routeit;
+               my ($filter, $hops);
+
+               if ($dxchan->{annfilter}) {
+                       ($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
+                       next unless $filter;
+               } 
+               if ($dxchan->is_node && $_[1] ne $main::mycall) {  # i.e not specifically routed to me
+                       next if $dxchan == $self;
+                       if ($hops) {
+                               $routeit = $line;
+                               $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+                       } else {
+                               $routeit = adjust_hops($dxchan, $line);  # adjust its hop count by node name
+                               next unless $routeit;
+                       }
+                       if ($filter) {
+                               $dxchan->send($routeit) if $routeit;
+                       } else {
+                               $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+                               
+                       }
+               } elsif ($dxchan->is_user) {
+                       unless ($dxchan->{ann}) {
+                               next if $_[0] ne $main::myalias && $_[0] ne $main::mycall;
+                       }
+                       next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
+                       my $buf = "$to$target de $_[0]: $text";
+                       $buf =~ s/\%5E/^/g;
+                       $buf .= "\a\a" if $dxchan->{beep};
+                       if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
+                               $dxchan->send($buf);
+                       } else {
+                               $dxchan->delay($buf);
                        }
                }                                       
        }
@@ -872,9 +1361,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) {
@@ -892,7 +1385,7 @@ sub broadcast_ak1a
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_ak1a();
+       my @dxchan = DXChannel::get_all_nodes();
        my $dxchan;
        
        # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -909,7 +1402,7 @@ sub broadcast_all_ak1a
 {
        my $s = shift;                          # the line to be rebroadcast
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_ak1a();
+       my @dxchan = DXChannel::get_all_nodes();
        my $dxchan;
        
        # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -928,7 +1421,7 @@ sub broadcast_users
        my $sort = shift;           # the type of transmission
        my $fref = shift;           # a reference to an object to filter on
        my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       my @dxchan = get_all_users();
+       my @dxchan = DXChannel::get_all_users();
        my $dxchan;
        my @out;
        
@@ -957,11 +1450,12 @@ sub broadcast_list
                }
                next if $sort eq 'ann' && !$dxchan->{ann};
                next if $sort eq 'wwv' && !$dxchan->{wwv};
+               next if $sort eq 'wcy' && !$dxchan->{wcy};
                next if $sort eq 'wx' && !$dxchan->{wx};
 
                $s =~ s/\a//og unless $dxchan->{beep};
 
-               if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+               if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
                        $dxchan->send($s);      
                } else {
                        $dxchan->delay($s);
@@ -969,43 +1463,6 @@ sub broadcast_list
        }
 }
 
-#
-# gimme all the ak1a nodes
-#
-sub get_all_ak1a
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref if $ref->is_ak1a;
-       }
-       return @out;
-}
-
-# return a list of all users
-sub get_all_users
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref if $ref->is_user;
-       }
-       return @out;
-}
-
-# return a list of all user callsigns
-sub get_all_user_calls
-{
-       my @list = DXChannel->get_all();
-       my $ref;
-       my @out;
-       foreach $ref (@list) {
-               push @out, $ref->call if $ref->is_user;
-       }
-       return @out;
-}
 
 #
 # obtain the hops from the list for this callsign and pc no 
@@ -1064,37 +1521,62 @@ sub load_hops
        return 0;
 }
 
-# remove leading and trailing spaces from an input string
-sub unpad
-{
-       my $s = shift;
-       $s =~ s/^\s+|\s+$//;
-       return $s;
-}
 
 # add a ping request to the ping queues
 sub addping
 {
        my ($from, $to) = @_;
-       my $ref = $pings{$to};
-       $ref = $pings{$to} = [] if !$ref;
+       my $ref = $pings{$to} || [];
        my $r = {};
        $r->{call} = $from;
-       $r->{t} = $main::systime;
-       route($to, pc51($to, $main::mycall, 1));
+       $r->{t} = [ gettimeofday ];
+       route(undef, $to, pc51($to, $main::mycall, 1));
        push @$ref, $r;
+       $pings{$to} = $ref;
 }
 
 # add a rcmd request to the rcmd queues
 sub addrcmd
 {
-       my ($from, $to, $cmd) = @_;
+       my ($self, $to, $cmd) = @_;
+
        my $r = {};
-       $r->{call} = $from;
+       $r->{call} = $self->{call};
        $r->{t} = $main::systime;
        $r->{cmd} = $cmd;
-       route($to, pc34($main::mycall, $to, $cmd));
        $rcmds{$to} = $r;
+
+       my $ref = DXCluster->get_exact($to);
+    if ($ref && $ref->dxchan && $ref->dxchan->is_clx) {
+               route(undef, $to, pc84($main::mycall, $to, $self->{call}, $cmd));
+       } else {
+               route(undef, $to, pc34($main::mycall, $to, $cmd));
+       }
+}
+
+sub disconnect
+{
+       my $self = shift;
+       my $nopc39 = shift;
+
+       if ($self->{conn} && !$nopc39) {
+               $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
+       }
+
+       $self->SUPER::disconnect;
+}
+
+
+# 
+# send a talk message to this thingy
+#
+sub talk
+{
+       my ($self, $from, $to, $via, $line) = @_;
+       
+       $line =~ s/\^/\\5E/g;                   # remove any ^ characters
+       $self->send(DXProt::pc10($from, $to, $via, $line));
+       Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
 }
 1;
 __END__