projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix DXUtil::localdata ?perl bug?
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index d4ce6bf6e4563b4512ed52f2073cae9d2ddc28ac..0f7a1ff381c08c409a9c98eec162ca1908076ceb 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-158,17
+158,21
@@
sub handle_11
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[7])) {
# if this is a 'nodx' node then ignore it
if ($badnode->in($pc->[7])) {
- dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr');
+ dbg("PCPROT: Bad Node
$pc->[7]
, dropped") if isdbg('chanerr');
return;
}
return;
}
- # if this is a 'bad spotter'
user then ignore it
+ # if this is a 'bad spotter'
or an unknown user then ignore it. BUT if it's got an IP address then allow it through
my $nossid = $pc->[6];
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
my $nossid = $pc->[6];
$nossid =~ s/-\d+$//;
if ($badspotter->in($nossid)) {
- dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr');
+ dbg("PCPROT: Bad Spotter
$pc->[6]
, dropped") if isdbg('chanerr');
return;
}
return;
}
+# unless (is_ipaddr($pc->[8]) || DXUser::get_current($pc->[6])) {
+# dbg("PCPROT: Unknown Spotter $pc->[6], dropped") if isdbg('chanerr');
+# return;
+# }
# convert the date to a unix date
my $d = cltounix($pc->[3], $pc->[4]);
# convert the date to a unix date
my $d = cltounix($pc->[3], $pc->[4]);
@@
-220,6
+224,14
@@
sub handle_11
# add it
Spot::add(@spot);
# add it
Spot::add(@spot);
+ if (isdbg('progress')) {
+ my $ip = '';
+ $ip = sprintf "($spot[14])" if $spot[14];
+ my $s = sprintf "SPOT: $spot[1] on $spot[0] \@ %s by $spot[4]$ip\@$spot[7]", cldatetime($spot[2]);
+ $s .= " '$spot[3]'" if $spot[3];
+ dbg($s);
+ }
+
#
# @spot at this point contains:-
# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
#
# @spot at this point contains:-
# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
@@
-957,6
+969,7
@@
sub handle_23
# note this only takes the first one it gets
Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
# note this only takes the first one it gets
Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
+ dbg("WWV: $d $pc->[2], sfi:$sfi k:$k info:$i $pc->[6] $pc->[7] $pc->[8] $r") if isdbg('progress');
if (defined &Local::wwv) {
my $rep;
if (defined &Local::wwv) {
my $rep;
@@
-1360,6
+1373,7
@@
sub handle_73
}
my $wcy = WCY::update($d, @$pc[2..12]);
}
my $wcy = WCY::update($d, @$pc[2..12]);
+ dbg("WCY: " . join ', ', @$pc[2..12]) if isdbg('progress');
if (defined &Local::wcy) {
my $rep;
if (defined &Local::wcy) {
my $rep;
@@
-2000,6
+2014,12
@@
sub handle_93
return;
}
return;
}
+ if (isdbg('progress')) {
+ my $vs = $via ne '*' ? " via $via" : '';
+ my $s = "ANNTALK: $from\@$onode$via -> $to '$text'";
+ dbg($s);
+ }
+
# will we allow it at all?
if ($censorpc) {
my @bad;
# will we allow it at all?
if ($censorpc) {
my @bad;