projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
squash some warnings
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 5b213b80d26e1d76aa42b762b798071e4c18e570..cd6a7518348d007968a25cea940334d27db2dfee 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-224,10
+224,13
@@
sub handle_11
# add it
Spot::add(@spot);
# add it
Spot::add(@spot);
+ my $ip = '';
+ $ip ||= $spot[14] if exists $spot[14];
if (isdbg('progress')) {
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]);
+ my $sip = $ip ? sprintf "($ip)" : '' unless $ip =~ m|[\(\)\*]|;
+ $sip ||= '';
+ my $d = ztime($spot[2]);
+ my $s = "SPOT: $spot[1] on $spot[0] \@ $d by $spot[4]$sip\@$spot[7]";
$s .= " '$spot[3]'" if $spot[3];
dbg($s);
}
$s .= " '$spot[3]'" if $spot[3];
dbg($s);
}
@@
-969,6
+972,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;
@@
-1372,6
+1376,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;
@@
-1476,6
+1481,9
@@
sub _add_thingy
my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
my @rout;
my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s;
my @rout;
+ # remove spurious IPV6 prefix on IPV4 addresses
+ $ip =~ s/^::ffff:// if $ip;
+
if ($call) {
my $ncall = $parent->call;
if ($is_node) {
if ($call) {
my $ncall = $parent->call;
if ($is_node) {
@@
-2013,7
+2021,8
@@
sub handle_93
}
if (isdbg('progress')) {
}
if (isdbg('progress')) {
- my $s = sprintf "ANNTALK: $from\@$onode%s -> $to '$text'", $via ne '*' ? " via $via" : '';
+ my $vs = $via ne '*' ? " via $via" : '';
+ my $s = "ANNTALK: $from\@$onode$vs -> $to '$text'";
dbg($s);
}
dbg($s);
}