#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
package DXProt;
sub sendinit
{
my $self = shift;
- $self->send(pc18());
+ $self->send(pc18(($self->{isolate} || !$self->user->wantpc9x) ? "" : " pc9x"));
}
#
}
}
- # send out a PC92 config record if required
- if ($main::systime >= $dxchan->{next_pc92_update}) {
- if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
- $dxchan->send_pc92_update($dxchan->{call});
- }
- $dxchan->update_pc92_next($pc92_update_period);
- }
}
Investigate::process();
}
$last10 = $t;
+
+ # send out config broadcasts
+ foreach $dxchan (@dxchan) {
+ next unless $dxchan->is_node;
+
+ # send out a PC92 config record if required for me and
+ # all my non pc9x dependent nodes.
+ if ($main::systime >= $dxchan->{next_pc92_update}) {
+ if ($dxchan->{call} eq $main::mycall || !$dxchan->{do_pc9x}) {
+ $dxchan->broadcast_pc92_update($dxchan->{call});
+ }
+ }
+ }
}
if ($main::systime - 3600 > $last_hour) {
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
my @remotenodes;
if ($self->{isolate}) {
+ dbg("send_local_config: isolated");
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
+ dbg("send_local_config: doing pc9x");
my $node = Route::Node::get($self->{call});
$self->send_last_pc92_config($main::routeroot);
$self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
+ dbg("send_local_config: traditional");
+
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
}
}
-sub gen_pc92_update
-{
- my $self = shift;
- my $with_pc92_nodes = shift;
- my $node;
- my @lines;
- my @dxchan;
- my @localnodes;
-
- dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
-
- # send 'my' configuration for all channels
- push @lines, gen_my_pc92_config($main::routeroot);
-
-# if ($with_pc92_nodes) {
- # send out the configuration of all the directly connected PC92 nodes with current configuration
- # but with the dates that the last config came in with.
-# @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc9x} } DXChannel::get_all_nodes();
-# dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-# @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-# dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-# foreach $node (@localnodes) {
-# if ($node && $node->lastid->{92}) {
-# my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
-# push @lines, gen_pc92_with_time($node->call, 'C', $node->lastid->{92}, @rout);
-# }
-# }
-# }
-
- # send the configuration of all the directly connected 'external' nodes that don't handle PC92
- # out with the 'external' marker on the first node.
-# @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc9x} } DXChannel::get_all_nodes();
-# dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
-# @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
-# dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
-# foreach $node (@localnodes) {
-# if ($node) {
-# push @lines, gen_my_pc92_config($node);
-# }
-# }
-
- dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
- return @lines;
-}
-
-
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
my $o = $n->dec_obs;
if ($o <= 0) {
if (my $dxchan = DXChannel::get($n->call)) {
- dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
+ dbg("disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('obscount');
$dxchan->disconnect;
next;
}
my @parents = map {Route::Node::get($_)} $n->parents;
for (@parents) {
if ($_) {
- dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+ dbg("deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('obscount');
push @rdel, $n->del($_);
}
}
} else {
- dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
+ dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('obscount');
}
}
for (@rdel) {
}
}
+# broadcast everywhere
sub broadcast_route
{
my $self = shift;
}
unless ($self->{isolate}) {
foreach $dxchan (@dxchan) {
- next if $dxchan == $self;
- next if $dxchan == $main::me;
+ next if $dxchan == $self || $dxchan == $main::me;
+ next if $origin eq $dxchan->{call}; # don't route some from this call back again.
+ next unless $dxchan->isa('DXProt');
+
+ $dxchan->send_route($origin, $generate, @_);
+ }
+ }
+}
+
+# broadcast to non-pc9x nodes
+sub broadcast_route_nopc9x
+{
+ my $self = shift;
+ my $origin = shift;
+ my $generate = shift;
+ my $line = shift;
+ my @dxchan = DXChannel::get_all_nodes();
+ my $dxchan;
+
+ if ($line) {
+ $line =~ /\^H(\d+)\^?\~?$/;
+ return unless $1 > 0;
+ }
+ unless ($self->{isolate}) {
+ foreach $dxchan (@dxchan) {
+ next if $dxchan == $self || $dxchan == $main::me;
+ next if $origin eq $dxchan->{call}; # don't route some from this call back again.
next unless $dxchan->isa('DXProt');
next if $dxchan->{do_pc9x};
next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
$self->send($line);
}
+# broadcast only to pc9x nodes
sub broadcast_route_pc9x
{
my $self = shift;
foreach $dxchan (@dxchan) {
next if $dxchan == $self || $dxchan == $main::me;
next if $origin eq $dxchan->{call}; # don't route some from this call back again.
- next unless $dxchan->{do_pc9x};
next unless $dxchan->isa('DXProt');
+ next unless $dxchan->{do_pc9x};
$dxchan->send($line);
}
return unless $self->user->wantpc16;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc16, $line, 1, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc16, $line, 1, @_);
}
sub route_pc17
return unless $self->user->wantpc16;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc17, $line, 1, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc17, $line, 1, @_);
}
sub route_pc19
my $self = shift;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc19, $line, scalar @_, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc19, $line, scalar @_, @_);
}
sub route_pc21
my $self = shift;
my $origin = shift;
my $line = shift;
- broadcast_route($self, $origin, \&pc21, $line, scalar @_, @_);
+ broadcast_route_nopc9x($self, $origin, \&pc21, $line, scalar @_, @_);
}
sub route_pc24
projects / spider.git / blobdiff