# 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);
}
}
}
my $target = $_[6];
my $to = 'To ';
my $text = unpad($_[2]);
+ my $from = $_[0];
if ($_[3] eq '*') { # sysops
$target = "SYSOP";
# 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) =
}
}
- if (AnnTalk::dup($_[0], $_[1], $_[2])) {
- dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
- return;
+ if (AnnTalk::dup($from, $_[1], $_[2])) {
+ my $dxchan = DXChannel::get($from);
+ if ($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
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$//) {
}
# 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) =
}
}
- if (AnnTalk::dup($_[0], $_[1], $_[2], $chatdupeage)) {
- dbg("PCPROT: Duplicate Announce ignored") if isdbg('chanerr');
- return;
+ if (AnnTalk::dup($from, $target, $_[2], $chatdupeage)) {
+ my $dxchan = DXChannel::get($from);
+ if ($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
}
}
-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;
$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