Fixed some Aliasing problems.
[spider.git] / perl / DXProt.pm
index 9d92a8293099060c42bc16cd936b69b4eb358153..ee9c92f103410f54bfc3c78d20c764fc8085b71d 100644 (file)
@@ -32,6 +32,7 @@ use BadWords;
 use DXHash;
 use Route;
 use Route::Node;
+use Script;
 
 use strict;
 
@@ -41,12 +42,11 @@ $BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
 $main::build += $VERSION;
 $main::branch += $BRANCH;
 
-use vars qw($me $pc11_max_age $pc23_max_age $last_pc50
-                       $last_hour $last10 %eph  %pings %rcmds
-                       %nodehops $baddx $badspotter $badnode $censorpc
+use vars qw($pc11_max_age $pc23_max_age $last_pc50
+                       $last_hour $last10 %eph  %pings %rcmds $ann_to_talk
+                       %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck
                        $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
 $pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
 
@@ -60,6 +60,8 @@ $baddx = new DXHash "baddx";
 $badspotter = new DXHash "badspotter";
 $badnode = new DXHash "badnode";
 $last10 = $last_pc50 = time;
+$ann_to_talk = 1;
+$rspfcheck = 1;
 
 @checklist = 
 (
@@ -182,14 +184,17 @@ sub init
 {
        my $user = DXUser->get($main::mycall);
        $DXProt::myprot_version += $main::version*100;
-       $me = DXProt->new($main::mycall, 0, $user); 
-       $me->{here} = 1;
-       $me->{state} = "indifferent";
+       $main::me = DXProt->new($main::mycall, 0, $user); 
+       $main::me->{here} = 1;
+       $main::me->{state} = "indifferent";
        do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
        confess $@ if $@;
-       $me->{sort} = 'S';    # S for spider
-       $me->{priv} = 9;
-#      $Route::Node::me->adddxchan($me);
+       $main::me->{sort} = 'S';    # S for spider
+       $main::me->{priv} = 9;
+       $main::me->{metric} = 0;
+       $main::me->{pingave} = 0;
+       
+#      $Route::Node::me->adddxchan($main::me);
 }
 
 #
@@ -216,6 +221,10 @@ sub start
        my ($self, $line, $sort) = @_;
        my $call = $self->{call};
        my $user = $self->{user};
+
+       # log it
+       my $host = $self->{conn}->{peerhost} || "unknown";
+       Log('DXProt', "$call connected from $host");
        
        # remember type of connection
        $self->{consort} = $line;
@@ -229,6 +238,9 @@ sub start
        $self->{here} = 1;
        $self->{width} = 80;
 
+       # sort out registration
+       $self->{registered} = 1;
+
        # get the output filters
        $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
        $self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
@@ -247,6 +259,7 @@ sub start
        # set unbuffered and no echo
        $self->send_now('B',"0");
        $self->send_now('E',"0");
+       $self->conn->echo(0) if $self->conn->can('echo');
        
        # ping neighbour node stuff
        my $ping = $user->pingint;
@@ -255,6 +268,7 @@ sub start
        $self->{nopings} = $user->nopings || 2;
        $self->{pingtime} = [ ];
        $self->{pingave} = 999;
+       $self->{metric} ||= 100;
        $self->{lastping} = $main::systime;
 
        # send initialisation string
@@ -268,7 +282,9 @@ sub start
        # send info to all logged in thingies
        $self->tell_login('loginn');
 
-       Log('DXProt', "$call connected");
+       # run a script send the output to the debug file
+       my $script = new Script(lc $call) || new Script('node_default');
+       $script->run($self) if $script;
 }
 
 #
@@ -308,6 +324,9 @@ sub normal
  SWITCH: {
                if ($pcno == 10) {              # incoming talk
 
+                       # rsfp check
+                       return if $rspfcheck and !$self->rspfcheck(0, $field[6], $field[1]);
+                       
                        # will we allow it at all?
                        if ($censorpc) {
                                my @bad;
@@ -318,20 +337,50 @@ sub normal
                        }
 
                        # is it for me or one of mine?
-                       my ($to, $via, $call, $dxchan);
+                       my ($from, $to, $via, $call, $dxchan);
+                       $from = $field[1];
                        if ($field[5] gt ' ') {
-                               $call = $via = $field[2];
+                               $via = $field[2];
                                $to = $field[5];
                        } else {
-                               $call = $to = $field[2];
+                               $to = $field[2];
+                       }
+
+                       # if we are converting announces to talk is it a dup?
+                       if ($ann_to_talk) {
+                               if (AnnTalk::is_talk_candidate($from, $field[3]) && AnnTalk::dup($from, $to, $field[3])) {
+                                       dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr');
+                                       return;
+                               }
                        }
-                       $dxchan = DXChannel->get($main::myalias) if $call eq $main::mycall;
-                       $dxchan = DXChannel->get($call) unless $dxchan;
+
+                       # it is here and logged on
+                       $dxchan = DXChannel->get($main::myalias) if $to eq $main::mycall;
+                       $dxchan = DXChannel->get($to) unless $dxchan;
                        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
+                               $dxchan->talk($from, $to, $via, $field[3]);
+                               return;
+                       }
+
+                       # is it elsewhere, visible on the cluster via the to address?
+                       # note: this discards the via unless the to address is on
+                       # the via address
+                       my ($ref, $vref);
+                       if ($ref = Route::get($to)) {
+                               $vref = Route::Node::get($via) if $via;
+                               $vref = undef unless $vref && grep $to eq $_, $vref->users;
+                               $ref->dxchan->talk($from, $to, $vref ? $via : undef, $field[3], $field[6]);
+                               return;
+                       }
+
+                       # not visible here, send a message of condolence
+                       $vref = undef;
+                       $ref = Route::get($from);
+                       $vref = $ref = Route::Node::get($field[6]) unless $ref; 
+                       if ($ref) {
+                               $dxchan = $ref->dxchan;
+                               $dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) );
                        }
                        return;
                }
