X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=54ae90e59d57a0cf8c3816298ac8923801d4bb05;hb=6ec22e78a4a344ce675645fabf18b2a1971f364a;hp=fdc0b0543aa102e41a7b4ee8529e875e8580e503;hpb=ec553c968339e68ba23a6f674aed1e9c32bfa1a3;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index fdc0b054..54ae90e5 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -32,8 +32,10 @@ use DXHash; use Route; use Route::Node; use Script; +use DXCIDR; use strict; +use warnings qw(all); use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime $last_hour $last10 %eph %pings %rcmds $ann_to_talk @@ -44,17 +46,20 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $eph_pc15_restime $pc9x_past_age $pc9x_dupe_age $pc10_dupe_age $pc92_slug_changes $last_pc92_slug $pc92Ain $pc92Cin $pc92Din $pc92Kin $pc9x_time_tolerance - $pc92filterdef + $pc92filterdef $senderverify ); $pc9x_dupe_age = 60; # catch loops of circular (usually) D records $pc10_dupe_age = 45; # just something to catch duplicate PC10->PC93 conversions -$pc92_slug_changes = 60*5; # slug any changes going outward for this long +$pc92_slug_changes = 60*1; # slug any changes going outward for this long $last_pc92_slug = 0; # the last time we sent out any delayed add or del PC92s $pc9x_time_tolerance = 15*60; # the time on a pc9x is allowed to be out by this amount $pc9x_past_age = (122*60)+ # maximum age in the past of a px9x (a config record might be the only - $pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck) +$pc9x_time_tolerance; # thing a node might send - once an hour and we allow an extra hour for luck) # this is actually the partition between "yesterday" and "today" but old. +$senderverify = 0; # 1 - check for forged PC11 or PC61. + # 2 - if forged, dump them. + $pc92filterdef = bless ([ # tag, sort, field, priv, special parser @@ -65,6 +70,10 @@ $pc92filterdef = bless ([ ['zone', 'nz', 3], ], 'Filter::Cmd'); +our %pc11q; +# this is a place to park an incoming PC11 in the sure and certain hope that +# a PC61 will be along soon. This has the side benefit that it will delay a +# a PC11 for one second - assuming that it is not removed by a PC61 version # incoming talk commands sub handle_10 @@ -84,7 +93,8 @@ sub handle_10 if ($censorpc) { my @bad; if (@bad = BadWords::check($pc->[3])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); + my $bw = join ', ', @bad; + dbg("PCPROT: Bad words: '$bw', dropped"); return; } } @@ -125,6 +135,10 @@ sub handle_10 $main::me->normal(pc93($to, $from, $via, $pc->[3], $pc->[6])); } +my $last; +my $pc11_saved; +my $pc11_saved_time; + # DX Spot handling sub handle_11 { @@ -133,6 +147,7 @@ sub handle_11 my $line = shift; my $origin = shift; my $pc = shift; + my $recurse = shift || 0; # route 'foreign' pc26s if ($pcno == 26) { @@ -142,6 +157,8 @@ sub handle_11 } } + dbg("INPUT PC$pcno $line origin $origin recurse: $recurse") if isdbg("pc11"); + # my ($hops) = $pc->[8] =~ /^H(\d+)/; # is the spotted callsign blank? This should really be trapped earlier but it @@ -169,10 +186,16 @@ sub handle_11 dbg("PCPROT: Bad Spotter $pc->[6], dropped") if isdbg('chanerr'); return; } -# unless (is_ipaddr($pc->[8]) || DXUser::get_current($pc->[6])) { -# dbg("PCPROT: Unknown Spotter $pc->[6], dropped") if isdbg('chanerr'); -# return; -# } + + # check IP addresses + if ($pc->[8] && is_ipaddr($pc->[8])) { + my $ip = $pc->[8]; + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://; + if (DXCIDR::find($ip)) { + + } + } # convert the date to a unix date my $d = cltounix($pc->[3], $pc->[4]); @@ -183,8 +206,10 @@ sub handle_11 } # is it 'baddx' - if ($baddx->in($pc->[2]) || BadWords::check($pc->[2])) { - dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); + if ($baddx->in($pc->[2]) || (my @bad = BadWords::check($pc->[2]))) { + my $bw = join ', ', @bad; + $bw = qq{ '$bw'} if $bw; + dbg("PCPROT: Bad DX spot$bw, ignored") if isdbg('chanerr'); return; } @@ -198,12 +223,15 @@ sub handle_11 if ($censorpc) { my @bad; if (@bad = BadWords::check($pc->[5])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); + my $bw = join ', ', @bad; + dbg("PCPROT: Bad words: '$bw', dropped"); return; } } + my @spot = Spot::prepare($pc->[1], $pc->[2], $d, $pc->[5], $nossid, $pc->[7], $pc->[8]); + # global spot filtering on INPUT if ($self->{inspotsfilter}) { my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); @@ -213,22 +241,107 @@ sub handle_11 } } + # this is where we decide to delay PC11s in the hope that a PC61 will be along soon. + + my $key = join '|', @spot[0..2,4,7]; # not including text + unless ($recurse) { + if ($pcno == 61) { + if ($pc11_saved) { + if ($key eq $pc11_saved->[0]) { + dbg("saved PC11 spot $key dumped, better pc61 received") if isdbg("pc11"); + undef $pc11_saved; + } + } + } + if ($pcno == 11) { + if ($pc11_saved) { + if ($key eq $pc11_saved->[0]) { + dbg("saved PC11 spot $key, dupe pc11 received and dumped") if isdbg("pc11"); + return; # because it's a dup + } + } + + # can we promote this to a PC61? + my $r = Route::User::get($spot[4]); # find spotter + if ($r && $r->ip) { # do we have an ip addres + $pcno = 61; # now turn this into a PC61 + $spot[14] = $r->ip; + dbg("PC11 spot $key promoted to pc61 ip $spot[14]") if isdbg("pc11"); + undef $pc11_saved; + } + } + + if ($pc11_saved && $key ne $pc11_saved) { + dbg("saved PC11 spot $pc11_saved->[0] ne new key $key, recursing") if isdbg("pc11"); + shift @$pc11_saved; # saved key + my $self = shift @$pc11_saved; + my @saved = @$pc11_saved; + undef $pc11_saved; + $self->handle_11(@saved, 1); + } + + # if we are still a PC11, save it for a better offer + if ($pcno == 11) { + $pc11_saved = [$key, $self, $pcno, $line, $origin, $pc]; + $pc11_saved_time = $main::systime; + dbg("saved new PC11 spot $key for a better offer") if isdbg("pc11"); + return; + } else { + dbg("PC61 spot $key passed onward") if isdbg("pc11"); + } + } + + # this goes after the input filtering, but before the add # so that if it is input filtered, it isn't added to the dup # list. This allows it to come in from a "legitimate" source - if (Spot::dup(@spot[0..4,5])) { - dbg("PCPROT: Duplicate Spot ignored\n") if isdbg('chanerr'); + if (Spot::dup(@spot[0..4,7])) { + dbg("PCPROT: Duplicate Spot $pc->[0] $key ignored\n") if isdbg('chanerr') || isdbg('dupespot'); return; } + + # here we verify the spotter is currently connected to the node it says it is one. AKA email sender verify + # but without the explicit probe to the node. We are relying on "historical" information, but it very likely + # to be current once we have seen the first PC92C from that node. + # + # As for spots generated from non-PC92 nodes, we'll see after about do_pc9x3h20m... + # + if ($senderverify) { + my $nroute = Route::Node::get($pc->[7]); + my $uroute = Route::Node::get($pc->[6]); + my $local = DXChannel::get($pc->[7]); + + if ($nroute && ($nroute->last_PC92C || ($local && !$local->do_pc9x))) { + my $s = ''; + my $ip = $pcno == 61 ? $pc->[8] : ''; +# $s .= "User $pc->[6] not logged in, " unless $uroute; + $s .= "User $pc->[6] not on node $pc->[7], " unless $nroute->is_user($pc->[6]); +# $s .= "Node $pc->[7] at '$ip' not on Node's IP " . $nroute->ip if $ip && $nroute && $nroute->ip && $nroute->ip ne $ip; + if ($s) { + my $action = $senderverify > 1 ? ", DUMPED" : ''; + $s =~ s/, $//; + dbg("PCProt: Suspicious Spot $pc->[2] on $pc->[1] by $pc->[6]($ip)\@$pc->[7] $s$action"); + return unless $senderverify < 2; + } + } + } + # If is a new PC11, store it, releasing the one that is there (if any), + # if a PC61 comes along then dump the stored PC11 + # If there is a different PC11 stored, release that one and store this PC11 instead, + # add it Spot::add(@spot); + my $ip = ''; + $ip ||= $spot[14] if exists $spot[14]; 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]; + 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); } @@ -268,8 +381,8 @@ sub handle_11 } else { route(undef, $to, pc34($main::mycall, $to, $cmd)); } - if ($to ne $pc->[7]) { - $to = $pc->[7]; + if ($to ne $origin) { + $to = $origin; $node = Route::Node::get($to); if ($node) { $dxchan = $node->dxchan; @@ -302,6 +415,19 @@ sub handle_11 send_dx_spot($self, $line, @spot) if @spot; } +# used to kick outstanding PC11 if required +sub pc11_process +{ + if ($pc11_saved && $main::systime > $pc11_saved_time) { + dbg("saved PC11 spot $pc11_saved->[0] timed out waiting, recursing") if isdbg("pc11"); + shift @$pc11_saved; # saved key + my $self = shift @$pc11_saved; + my @saved = @$pc11_saved; + undef $pc11_saved; + $self->handle_11(@saved, 1); + } +} + # announces sub handle_12 { @@ -317,7 +443,8 @@ sub handle_12 if ($censorpc) { my @bad; if (@bad = BadWords::check($pc->[3])) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); + my $bw = join ', ', @bad; + dbg("PCPROT: Bad words: '$bw', dropped"); return; } } @@ -620,7 +747,7 @@ sub handle_18 $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'); @@ -629,7 +756,7 @@ sub handle_18 } # $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); @@ -637,12 +764,12 @@ sub handle_18 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"); } } @@ -653,19 +780,37 @@ sub handle_18 $self->send(pc20()); } -sub check_add_node +sub check_add_user { my $call = shift; + my $type = shift; + my $homenode = shift; # 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->sort($type || 'U'); + if ($user->is_node) { + $user->priv(1); # I have relented and defaulted nodes + $user->lockout(1) if $user->is_node; + } else { + $user->homenode($homenode) if $homenode; + $user->node($homenode); + $user->priv(0); + } + $user->lastin($main::systime); # this make it last longer than just this invocation + $user->put; # just to make sure it gets written away!!! + dbg("DXProt: PC92 new user record for $call created"); + } + + # this is to fix a problem I introduced some build ago by using this function for users + # whereas it was only being used for nodes. + if ($user->is_user && $user->lockout && ($user->priv // 0) == 1) { + $user->priv(0); + $user->lockout(0); + dbg("DXProt: PC92 user record for $call depriv'd and unlocked"); + $user->put; } return $user; } @@ -741,7 +886,7 @@ sub handle_19 next; } - my $user = check_add_node($call); + my $user = check_add_user($call, 'A'); # if (eph_dup($genline)) { # dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr'); @@ -969,6 +1114,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); + 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; @@ -1372,6 +1518,7 @@ sub handle_73 } 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; @@ -1426,10 +1573,27 @@ sub _decode_pc92_call my $is_node = $flag & 4; my $is_extnode = $flag & 2; my $here = $flag & 1; - my $ip = $part[3]; - $ip ||= $part[1] if $part[1] && ($part[1] =~ /^(?:\d+\.)+/ || $part[1] =~ /^(?:(?:[abcdef\d]+)?,)+/); - $ip =~ s/,/:/g if $ip; - return ($call, $is_node, $is_extnode, $here, $part[1], $part[2], $ip); + my $version = $part[1] || 0; + my $build = $part[2] || 0; + my $ip = $part[3] || ''; + + # remember that, at this stage, IPV6 addresses have : replaced by , + if (length $version > 4 && $version =~ /[,\.][\da-f]{1,4}/i) { + $ip = $version; + $version = 0; + } + $version =~ s/\D//g; + $version = 0 unless $version && $version =~ /^[0-9]+$/; + $build =~ s/^0\.//; + $build =~ s/\D//g; + $build = 0 unless $build && $build =~ /^[0-9]+$/; + if ($ip) { + $ip =~ s/,/:/g; + $ip =~ s/^::ffff://i; + $ip = '' unless is_ipaddr($ip); + } + dbg("'$icall' = '" . join("', '", $call, $is_node, $is_extnode, $here, $version, $build, $ip) . "'") if isdbg('pc92'); + return ($call, $is_node, $is_extnode, $here, $version+0, $build+0, $ip); } # decode a pc92 call: flag call : version : build @@ -1460,6 +1624,7 @@ sub _encode_pc92_call $ip =~ s/:/,/g; $extra .= ':' . $ip; } + return "$flag$call$extra"; } @@ -1476,32 +1641,71 @@ sub _add_thingy my ($call, $is_node, $is_extnode, $here, $version, $build, $ip) = @$s; my @rout; + # remove spurious IPV6 prefix on IPV4 addresses + $build ||= 0; + $version ||= 0; + 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) { + my $user; + my $r; + + # normalise call, delete any unnormalised calls in the users file. + # then ignore this thingy + my $normcall = normalise_call($call); + if ($normcall ne $call) { + next if DXChannel::get($call); + $user = DXUser::get($call); + dbg("DXProt::_add_thingy call $call normalised to $normcall, deleting spurious user $call"); + $user->del if $user; + $call = $normcall; # this is safe because a route add will ignore duplicates + } + + if ($is_node) { + dbg("ROUTE: added node $call to $ncall") if isdbg('routelow'); + $user = check_add_user($call, 'A'); + @rout = $parent->add($call, $version, Route::here($here), $ip); + $r = Route::Node::get($call); + $r->PC92C_dxchan($dxchan->call, $hops) if $r; + if ($version && is_numeric($version) && !$r->K && !$user->K) { + my $old = $user->sort; + if ($user->is_ak1a && (($version >= 5455 && $build > 0) || ($version >= 3000 && $version <= 3500)) ) { + $user->sort('S'); + dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) updated to " . $user->sort); + } elsif ($user->is_spider && ($version < 3000 || ($version > 4000 && $version < 5455))) { + unless ($version > 0 && $build == 0) { + $user->sort('A'); + $build ||= 0; + dbg("PCProt::_add_thingy node $call v: $version b: $build sort ($old) downgraded to " . $user->sort); + } + } + } + $r->version($user->version) if $user->version; + $r->build($user->build) if $user->build; + $r->K(1) if $user->K; + } else { + dbg("ROUTE: added user $call to $ncall") if isdbg('routelow'); + $user = check_add_user($call, 'U', $parent->call); + @rout = $parent->add_user($call, Route::here($here), $ip); + $dxchan->tell_buddies('loginb', $call, $ncall) if $dxchan; + $r = Route::User::get($call); } - } 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}; + } + $user->close($main::systime, $ip) if $user; # this just updates lastseen and the connlist list containing the IP address + } else { + dbgprintring(10) if isdbg('nologchan'); + dbg("DXProt::add_thingy: Trying to add parent $call to itself $ncall, ignored"); } } + return @rout; } @@ -1662,11 +1866,11 @@ sub pc92_handle_first_slot my ($call, $is_node, $is_extnode, $here, $version, $build) = @$slot; if ($call && $is_node) { if ($call eq $main::mycall) { - dbg("PCPROT: $call looped back onto \$main::mycall ($main::mycall), ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::mycall ($main::mycall), ignored"); return; } if ($call eq $main::myalias) { - dbg("PCPROT: $call looped back onto \$main::myalias ($main::myalias), ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: $self->{call} : $call looped back onto \$main::myalias ($main::myalias), ignored"); return; } # this is only accepted from my "self". @@ -1700,7 +1904,7 @@ sub pc92_handle_first_slot } $parent->here(Route::here($here)); $parent->version($version || $pc19_version) if $version; - $parent->build($build) if $build; + $parent->build($build) if $build; $parent->PC92C_dxchan($self->{call}, $hops) unless $self->{call} eq $parent->call; return ($parent, @radd); } @@ -1727,12 +1931,12 @@ sub handle_92 # } if ($pcall eq $main::mycall) { - dbg("PCPROT: looped back, ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: looped back, ignored"); return; } if ($pcall eq $main::myalias) { - dbg("PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored") if isdbg('chan'); + LogDbg('err', "PCPROT: looped back to \$myalias ($main::myalias), misconfiguration ignored"); return; } @@ -1796,10 +2000,10 @@ sub handle_92 if (@dxchan) { $_->send($line) for @dxchan; } else { - dbg("PCPROT: no return route, ignored") if isdbg('chanerr') + dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route'); } } else { - dbg("PCPROT: no return route, ignored") if isdbg('chanerr') + dbg("PCPROT: $self->{call} : type R no return route, ignored") if isdbg('chanerr') || isdbg('route'); } } return; @@ -1818,13 +2022,44 @@ sub handle_92 ($parent, $add) = $self->pc92_handle_first_slot(\@ent, $parent, $t, $hops); return unless $parent; # dupe - + push @radd, $add if $add; $parent->reset_obs; - $parent->version($ent[4]) if $ent[4]; - $parent->build($ent[5]) if $ent[5]; - - dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('obscount'); + my $call = $parent->call; + my $version = $ent[4] || 0; + my $build = $ent[5] || 0; + $build =~ s/^0\.//; + my $oldbuild = $parent->build || 0; + my $oldversion = $parent->version || 0; + my $user = check_add_user($parent->call, 'S'); + my $oldsort = $user->sort // ''; + + dbg("PCProt PC92 K v: $version ov: $oldversion b: $build ob: $oldbuild pk: " . ($parent->K || '0') . " uk: " . ($user->K || 0)) if isdbg('pc92k'); + + if (is_numeric($version) || is_numeric($build)) { + my $changed = 0; + if (($oldversion ne $version || $build ne $oldbuild)) { + dbg("PCProt PC92 K node $call updated version: $version (was $oldversion) build: $build (was $oldbuild)"); + $user->version($parent->version($version)); + $user->build($parent->build($build)); + ++$changed; + } + if ($oldsort ne 'S') { + dbg("PCProt PC92 K node $call updated sort: $sort (was $oldsort)"); + $user->sort('S'); + ++$changed; + } + unless ($user->K) { + dbg("PCProt PC92 K node $call updated - marked as PC92 K user"); + $user->K(1); + ++$changed; + } + $user->put if $changed; + $parent->K(1); # mark this as come in on a K + } else { + dbg("DXProt PC92 K version call $call: invalid version: '$version' or build: '$version', ignored"); + } + dbg("ROUTE: reset obscount on $call now " . $parent->obscount) if isdbg('obscount'); } } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') { @@ -1865,9 +2100,14 @@ sub handle_92 my $dxc; next unless $_ && @$_; if ($_->[0] eq $main::mycall) { - dbg("PCPROT: $_->[0] refers to me, ignored") if isdbg('chanerr'); + dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route'); + next; + } + if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) { + LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored"); next; } + push @nent, $_; } @@ -1896,7 +2136,7 @@ sub handle_92 push @users, $r->[0]; } } else { - dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); + dbg("PCPROT: $self->{call} : pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr') || isdbg('route'); } } @@ -2012,11 +2252,18 @@ sub handle_93 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; if (@bad = BadWords::check($text)) { - dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); + my $bw = join ', ', @bad; + dbg("PCPROT: Bad words: '$bw', dropped"); return; } }