projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix missing IP addresses on spots and PC92 A records
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index dc5dc0b99e5bc08198e96831a7853db07dea0807..ac675f7cafefa6496064a65172c27a9a6bc32e88 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-33,9
+33,10
@@
use Route;
use Route::Node;
use Script;
use DXProtHandle;
use Route::Node;
use Script;
use DXProtHandle;
+use DXCIDR;
use Time::HiRes qw(gettimeofday tv_interval);
use Time::HiRes qw(gettimeofday tv_interval);
-use
Mojo::IOLoop::
Subprocess;
+use
DX
Subprocess;
use strict;
use strict;
@@
-49,7
+50,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
+83,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 =
@@
-295,9
+298,9
@@
sub start
# log it
my $host = $self->{conn}->peerhost;
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
# log it
my $host = $self->{conn}->peerhost;
$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
+ $host ||= $host if is_ipaddr($host);
$host ||= "unknown";
$self->{hostname} = $host if is_ipaddr($host);
$host ||= "unknown";
$self->{hostname} = $host if is_ipaddr($host);
-
Log('DXProt', "$call connected from $host");
# remember type of connection
Log('DXProt', "$call connected from $host");
# remember type of connection
@@
-426,14
+429,15
@@
sub normal
}
}
}
}
+ my $origin = $self->{call};
+
if (defined &Local::pcprot) {
my $r;
if (defined &Local::pcprot) {
my $r;
- eval { $r = Local::pcprot($self, $pcno, $line, @field); };
+ eval { $r = Local::pcprot($self, $pcno, $line,
$origin, \
@field); };
return if $r; # i.e don't process it
}
# send it out for processing
return if $r; # i.e don't process it
}
# send it out for processing
- my $origin = $self->{call};
no strict 'subs';
my $sub = "handle_$pcno";
no strict 'subs';
my $sub = "handle_$pcno";
@@
-537,6
+541,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
+567,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
+629,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
+664,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);
}
@@
-730,6
+740,7
@@
sub send_announce
}
Log('ann', $target, $from, $text);
}
Log('ann', $target, $from, $text);
+ AnnTalk::add_anncache('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
# 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
@@
-738,6
+749,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
+822,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]);
@@
-923,7
+936,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 {
@@
-1069,7
+1082,7
@@
sub get_hops
{
my $pcno = shift;
my $hops = $DXProt::hopcount{$pcno};
{
my $pcno = shift;
my $hops = $DXProt::hopcount{$pcno};
- $hops = $DXProt::def_hopcount
if !
$hops;
+ $hops = $DXProt::def_hopcount
unless
$hops;
return "H$hops";
}
return "H$hops";
}
@@
-1216,7
+1229,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}) {
@@
-1767,6
+1780,8
@@
sub import_chat
my $via = $target;
$via = '*' if $target eq 'ALL' || $target eq 'SYSOP';
Log('ann', $target, $main::mycall, $text);
my $via = $target;
$via = '*' if $target eq 'ALL' || $target eq 'SYSOP';
Log('ann', $target, $main::mycall, $text);
+ AnnTalk::add_anncache('ann', $target, $main::mycall, $text);
+
$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
} else {
DXCommandmode::send_chats($main::me, $target, $text);
$main::me->normal(DXProt::pc93($target, $main::mycall, $via, $text));
} else {
DXCommandmode::send_chats($main::me, $target, $text);