projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cater better for 0 pingint in links cmd
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 16623045ba106afef6b63272e5cdad006ad522e5..cd229c0f2d113370a11869e7d06de450efc76edb 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-41,14
+41,17
@@
use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
$last_hour $last10 %eph %pings %rcmds $ann_to_talk
$pingint $obscount %pc19list $chatdupeage $chatimportfn
$investigation_int $pc19_version $myprot_version
$last_hour $last10 %eph %pings %rcmds $ann_to_talk
$pingint $obscount %pc19list $chatdupeage $chatimportfn
$investigation_int $pc19_version $myprot_version
- %nodehops $baddx $badspotter $badnode $censorpc
$rspfcheck
+ %nodehops $baddx $badspotter $badnode $censorpc
$allowzero $decode_dk0wcy $send_opernam @checklist
$eph_pc15_restime $pc9x_past_age $pc9x_future_age
$allowzero $decode_dk0wcy $send_opernam @checklist
$eph_pc15_restime $pc9x_past_age $pc9x_future_age
+ $pc10_dupe_age
);
$pc9x_past_age = 62*60; # maximum age in the past of a px9x (a config record might be the only
# thing a node might send - once an hour)
$pc9x_future_age = 5*60; # maximum age in the future ditto
);
$pc9x_past_age = 62*60; # maximum age in the past of a px9x (a config record might be the only
# thing a node might send - once an hour)
$pc9x_future_age = 5*60; # maximum age in the future ditto
+$pc10_dupe_age = 45; # just something to catch duplicate PC10->PC93 conversions
+
# incoming talk commands
sub handle_10
# incoming talk commands
sub handle_10
@@
-58,8
+61,10
@@
sub handle_10
my $line = shift;
my $origin = shift;
my $line = shift;
my $origin = shift;
- # rsfp check
- return if $rspfcheck and !$self->rspfcheck(0, $_[6], $_[1]);
+ # this is to catch loops caused by bad software ...
+ if (eph_dup($line, $pc10_dupe_age)) {
+ return;
+ }
# will we allow it at all?
if ($censorpc) {
# will we allow it at all?
if ($censorpc) {
@@
-106,8
+111,8
@@
sub handle_10
RouteDB::update($_[6], $self->{call});
# RouteDB::update($to, $_[6]);
RouteDB::update($_[6], $self->{call});
# RouteDB::update($to, $_[6]);
- # convert this to a PC93 and process it as such
- $
self
->normal(pc93($to, $from, $via, $_[3], $_[6]));
+ # convert this to a PC93
, coming from mycall with origin set
and process it as such
+ $
main::me
->normal(pc93($to, $from, $via, $_[3], $_[6]));
}
# DX Spot handling
}
# DX Spot handling
@@
-126,9
+131,6
@@
sub handle_11
}
}
}
}
- # rsfp check
- # return if $rspfcheck and !$self->rspfcheck(1, $_[7], $_[6]);
-
# is the spotted callsign blank? This should really be trapped earlier but it
# could break other protocol sentences. Also check for lower case characters.
if ($_[2] =~ /^\s*$/) {
# is the spotted callsign blank? This should really be trapped earlier but it
# could break other protocol sentences. Also check for lower case characters.
if ($_[2] =~ /^\s*$/) {
@@
-286,8
+288,6
@@
sub handle_12
my $line = shift;
my $origin = shift;
my $line = shift;
my $origin = shift;
- # return if $rspfcheck and !$self->rspfcheck(1, $_[5], $_[1]);
-
# announce duplicate checking
$_[3] =~ s/^\s+//; # remove leading blanks
# announce duplicate checking
$_[3] =~ s/^\s+//; # remove leading blanks
@@
-360,7
+360,7
@@
sub handle_15
my $origin = shift;
if (eph_dup($line, $eph_pc15_restime)) {
my $origin = shift;
if (eph_dup($line, $eph_pc15_restime)) {
-
dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr')
;
+
return
;
} else {
unless ($self->{isolate}) {
DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
} else {
unless ($self->{isolate}) {
DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me
@@
-402,7
+402,12
@@
sub handle_16
}
if (eph_dup($line)) {
}
if (eph_dup($line)) {
- dbg("PCPROT: dup PC16 detected") if isdbg('chanerr');
+ return;
+ }
+
+ # isolate now means only accept stuff from this call only
+ if ($self->{isolate} && $ncall ne $self->{call}) {
+ dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
return;
}
return;
}
@@
-504,6
+509,12
@@
sub handle_17
return;
}
return;
}
+ # isolate now means only accept stuff from this call only
+ if ($self->{isolate} && $ncall ne $self->{call}) {
+ dbg("PCPROT: $self->{call} isolated, $ncall ignored") if isdbg('chanerr');
+ return;
+ }
+
RouteDB::delete($ncall, $self->{call});
my $uref = Route::User::get($ucall);
RouteDB::delete($ncall, $self->{call});
my $uref = Route::User::get($ucall);
@@
-545,7
+556,6
@@
sub handle_17
$self->tell_buddies('logoutb', $ucall, $ncall);
if (eph_dup($line)) {
$self->tell_buddies('logoutb', $ucall, $ncall);
if (eph_dup($line)) {
- dbg("PCPROT: dup PC17 detected") if isdbg('chanerr');
return;
}
return;
}
@@
-686,6
+696,12
@@
sub handle_19
}
}
}
}
+ # isolate now means only accept stuff from this call only
+ if ($self->{isolate} && $call ne $self->{call}) {
+ dbg("PCPROT: $self->{call} isolated, $call ignored") if isdbg('chanerr');
+ next;
+ }
+
my $user = check_add_node($call);
# if (eph_dup($genline)) {
my $user = check_add_node($call);
# if (eph_dup($genline)) {
@@
-789,11
+805,16
@@
sub handle_21
eph_del_regex("^PC1[679].*$call");
# if I get a PC21 from the same callsign as self then ignore it
eph_del_regex("^PC1[679].*$call");
# if I get a PC21 from the same callsign as self then ignore it
- if ($call eq $self->
call
) {
+ if ($call eq $self->
{call}
) {
dbg("PCPROT: self referencing PC21 from $self->{call}");
return;
}
dbg("PCPROT: self referencing PC21 from $self->{call}");
return;
}
+ # for the above reason and also because of the check for PC21s coming
+ # in for self->call from outside being ignored further down
+ # we don't need any isolation code here, because we will never
+ # act on a PC21 with self->call in it.
+
RouteDB::delete($call, $self->{call});
my $parent = Route::Node::get($self->{call});
RouteDB::delete($call, $self->{call});
my $parent = Route::Node::get($self->{call});
@@
-833,7
+854,6
@@
sub handle_21
}
if (eph_dup($line)) {
}
if (eph_dup($line)) {
- dbg("PCPROT: dup PC21 detected") if isdbg('chanerr');
return;
}
return;
}
@@
-878,10
+898,6
@@
sub handle_23
}
}
}
}
- # only do a rspf check on PC23 (not 27)
- if ($pcno == 23) {
- return if $rspfcheck and !$self->rspfcheck(1, $_[8], $_[7])
- }
# do some de-duping
my $d = cltounix($_[1], sprintf("%02d18Z", $_[2]));
# do some de-duping
my $d = cltounix($_[1], sprintf("%02d18Z", $_[2]));
@@
-941,7
+957,6
@@
sub handle_24
return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on
if (eph_dup($line)) {
return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on
if (eph_dup($line)) {
- dbg("PCPROT: Dup PC24 ignored\n") if isdbg('chanerr');
return;
}
return;
}
@@
-1022,7
+1037,7
@@
sub handle_34
my $line = shift;
my $origin = shift;
if (eph_dup($line, $eph_pc34_restime)) {
my $line = shift;
my $origin = shift;
if (eph_dup($line, $eph_pc34_restime)) {
-
dbg("PCPROT: dupe PC34, ignored") if isdbg('chanerr')
;
+
return
;
} else {
$self->process_rcmd($_[1], $_[2], $_[2], $_[3]);
}
} else {
$self->process_rcmd($_[1], $_[2], $_[2], $_[3]);
}
@@
-1095,7
+1110,6
@@
sub handle_41
my $l = "PC41^$call^$sort";
if (eph_dup($l, $eph_info_restime)) {
my $l = "PC41^$call^$sort";
if (eph_dup($l, $eph_info_restime)) {
- dbg("PCPROT: dup PC41, ignored") if isdbg('chanerr');
return;
}
return;
}
@@
-1176,7
+1190,6
@@
sub handle_49
my $origin = shift;
if (eph_dup($line)) {
my $origin = shift;
if (eph_dup($line)) {
- dbg("PCPROT: Dup PC49 ignored\n") if isdbg('chanerr');
return;
}
return;
}
@@
-1235,7
+1248,6
@@
sub handle_51
RouteDB::update($from, $self->{call});
if (eph_dup($line)) {
RouteDB::update($from, $self->{call});
if (eph_dup($line)) {
- dbg("PCPROT: dup PC51 detected") if isdbg('chanerr');
return;
}
# route down an appropriate thingy
return;
}
# route down an appropriate thingy
@@
-1441,7
+1453,7
@@
sub check_pc9x_t
} elsif ($create) {
$parent = Route::Node->new($call);
}
} elsif ($create) {
$parent = Route::Node->new($call);
}
- $parent->lastid->{$pc} = $t;
+ $parent->lastid->{$pc} = $t
if $parent
;
return $parent;
}
return $parent;
}
@@
-1537,6
+1549,9
@@
sub handle_92
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
}
} elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') {
+ # remember the last channel we arrived on
+ $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
+
# this is the main route section
# here is where all the routes are created and destroyed
# this is the main route section
# here is where all the routes are created and destroyed
@@
-1581,6
+1596,7
@@
sub handle_92
}
$parent = check_pc9x_t($call, $t, 92) || return;
$parent->via_pc92(1);
}
$parent = check_pc9x_t($call, $t, 92) || return;
$parent->via_pc92(1);
+ $parent->PC92C_dxchan($self->{call});
}
} else {
dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
}
} else {
dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
@@
-1589,6
+1605,7
@@
sub handle_92
$parent->here(Route::here($here));
$parent->version($version) if $version && $version > $parent->version;
$parent->build($build) if $build && $build > $parent->build;
$parent->here(Route::here($here));
$parent->version($version) if $version && $version > $parent->version;
$parent->build($build) if $build && $build > $parent->build;
+ $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
shift @ent;
}
}
shift @ent;
}
}
@@
-1617,11
+1634,9
@@
sub handle_92
# we only reset obscounts on config records
$oparent->reset_obs;
# we only reset obscounts on config records
$oparent->reset_obs;
- $oparent->PC92C_dxchan($self->{call}) unless $self->{call} eq $oparent->call;
dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('obscount');
if ($oparent != $parent) {
$parent->reset_obs;
dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('obscount');
if ($oparent != $parent) {
$parent->reset_obs;
- $parent->PC92C_dxchan($self->{call}) unless $self->{call} eq $parent->call;
dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
}
dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount');
}
@@
-1696,6
+1711,7
@@
sub handle_93
return;
}
return;
}
+ # remember that we are converting PC10->PC93
unless ($self->{do_pc9x}) {
dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
return;
unless ($self->{do_pc9x}) {
dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr');
return;
@@
-1711,6
+1727,11
@@
sub handle_93
my $onode = $_[7];
$onode = $pcall if @_ <= 8;
my $onode = $_[7];
$onode = $pcall if @_ <= 8;
+ # this is catch loops caused by bad software ...
+ if (eph_dup("PC93|$from|$text|$onode", $pc10_dupe_age)) {
+ return;
+ }
+
# will we allow it at all?
if ($censorpc) {
my @bad;
# will we allow it at all?
if ($censorpc) {
my @bad;
@@
-1720,11
+1741,6
@@
sub handle_93
}
}
}
}
- # this is catch loops caused by bad software ...
- if (eph_dup("PC93|$from|$text|$onode")) {
- return;
- }
-
# if this is a 'bad spotter' user then ignore it
my $nossid = $from;
$nossid =~ s/-\d+$//;
# if this is a 'bad spotter' user then ignore it
my $nossid = $from;
$nossid =~ s/-\d+$//;