# add it
Spot::add(@spot);
+ my $ip = '';
+ $ip ||= $spot[14] if exists $spot[14];
+ if (isdbg('progress')) {
+ 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] ? " '$spot[3]'" : q{ ''};
+ $s .= " route: $origin";
+ dbg($s);
+ }
+
#
# @spot at this point contains:-
# freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node
$self->{build} = 0 + $build;
$self->user->build(0 + $build);
$parent->build(0 + $build);
- dbg("DXSpider version $version build $build");
+ dbg("$self->{call} = DXSpider version $version build $build");
unless ($self->is_spider) {
dbg("Change U " . $self->user->sort . " C $self->{sort} -> S");
$self->user->sort('S');
}
# $self->{handle_xml}++ if DXXml::available() && $pc->[1] =~ /\bxml/;
} else {
- dbg("Unknown software");
+ dbg("$self->{call} = Unknown software ($pc->[1] $pc->[2])");
$self->version(50.0);
$self->version($pc->[2] / 100) if $pc->[2] && $pc->[2] =~ /^\d+$/;
$self->user->version($self->version);
if ($pc->[1] =~ /\bpc9x/) {
if ($self->{isolate}) {
- dbg("pc9x recognised, but $self->{call} is isolated, using old protocol");
+ dbg("$self->{call} pc9x recognised, but node is isolated, using old protocol");
} elsif (!$self->user->wantpc9x) {
- dbg("pc9x explicitly switched off on $self->{call}, using old protocol");
+ dbg("$self->{call} pc9x explicitly switched off, using old protocol");
} else {
$self->{do_pc9x} = 1;
- dbg("Do px9x set on $self->{call}");
+ dbg("$self->{call} Set do PC9x");
}
}
# add this station to the user database, if required (don't remove SSID from nodes)
my $user = DXUser::get_current($call);
- if (!$user) {
+ unless ($user) {
$user = DXUser->new($call);
$user->priv(1); # I have relented and defaulted nodes
$user->lockout(1);
$user->homenode($call);
$user->node($call);
$user->sort('A');
+ $user->lastin($main::systime); # this make it last longer than just this invocation
+ $user->put; # just to make sure it gets written away!!!
}
return $user;
}
# note this only takes the first one it gets
Geomag::update($d, $pc->[2], $sfi, $k, $i, @$pc[6..8], $r);
+ dbg("WWV: <$pc->[2]>, sfi=$sfi k=$k info=$i '$pc->[6]' $pc->[7]\@$pc->[8] $r route: $origin") if isdbg('progress');
if (defined &Local::wwv) {
my $rep;
}
my $wcy = WCY::update($d, @$pc[2..12]);
+ dbg("WCY: <$pc->[2]> K=$pc->[5] expK=$pc->[6] A=$pc->[4] R=$pc->[7] SFI=$pc->[3] SA=$pc->[8] GMF=$pc->[9] Au=$pc->[10] $pc->[11]\@$pc->[12] route: $origin") if isdbg('progress');
if (defined &Local::wcy) {
my $rep;
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) {
- dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
- @rout = $parent->add($call, $version, Route::here($here), $ip);
- my $r = Route::Node::get($call);
- $r->PC92C_dxchan($dxchan->call, $hops) if $r;
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
+ if ($ncall ne $call) {
+ if ($is_node) {
+ dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
+ @rout = $parent->add($call, $version, Route::here($here), $ip);
+ my $r = Route::Node::get($call);
+ $r->PC92C_dxchan($dxchan->call, $hops) if $r;
+ if ($ip) {
+ $r->ip($ip);
+ Log('DXProt', "PC92A $call -> $ip on $ncall");
+ }
+ } else {
+ dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
+ @rout = $parent->add_user($call, Route::here($here), $ip);
+ $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
+ my $r = Route::User::get($call);
+ if ($ip) {
+ $r->ip($ip);
+ Log('DXProt', "PC92A $call -> $ip on $ncall");
+ }
}
- } else {
- dbg("ROUTE: added user $call to $ncall") if isdbg('routelow');
- @rout = $parent->add_user($call, Route::here($here), $ip);
- $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan;
- my $r = Route::User::get($call);
- if ($ip) {
- $r->ip($ip);
- Log('DXProt', "PC92A $call -> $ip on $ncall");
+ if ($pc92_slug_changes && $parent == $main::routeroot) {
+ $things_add{$call} = Route::get($call);
+ delete $things_del{$call};
}
- }
- if ($pc92_slug_changes && $parent == $main::routeroot) {
- $things_add{$call} = Route::get($call);
- delete $things_del{$call};
+ } else {
+ dbgprintring(10) if isdbg('nologchan');
+ dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored");
}
}
+
return @rout;
}
return;
}
+ if (isdbg('progress')) {
+ my $vs = $via ne '*' ? " via $via" : '';
+ my $s = "ANNTALK: $from\@$onode$vs -> $to '$text' route: $origin";
+ dbg($s);
+ }
+
# will we allow it at all?
if ($censorpc) {
my @bad;
projects / spider.git / blobdiff