projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix (very) rare disconnect user just before disconnecting node bug.
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index f8b3e08bbfebf21e27475c5a46cd31b1f9b5f841..96d6c353317b6835bdef03fe89b4d6c10b0ee2c2 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-221,6
+221,8
@@
sub init
$main::me->{registered} = 1;
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
$main::me->{registered} = 1;
$main::me->{version} = $main::version;
$main::me->{build} = $main::build;
+ $main::me->{do_pc92} = 1;
+ $main::me->{via_pc92} = 1;
}
#
}
#
@@
-430,6
+432,7
@@
sub process
import_chat();
if ($main::systime >= $last_pc92_update + $pc92_update_period) {
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);
send_pc92_update();
time_out_pc92_routes();
$last_pc92_update = $main::systime + int rand(180);
@@
-776,7
+779,7
@@
sub gen_pc92_update
my $node;
my @lines;
my $node;
my @lines;
- dbg('DXProt::
send
_pc92_update') if isdbg('trace');
+ dbg('DXProt::
gen
_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();
# send 'my' configuration for all users and pc92 capable nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
@@
-831,20
+834,31
@@
sub send_pc92_update
# broadcast the lines to all PC92 nodes
for (@out) {
# 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
{
}
}
sub time_out_pc92_routes
{
- my @nodes = grep {$_->
do_pc92 || $_->via_pc92
} Route::Node::get_all();
+ my @nodes = grep {$_->
call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)
} Route::Node::get_all();
my @rdel;
foreach my $n (@nodes) {
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 $dxchan->{call} on obscount") if isdbg('route');
+ $dxchan->disconnect;
+ next;
+ }
my @parents = map {Route::Node::get($_)} $n->parents;
for (@parents) {
my @parents = map {Route::Node::get($_)} $n->parents;
for (@parents) {
- push @rdel, $n->del($_) if $_;
+ if ($_) {
+ dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+ push @rdel, $n->del($_);
+ }
}
}
+ } else {
+ dbg("ROUTE: obscount on $n->{call} now $o") if isdbg('route');
}
}
for (@rdel) {
}
}
for (@rdel) {
@@
-1219,15
+1233,15
@@
sub broadcast_route_pc9x
my @dxchan = DXChannel::get_all_nodes();
my $dxchan;
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) {
$line = &$generate(@_);
}
$line =~ /\^H(\d+)\^\~?$/;
unless ($1 > 0 && $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->{do_pc92};
next unless $dxchan->isa('DXProt');
next unless $dxchan->{do_pc92};
next unless $dxchan->isa('DXProt');