projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set def sendverity=0, some hostname changes
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 4940c9102116050b86eae9604fafc732b34d849b..fe7af2dd7b24d7e8ddc20fbdf02f4e4ee01c1886 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-35,7
+35,7
@@
use Script;
use DXProtHandle;
use Time::HiRes qw(gettimeofday tv_interval);
use DXProtHandle;
use Time::HiRes qw(gettimeofday tv_interval);
-use
Mojo::IOLoop::
Subprocess;
+use
DX
Subprocess;
use strict;
use strict;
@@
-49,7
+49,7
@@
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
%pc92_find $pc92_find_timeout $pc92_short_update_period
$next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug
$pc92_extnode_update_period $pc50_interval
%pc92_find $pc92_find_timeout $pc92_short_update_period
$next_pc92_obs_timeout $pc92_slug_changes $last_pc92_slug
$pc92_extnode_update_period $pc50_interval
- $pc92_keepalive_period
+ $pc92_keepalive_period
$senderverify
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
);
$pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11
@@
-82,6
+82,8
@@
$pc92_extnode_update_period = 1*60*60; # the update period for external nodes
$pc92_keepalive_period = 1*60*60; # frequency of PC92 K (keepalive) records
%pc92_find = (); # outstanding pc92 find operations
$pc92_find_timeout = 30; # maximum time to wait for a reply
$pc92_keepalive_period = 1*60*60; # frequency of PC92 K (keepalive) records
%pc92_find = (); # outstanding pc92 find operations
$pc92_find_timeout = 30; # maximum time to wait for a reply
+$senderverify = 0; # 1 = check spotter is on node it says it is and check ip address if available
+ # 2 = do 1 and dump if check
@checklist =
@checklist =
@@
-537,6
+539,8
@@
sub process
if ($main::systime - 3600 > $last_hour) {
$last_hour = $main::systime;
}
if ($main::systime - 3600 > $last_hour) {
$last_hour = $main::systime;
}
+
+ pc11_process();
}
#
}
#
@@
-561,6
+565,8
@@
sub send_dx_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
+ next if $dxchan == $self;
+ next if $dxchan->is_rbn;
if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
unless ($pc11) {
my @f = split /\^/, $line;
if ($line =~ /PC61/ && !($dxchan->is_spider || $dxchan->is_user)) {
unless ($pc11) {
my @f = split /\^/, $line;
@@
-621,6
+627,7
@@
sub send_wwv_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self && $self->is_node;
+ next if $dxchan->is_rbn;
my $routeit;
my ($filter, $hops);
my $routeit;
my ($filter, $hops);
@@
-655,6
+662,7
@@
sub send_wcy_spot
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self;
foreach $dxchan (@dxchan) {
next if $dxchan == $main::me;
next if $dxchan == $self;
+ next if $dxchan->is_rbn;
$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, @dxcc);
}
$dxchan->wcy($line, $self->{isolate}, @_, $self->{call}, @dxcc);
}
@@
-738,6
+746,7
@@
sub send_announce
next if $dxchan == $self && $self->is_node;
next if $from_pc9x && $dxchan->{do_pc9x};
next if $target eq 'LOCAL' && $dxchan->is_node;
next if $dxchan == $self && $self->is_node;
next if $from_pc9x && $dxchan->{do_pc9x};
next if $target eq 'LOCAL' && $dxchan->is_node;
+ next if $dxchan->is_rbn;
$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
@a[0..2], @b[0..2]);
}
$dxchan->announce($line, $self->{isolate}, $to, $target, $text, @_, $self->{call},
@a[0..2], @b[0..2]);
}
@@
-810,6
+819,7
@@
sub send_chat
next unless $dxchan->is_spider && $dxchan->do_pc9x;
next if $target eq 'LOCAL';
}
next unless $dxchan->is_spider && $dxchan->do_pc9x;
next if $target eq 'LOCAL';
}
+ next if $dxchan->is_rbn;
$dxchan->chat($line, $self->{isolate}, $target, $_[1],
$text, @_, $self->{call}, @a[0..2], @b[0..2]);
$dxchan->chat($line, $self->{isolate}, $target, $_[1],
$text, @_, $self->{call}, @a[0..2], @b[0..2]);
@@
-866,11
+876,11
@@
sub send_local_config
my @remotenodes;
if ($self->{isolate}) {
my @remotenodes;
if ($self->{isolate}) {
- dbg("send_local_config: isolated");
+ dbg("
$self->{call}
send_local_config: isolated");
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
@localnodes = ( $main::routeroot );
$self->send_route($main::mycall, \&pc19, 1, $main::routeroot);
} elsif ($self->{do_pc9x}) {
- dbg("send_local_config: doing pc9x");
+ dbg("
$self->{call}
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}/;
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}/;
@@
-881,7
+891,7
@@
sub send_local_config
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
# and are not themselves isolated, this to make sure that isolated nodes
# don't appear outside of this node
- dbg("send_local_config: traditional");
+ dbg("
$self->{call}
send_local_config: traditional");
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
# send locally connected nodes
my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
@@
-923,7
+933,7
@@
sub gen_my_pc92_config
clear_pc92_changes(); # remove any slugged data, we are generating it as now
my @dxchan = grep { $_->call ne $main::mycall && !$_->{isolate} } DXChannel::get_all();
dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
clear_pc92_changes(); # remove any slugged data, we are generating it as now
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;
+ my @localnodes = map { my $r = Route::get($_->{call});
($_->is_node || $_->is_user) &&
$r ? $r : () } @dxchan;
dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
return pc92c($node, @localnodes);
} else {
dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
return pc92c($node, @localnodes);
} else {
@@
-1216,7
+1226,7
@@
sub spawn_cmd
no strict 'refs';
no strict 'refs';
- my $fc =
Mojo::IOLoop::
Subprocess->new;
+ my $fc =
DX
Subprocess->new;
# just behave normally if something has set the "one-shot" _nospawn in the channel
if ($self->{_nospawn}) {
# just behave normally if something has set the "one-shot" _nospawn in the channel
if ($self->{_nospawn}) {