@@ -346,6 +395,9 @@ sub normal
                                }
                        }
                        
+                       # rsfp check
+                       return if $rspfcheck and !$self->rspfcheck(1, $field[7], $field[6]);
+
                        # if this is a 'nodx' node then ignore it
                        if ($badnode->in($field[7])) {
                                dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
@@ -367,7 +419,7 @@ sub normal
                        }
 
                        # is it 'baddx'
-                       if ($baddx->in($field[2])) {
+                       if ($baddx->in($field[2]) || BadWords::check($field[2]) || $field[2] =~ /COCK/) {
                                dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr');
                                return;
                        }
@@ -475,6 +527,9 @@ sub normal
                }
                
                if ($pcno == 12) {              # announces
+
+                       return if $rspfcheck and !$self->rspfcheck(1, $field[5], $field[1]);
+
                        # announce duplicate checking
                        $field[3] =~ s/^\s+//;  # remove leading blanks
                        if (AnnTalk::dup($field[1], $field[2], $field[3])) {
@@ -489,38 +544,29 @@ sub normal
                                        return;
                                }
                        }
-                       
+
                        if ($field[2] eq '*' || $field[2] eq $main::mycall) {
-                               
-                               # global ann filtering on INPUT
-                               if ($self->{inannfilter}) {
-                                       my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-                                       my @dxcc = Prefix::extract($field[1]);
-                                       if (@dxcc > 0) {
-                                               $ann_dxcc = $dxcc[1]->dxcc;
-                                               $ann_itu = $dxcc[1]->itu;
-                                               $ann_cq = $dxcc[1]->cq();                                               
-                                       }
-                                       @dxcc = Prefix::extract($field[5]);
-                                       if (@dxcc > 0) {
-                                               $org_dxcc = $dxcc[1]->dxcc;
-                                               $org_itu = $dxcc[1]->itu;
-                                               $org_cq = $dxcc[1]->cq();                                               
-                                       }
-                                       my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call}, 
-                                                                                                       $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
-                                       unless ($filter) {
-                                               dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
-                                               return;
+
+
+                               # here's a bit of fun, convert incoming ann with a callsign in the first word
+                               # or one saying 'to <call>' to a talk if we can route to the recipient
+                               if ($ann_to_talk) {
+                                       my $call = AnnTalk::is_talk_candidate($field[1], $field[3]);
+                                       if ($call) {
+                                               my $ref = Route::get($call);
+                                               if ($ref) {
+                                                       my $dxchan = $ref->dxchan;
+                                                       $dxchan->talk($field[1], $call, undef, $field[3], $field[5]) if $dxchan != $self;
+                                                       return;
+                                               }
                                        }
                                }
-
+       
                                # send it
                                $self->send_announce($line, @field[1..6]);
                        } else {
                                $self->route($field[2], $line);
                        }
-                       
                        return;
                }
                
