$main::me->{registered} = 1;
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
- $main::me->{do_pc92} = 1;
- $main::me->{via_pc92} = 1;
+ $main::me->{do_pc9x} = 1;
}
#
# add this node to the table, the values get filled in later
my $pkg = shift;
my $call = shift;
+
+ # if we have an entry already, then send a PC21 to all connect
+ # old style connections, because we are about to get the real deal
+ if (my $ref = Route::Node::get($call)) {
+ dbg("ROUTE: $call is already in the routing table, deleting") if isdbg('route');
+ my @rout = $ref->delete;
+ $self->route_pc21($main::mycall, undef, @rout) if @rout;
+ }
$main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall;
return $self;
}
# modify the hop count here
- if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
- $trail ||= '';
- $hops--;
- return if $hops < 0;
- $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
- $field[-1] = "H$hops";
+ if ($self != $main::me) {
+ if (my ($hops, $trail) = $line =~ /\^H(\d+)(\^?\~?)?$/) {
+ $trail ||= '';
+ $hops--;
+ return if $hops < 0;
+ $line =~ s/\^H(\d+)(\^?\~?)?$/sprintf('^H%d%s', $hops, $trail)/e;
+ $field[-1] = "H$hops";
+ }
}
# send it out for processing
import_chat();
if ($main::systime >= $last_pc92_update + $pc92_update_period) {
+ dbg("ROUTE: sending pc92 update") if isdbg('route');
send_pc92_update();
time_out_pc92_routes();
$last_pc92_update = $main::systime + int rand(180);
sub send_announce
{
my $self = shift;
+ my $from_pc9x = shift;
my $line = shift;
my @dxchan = DXChannel::get_all();
my $dxchan;
- my $target;
+ my $target = $_[6];
my $to = 'To ';
my $text = unpad($_[2]);
} 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";
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
+ next if $from_pc9x && $dxchan->{do_pc9x};
+ next if $target eq 'LOCAL' && $dxchan->is_node;
$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
@a[0..2], @b[0..2]);
}
sub send_chat
{
my $self = shift;
+ my $from_pc9x = shift;
my $line = shift;
my @dxchan = DXChannel::get_all();
my $dxchan;
if ($dxchan->is_node) {
next if $dxchan == $main::me;
next if $dxchan == $self;
+ next if $from_pc9x && $dxchan->{do_pc9x};
next unless $dxchan->is_spider || $is_ak1a;
next if $target eq 'LOCAL';
if (!$ak1a_line && $is_ak1a) {
- $ak1a_line = DXProt::pc12($_[0], $text, $_[1], "$target.LST");
+ $ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
}
}
dbg('DXProt::send_local_config') if isdbg('trace');
# send our nodes
- if ($self->{do_pc92}) {
+ if ($self->{do_pc9x}) {
$self->send_pc92_config;
} else {
my $node;
}
}
+sub gen_my_pc92_config
+{
+ my $node = shift;
+
+ if ($node->{call} eq $main::mycall) {
+ my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
+ dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
+ my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
+ dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
+ return pc92c($main::routeroot, @localnodes);
+ } else {
+ my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
+ return pc92c($node, @rout);
+ }
+}
+
sub gen_pc92_update
{
my $self = shift;
my $with_pc92_nodes = shift;
my $node;
my @lines;
-
- dbg('DXProt::send_pc92_update') if isdbg('trace');
-
- # send 'my' configuration for all users and pc92 capable nodes
- my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
- my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
- push @lines, pc92c($main::routeroot, @localnodes);
+ 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_pc92} } DXChannel::get_all_nodes();
+ @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;
# 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_pc92} } DXChannel::get_all_nodes();
+ @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) {
- my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
- push @lines, pc92c($node, @rout);
+ push @lines, gen_my_pc92_config($node);
}
}
+
+ dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
return @lines;
}
# broadcast the lines to all PC92 nodes
for (@out) {
- $main::me->broadcast_route_pc9x('', undef, $_, 0);
+ $main::me->broadcast_route_pc9x($main::mycall, undef, $_, 0);
}
}
sub time_out_pc92_routes
{
- my @nodes = grep {$_->do_pc92 || $_->via_pc92} Route::Node::get_all();
+ my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc9x || $_->via_pc92)} Route::Node::get_all();
my @rdel;
foreach my $n (@nodes) {
- if ($n->dec_obs <= 0) {
+ my $o = $n->dec_obs;
+ if ($o <= 0) {
if (my $dxchan = DXChannel::get($n->call)) {
- dbg("ROUTE: disconnecting local pc92 $_->{call} on obscount") if isdbg('route');
+ dbg("ROUTE: disconnecting local pc92 $dxchan->{call} on obscount") if isdbg('route');
$dxchan->disconnect;
next;
}
push @rdel, $n->del($_);
}
}
+ } else {
+ dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
}
}
for (@rdel) {
{
my ($self, $from, $to, $via, $line, $origin) = @_;
- $line =~ s/\^/\\5E/g; # remove any ^ characters
- $self->send(DXProt::pc10($from, $to, $via, $line, $origin));
+ if ($self->{do_pc9x}) {
+ $self->send(pc93($to, $from, $via, $line));
+ } else {
+ $self->send(pc10($from, $to, $via, $line, $origin));
+ }
Log('talk', $to, $from, $via?$via:$self->call, $line) unless $origin && $origin ne $main::mycall;
}
next if $dxchan == $self;
next if $dxchan == $main::me;
next unless $dxchan->isa('DXProt');
- next if $dxchan->{do_pc92};
+ next if $dxchan->{do_pc9x};
next if ($generate == \&pc16 || $generate==\&pc17) && !$dxchan->user->wantsendpc16;
$dxchan->send_route($origin, $generate, @_);
{
my $self = shift;
- return unless $self->{do_pc92};
+ return unless $self->{do_pc9x};
my $origin = shift;
my $generate = shift;
my @dxchan = DXChannel::get_all_nodes();
my $dxchan;
- if ($origin eq $main::mycall) {
+ if ($origin eq $main::mycall && $generate && !$line) {
$line = &$generate(@_);
}
$line =~ /\^H(\d+)\^\~?$/;
unless ($1 > 0 && $self->{isolate}) {
foreach $dxchan (@dxchan) {
- next if $dxchan == $self || $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->{do_pc92};
+ next unless $dxchan->{do_pc9x};
next unless $dxchan->isa('DXProt');
$dxchan->send($line);
projects / spider.git / blobdiff