fix unwanted dupe notifications on looped PC12

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index b775965660738029cf0e8a98385363c169652890..296553d24c16b0875d4d3f2a870bbb95d9ad9215 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -69,7 +69,7 @@ $eph_pc15_restime = 6*60;
 $eph_pc34_restime = 30;
 $pingint = 5*60;
 $obscount = 2;
-$chatdupeage = 20 * 60 * 60;
+$chatdupeage = 20 * 60;
 $chatimportfn = "$main::root/chat_import";
 $investigation_int = 12*60*60; # time between checks to see if we can see this node
 $pc19_version = 5466;                  # the visible version no for outgoing PC19s generated from pc59
@@ -351,7 +351,7 @@ sub start
 sub sendinit
 {
        my $self = shift;
-       $self->send(pc18());
+       $self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
 }
 
 #
@@ -476,9 +476,8 @@ sub process
                        # all my non pc9x dependent nodes.
                        if ($main::systime >= $dxchan->{next_pc92_update}) {
                                if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
-                                       $dxchan->send_pc92_update($dxchan->{call});
+                                       $dxchan->broadcast_pc92_update($dxchan->{call});
                                }
-                               $dxchan->update_pc92_next($pc92_update_period);
                        }
                }
        }
@@ -625,6 +624,7 @@ sub send_announce
        my $target = $_[6];
        my $to = 'To ';
        my $text = unpad($_[2]);
+       my $from = $_[0];
 
        if ($_[3] eq '*') {     # sysops
                $target = "SYSOP";
@@ -641,7 +641,7 @@ sub send_announce
 
 
        # obtain country codes etc
-       my @a = Prefix::cty_data($_[0]);
+       my @a = Prefix::cty_data($from);
        my @b = Prefix::cty_data($_[4]);
        if ($self->{inannfilter}) {
                my ($filter, $hops) =
@@ -654,12 +654,20 @@ sub send_announce
                }
        }
 
-       if (AnnTalk::dup($_[0], $_[1], $_[2])) {
-               dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-               return;
+       if (AnnTalk::dup($from, $target, $_[2])) {
+               my $dxchan = DXChannel::get($from);
+               if ($self == $main::me && $dxchan && $dxchan->is_user) {
+                       if ($dxchan->priv < 5) {
+                               $dxchan->send($dxchan->msg('dup'));
+                               return;
+                       }
+               } else {
+                       dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+                       return;
+               }
        }
 
-       Log('ann', $target, $_[0], $text);
+       Log('ann', $target, $from, $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
@@ -673,7 +681,7 @@ sub send_announce
        }
 }
 
-my $msgid = 0;
+my $msgid = int rand(1000);
 
 sub nextchatmsgid
 {
@@ -693,6 +701,7 @@ sub send_chat
        my $target = $_[3];
        my $text = unpad($_[2]);
        my $ak1a_line;
+       my $from = $_[0];
 
        # munge the group and recast the line if required
        if ($target =~ s/\.LST$//) {
@@ -700,7 +709,7 @@ sub send_chat
        }
 
        # obtain country codes etc
-       my @a = Prefix::cty_data($_[0]);
+       my @a = Prefix::cty_data($from);
        my @b = Prefix::cty_data($_[4]);
        if ($self->{inannfilter}) {
                my ($filter, $hops) =
@@ -713,13 +722,21 @@ sub send_chat
                }
        }
 
-       if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
-               dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
-               return;
+       if (AnnTalk::dup($from, $target, $_[2], $main::systime + $chatdupeage)) {
+               my $dxchan = DXChannel::get($from);
+               if ($self == $main::me && $dxchan && $dxchan->is_user) {
+                       if ($dxchan->priv < 5) {
+                               $dxchan->send($dxchan->msg('dup'));
+                               return;
+                       }
+               } else {
+                       dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
+                       return;
+               }
        }
 
 
-       Log('chat', $target, $_[0], $text);
+       Log('chat', $target, $from, $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
@@ -841,16 +858,6 @@ sub gen_my_pc92_config
        }
 }
 
-sub gen_pc92_update
-{
-       my $self = shift;
-
-       # send 'my' configuration for all channels
-       my $l = gen_my_pc92_config($main::routeroot);
-       return $l;
-}
-
-
 sub send_last_pc92_config
 {
        my $self = shift;
@@ -873,15 +880,17 @@ sub send_pc92_config
        $self->send($node->last_PC92C);
 }
 
-sub send_pc92_update
+sub broadcast_pc92_update
 {
        my $self = shift;
        my $call = shift;
 
-       dbg('DXProt::send_pc92_update') if isdbg('trace');
+       dbg('DXProt::broadcast_pc92_update') if isdbg('trace');
 
-       my $l = gen_my_pc92_config(Route::Node::get($call));
+       my $nref = Route::Node::get($call);
+       my $l = $nref->last_PC92C(gen_my_pc92_config($nref));
        $main::me->broadcast_route_pc9x($main::mycall, undef, $l, 0);
+       $self->update_pc92_next($pc92_update_period);
 }
 
 sub time_out_pc92_routes