@@ -536,6 +582,11 @@ sub normal
                
                if ($pcno == 16) {              # add a user
 
+                       if (eph_dup($line)) {
+                               dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
+                               return;
+                       }
+
                        # general checks
                        my $dxchan;
                        my $ncall = $field[1];
@@ -545,17 +596,17 @@ sub normal
                                dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
                                return;
                        }
-                       $dxchan = DXChannel->get($ncall);
-                       if ($dxchan && $dxchan ne $self) {
-                               dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
-                               return;
-                       }
                        my $parent = Route::Node::get($ncall); 
                        unless ($parent) {
                                dbg("PCPROT: Node $ncall not in config") if isdbg('chanerr');
                                return;
                        }
-                       
+                       $dxchan = $parent->dxchan;
+                       if ($dxchan && $dxchan ne $self) {
+                               dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+                               return;
+                       }
+
                        # input filter if required
                        return unless $self->in_filter_route($parent);
                        
@@ -570,7 +621,15 @@ sub normal
                                
                                $conf = $conf eq '*';
 
-                               my $r = Route::User::get($call);
+                               # reject this if we think it is a node already
+                               my $r = Route::Node::get($call);
+                               my $u = DXUser->get_current($call) unless $r;
+                               if ($r || ($u && $u->is_node)) {
+                                       dbg("PCPROT: $call is a node") if isdbg('chanerr');
+                                       next;
+                               }
+                               
+                               $r = Route::User::get($call);
                                my $flags = Route::here($here)|Route::conf($conf);
                                
                                if ($r) {
@@ -592,11 +651,6 @@ sub normal
                                $user->lastin($main::systime) unless DXChannel->get($call);
                                $user->put;
                        }
-
-                       if (eph_dup($line)) {
-                               dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
-                               return;
-                       }
                        
                        # queue up any messages (look for privates only)
                        DXMsg::queue_msg(1) if $self->state eq 'normal';     
@@ -610,39 +664,40 @@ sub normal
                        my $ncall = $field[2];
                        my $ucall = $field[1];
 
+                       if (eph_dup($line)) {
+                               dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
+                               return;
+                       }
+
                        eph_del_regex("^PC16.*$ncall.*$ucall");
                        
                        if ($ncall eq $main::mycall) {
                                dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr');
                                return;
                        }
-                       $dxchan = DXChannel->get($ncall);
-                       if ($dxchan && $dxchan ne $self) {
-                               dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
+
+                       my $uref = Route::User::get($ucall);
+                       unless ($uref) {
+                               dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
                                return;
                        }
                        my $parent = Route::Node::get($ncall);
                        unless ($parent) {
                                dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
                                return;
-                       }
-                       my $uref = Route::User::get($ucall);
-                       unless ($uref) {
-                               dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+                       }                       
+
+                       $dxchan = $parent->dxchan;
+                       if ($dxchan && $dxchan ne $self) {
+                               dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
                                return;
                        }
-                       
 
                        # input filter if required
                        return unless $self->in_filter_route($parent);
                        
                        my @rout = $parent->del_user($uref);
 
-                       if (eph_dup($line)) {
-                               dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
-                               return;
-                       }
-
                        $self->route_pc17($parent, @rout) if @rout;
                        return;
                }
@@ -663,6 +718,11 @@ sub normal
                        my $i;
                        my $newline = "PC19^";
 
+                       if (eph_dup($line)) {
+                               dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
+                               return;
+                       }
+
                        # new routing list
                        my @rout;
                        my $parent = Route::Node::get($self->{call});
@@ -739,10 +799,6 @@ sub normal
                                $user->put;
                        }
 
-                       if (eph_dup($line)) {
-                               dbg("PCPROT: dup PC19 detected") if isdbg('chanerr');
-                               return;
-                       }
 
                        $self->route_pc19(@rout) if @rout;
                        return;
@@ -759,6 +815,11 @@ sub normal
                if ($pcno == 21) {              # delete a cluster from the list
                        my $call = uc $field[1];
 
+                       if (eph_dup($line)) {
+                               dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
+                               return;
+                       }
+
                        eph_del_regex("^PC1[79].*$call");
                        
                        my @rout;
@@ -768,14 +829,21 @@ sub normal
                                $self->disconnect;
                                return;
                        }
-                       my $node = Route::Node::get($call);
                        if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
                                if ($call eq $self->{call}) {
                                        dbg("PCPROT: Trying to disconnect myself with PC21") if isdbg('chanerr');
                                        return;
                                }
 
+                               my $node = Route::Node::get($call);
                                if ($node) {
+
+                                       my $dxchan = $node->dxchan;
+                                       if ($dxchan && $dxchan ne $self) {
+                                               dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr');
+                                               return;
+                                       }
+
                                        # input filter it
                                        return unless $self->in_filter_route($node);
 
@@ -787,11 +855,6 @@ sub normal
                                return;
                        }
 
-                       if (eph_dup($line)) {
-                               dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
-                               return;
-                       }
-
                        $self->route_pc21(@rout) if @rout;
                        return;
                }
@@ -812,6 +875,8 @@ sub normal
                                }
                        }
 
+                       return if $rspfcheck and !$self->rspfcheck(1, $field[8], $field[7]);
+
                        # do some de-duping
                        my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
                        my $sfi = unpad($field[3]);
@@ -896,6 +961,7 @@ sub normal
                }
 
                if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
+                       return if $pcno == 49 && eph_dup($line);
                        if ($pcno == 49 || $field[1] eq $main::mycall) {
                                DXMsg::process($self, $line);
                        } else {
@@ -937,7 +1003,7 @@ sub normal
 #                      my $ref = Route::get($call) || Route->new($call);
 #                      return unless $self->in_filter_route($ref);
 
-                       if ($field[3] eq $field[2]) {
+                       if ($field[3] eq $field[2] || $field[3] =~ /^\s*$/) {
                                dbg('PCPROT: invalid value') if isdbg('chanerr');
                                return;
                        }
@@ -1031,14 +1097,27 @@ sub normal
                                                                $dxchan->send($dxchan->msg('pingi', $from, $s, $ave))
                                                        } elsif ($dxchan->is_node) {
                                                                if ($tochan) {
-                                                                       $tochan->{nopings} = $tochan->user->nopings || 2; # pump up the timer
+                                                                       my $nopings = $tochan->user->nopings || 2;
                                                                        push @{$tochan->{pingtime}}, $t;
                                                                        shift @{$tochan->{pingtime}} if @{$tochan->{pingtime}} > 6;
-                                                                       my $st;
-                                                                       for (@{$tochan->{pingtime}}) {
-                                                                               $st += $_;
+
+                                                                       # cope with a missed ping, this means you must set the pingint large enough
+                                                                       if ($t > $tochan->{pingint}  && $t < 2 * $tochan->{pingint} ) {
+                                                                               $t -= $tochan->{pingint};
+                                                                       }
+
+                                                                       # calc smoothed RTT a la TCP
+                                                                       if (@{$tochan->{pingtime}} == 1) {
+                                                                               $tochan->{pingave} = $t;
+                                                                       } else {
+                                                                               $tochan->{pingave} = $tochan->{pingave} + (($t - $tochan->{pingave}) / 6);
                                                                        }
-                                                                       $tochan->{pingave} = $st / @{$tochan->{pingtime}};
+#                                                                      my $st;
+#                                                                      for (@{$tochan->{pingtime}}) {
+#                                                                              $st += $_;
+#                                                                      }
+#                                                                      $tochan->{pingave} = $st / @{$tochan->{pingtime}};
+                                                                       $tochan->{nopings} = $nopings; # pump up the timer
                                                                }
                                                        } 
                                                }
@@ -1116,7 +1195,7 @@ sub normal
                dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr');
        } else {
                unless ($self->{isolate}) {
-                       broadcast_ak1a($line, $self); # send it to everyone but me
+                       DXChannel::broadcast_nodes($line, $self); # send it to everyone but me
                }
        }
 }
@@ -1134,14 +1213,14 @@ sub process
        
        # send out a pc50 on EVERY channel all at once
        if ($t >= $last_pc50 + $DXProt::pc50_interval) {
-               $pc50s = pc50($me, scalar DXChannel::get_all_users);
+               $pc50s = pc50($main::me, scalar DXChannel::get_all_users);
                eph_dup($pc50s);
                $last_pc50 = $t;
        }
 
        foreach $dxchan (@dxchan) {
                next unless $dxchan->is_node();
-               next if $dxchan == $me;
+               next if $dxchan == $main::me;
 
                # send the pc50
                $dxchan->send($pc50s) if $pc50s;
@@ -1190,7 +1269,7 @@ sub send_dx_spot
        # 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) {
-               next if $dxchan == $me;
+               next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
                $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
        }
@@ -1237,13 +1316,13 @@ sub send_wwv_spot
        my @dxchan = DXChannel->get_all();
        my $dxchan;
        my ($wwv_dxcc, $wwv_itu, $wwv_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-       my @dxcc = Prefix::extract($_[7]);
+       my @dxcc = Prefix::extract($_[6]);
        if (@dxcc > 0) {
                $wwv_dxcc = $dxcc[1]->dxcc;
                $wwv_itu = $dxcc[1]->itu;
                $wwv_cq = $dxcc[1]->cq;                                         
        }
-       @dxcc = Prefix::extract($_[8]);
+       @dxcc = Prefix::extract($_[7]);
        if (@dxcc > 0) {
                $org_dxcc = $dxcc[1]->dxcc;
                $org_itu = $dxcc[1]->itu;
@@ -1253,7 +1332,7 @@ sub send_wwv_spot
        # 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) {
-               next if $dxchan == $me;
+               next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
                my $routeit;
                my ($filter, $hops);
@@ -1284,13 +1363,13 @@ sub send_wcy_spot
        my @dxchan = DXChannel->get_all();
        my $dxchan;
        my ($wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
-       my @dxcc = Prefix::extract($_[11]);
+       my @dxcc = Prefix::extract($_[10]);
        if (@dxcc > 0) {
                $wcy_dxcc = $dxcc[1]->dxcc;
                $wcy_itu = $dxcc[1]->itu;
                $wcy_cq = $dxcc[1]->cq;                                         
        }
-       @dxcc = Prefix::extract($_[12]);
+       @dxcc = Prefix::extract($_[11]);
        if (@dxcc > 0) {
                $org_dxcc = $dxcc[1]->dxcc;
                $org_itu = $dxcc[1]->itu;
@@ -1300,7 +1379,7 @@ sub send_wcy_spot
        # 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) {
-               next if $dxchan == $me;
+               next if $dxchan == $main::me;
                next if $dxchan == $self;
 
                $dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, $wcy_dxcc, $wcy_itu, $wcy_cq, $org_dxcc, $org_itu, $org_cq);
@@ -1344,8 +1423,7 @@ sub send_announce
                $to = '';
        }
        $target = "ALL" if !$target;
-       
-       Log('ann', $target, $_[0], $text);
+
 
        # obtain country codes etc 
        my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
@@ -1362,10 +1440,23 @@ sub send_announce
                $org_cq = $dxcc[1]->cq;                                         
        }
 
+       if ($self->{inannfilter}) {
+               my ($filter, $hops) = 
+                       $self->{inannfilter}->it(@_, $self->{call}, 
+                                                                        $ann_dxcc, $ann_itu, $ann_cq,
+                                                                        $org_dxcc, $org_itu, $org_cq);
+               unless ($filter) {
+                       dbg("PCPROT: Rejected by input announce filter") if isdbg('chanerr');
+                       return;
+               }
+       }
+
+       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) {
-               next if $dxchan == $me;
+               next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
                $dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call}, $ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
        }
@@ -1458,103 +1549,13 @@ sub route
        if ($dxchan) {
                my $routeit = adjust_hops($dxchan, $line);   # adjust its hop count by node name
                if ($routeit) {
-                       $dxchan->send($routeit) unless $dxchan == $me;
+                       $dxchan->send($routeit) unless $dxchan == $main::me;
                }
        } else {
                dbg("PCPROT: No route available, dropped") if isdbg('chanerr');
        }
 }
 
-# broadcast a message to all clusters taking into account isolation
-# [except those mentioned after buffer]
-sub broadcast_ak1a
-{
-       my $s = shift;                          # the line to be rebroadcast
-       my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       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
-       foreach $dxchan (@dxchan) {
-               next if grep $dxchan == $_, @except;
-               next if $dxchan == $me;
-               
-               my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-               $dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
-       }
-}
-
-# broadcast a message to all clusters ignoring isolation
-# [except those mentioned after buffer]
-sub broadcast_all_ak1a
-{
-       my $s = shift;                          # the line to be rebroadcast
-       my @except = @_;                        # to all channels EXCEPT these (dxchannel refs)
-       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
-       foreach $dxchan (@dxchan) {
-               next if grep $dxchan == $_, @except;
-               next if $dxchan == $me;
-
-               my $routeit = adjust_hops($dxchan, $s);      # adjust its hop count by node name
-               $dxchan->send($routeit);
-       }
-}
-
-# broadcast to all users
-# storing the spot or whatever until it is in a state to receive it
-sub broadcast_users
-{
-       my $s = shift;                          # the line to be rebroadcast
-       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 = DXChannel::get_all_users();
-       my $dxchan;
-       my @out;
-       
-       foreach $dxchan (@dxchan) {
-               next if grep $dxchan == $_, @except;
-               push @out, $dxchan;
-       }
-       broadcast_list($s, $sort, $fref, @out);
-}
-
-# broadcast to a list of users
-sub broadcast_list
-{
-       my $s = shift;
-       my $sort = shift;
-       my $fref = shift;
-       my $dxchan;
-       
-       foreach $dxchan (@_) {
-               my $filter = 1;
-               next if $dxchan == $me;
-               
-               if ($sort eq 'dx') {
-                   next unless $dxchan->{dx};
-                       ($filter) = $dxchan->{spotsfilter}->it(@{$fref}) if ref $fref;
-                       next unless $filter;
-               }
-               next if $sort eq 'ann' && !$dxchan->{ann} && $s !~ /^To\s+LOCAL\s+de\s+(?:$main::myalias|$main::mycall)/i;
-               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 'talk') {
-                       $dxchan->send($s);      
-               } else {
-                       $dxchan->delay($s);
-               }
-       }
-}
-
-
 #
 # obtain the hops from the list for this callsign and pc no 
 #
@@ -1769,11 +1770,11 @@ sub disconnect
 #
 sub talk
 {
-       my ($self, $from, $to, $via, $line) = @_;
+       my ($self, $from, $to, $via, $line, $origin) = @_;
        
        $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);
+       $self->send(DXProt::pc10($from, $to, $via, $line, $origin));
+       Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
 }
 
 # send it if it isn't the except list and isn't isolated and still has a hop count
@@ -1831,7 +1832,7 @@ sub broadcast_route
        unless ($self->{isolate}) {
                foreach $dxchan (@dxchan) {
                        next if $dxchan == $self;
-                       next if $dxchan == $me;
+                       next if $dxchan == $main::me;
                        $dxchan->send_route($generate, @_);
                }
        }
@@ -1895,12 +1896,13 @@ sub in_filter_route
 sub eph_dup
 {
        my $s = shift;
+       my $r;
 
        # chop the end off
        $s =~ s/\^H\d\d?\^?\~?$//;
-       return 1 if exists $eph{$s};
+       $r = 1 if exists $eph{$s};    # pump up the dup if it keeps circulating
        $eph{$s} = $main::systime;
-       return undef;
+       return $r;
 }
 
 sub eph_del_regex
@@ -1919,7 +1921,7 @@ sub eph_clean
        my ($key, $val);
        
        while (($key, $val) = each %eph) {
-               if ($main::systime - $val > 90) {
+               if ($main::systime - $val > 180) {
                        delete $eph{$key};
                }
        }