X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=5c6ca1fb928abd18426cce68525fedbcb3e20cf6;hb=4c60d18d0d58ece2406680d4afd4ff016532c11c;hp=7972bc3bf83f6ba7baa677ed29ebac82e7fd0fb1;hpb=5def24d66561e13e76b7af3109810be21deeeffb;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 7972bc3b..5c6ca1fb 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -27,7 +27,6 @@ use DXDb; use AnnTalk; use Geomag; use WCY; -use Time::HiRes qw(gettimeofday tv_interval); use BadWords; use DXHash; use Route; @@ -35,32 +34,28 @@ use Route::Node; use Script; use Investigate; use RouteDB; -use Thingy; -use Thingy::Dx; -use Thingy::Rt; -use Thingy::Ping; -use Thingy::T; -use Thingy::Hello; -use Thingy::Bye; + use strict; use vars qw($VERSION $BRANCH); - -main::mkver($VERSION = q$Revision$); +$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); +$main::build += $VERSION; +$main::branch += $BRANCH; 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 $pingint $obscount %pc19list $chatdupeage $chatimportfn $investigation_int $pc19_version $myprot_version %nodehops $baddx $badspotter $badnode $censorpc $rspfcheck - $allowzero $decode_dk0wcy $send_opernam @checklist); + $allowzero $decode_dk0wcy $send_opernam @checklist + $handle_xml); $pc11_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc11 $pc23_max_age = 1*3600; # the maximum age for an incoming 'real-time' pc23 $last_hour = time; # last time I did an hourly periodic update -%pings = (); # outstanding ping requests outbound %rcmds = (); # outstanding rcmd requests outbound %nodehops = (); # node specific hop control %pc19list = (); # list of outstanding PC19s that haven't had PC16s on them @@ -82,6 +77,7 @@ $chatdupeage = 20 * 60 * 60; $chatimportfn = "$main::root/chat_import"; $investigation_int = 12*60*60; # time between checks to see if we can see this node $pc19_version = 5466; # the visible version no for outgoing PC19s generated from pc59 +$handle_xml = 0; # handle XML sentences @checklist = ( @@ -223,9 +219,8 @@ sub init $main::me->{metric} = 0; $main::me->{pingave} = 0; $main::me->{registered} = 1; - $main::me->{version} = 5252 + $main::version; + $main::me->{version} = $main::version; $main::me->{build} = $main::build; - $main::me->{lastcf} = $main::me->{lasthello} = time; } # @@ -239,7 +234,8 @@ sub new # add this node to the table, the values get filled in later my $pkg = shift; my $call = shift; - $main::routeroot->add($call, '5000', 1) if $call ne $main::mycall; + $main::routeroot->add($call, '5000', Route::here(1)) if $call ne $main::mycall; + return $self; } @@ -253,7 +249,10 @@ sub start my $user = $self->{user}; # log it - my $host = $self->{conn}->{peerhost} || "unknown"; + my $host = $self->{conn}->{peerhost}; + $host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport}; + $host ||= "unknown"; + Log('DXProt', "$call connected from $host"); # remember type of connection @@ -300,7 +299,7 @@ sub start $self->{pingave} = 999; $self->{metric} ||= 100; $self->{lastping} = $main::systime; - + # send initialisation string unless ($self->{outbound}) { $self->sendinit; @@ -309,11 +308,6 @@ sub start $self->state('init'); $self->{pc50_t} = $main::systime; - # ALWAYS output the hello - my $thing = Thingy::Hello->new(user => $call, h => $self->{here}); - $thing->broadcast($self); - $self->lasthello($main::systime); - # send info to all logged in thingies $self->tell_login('loginn'); @@ -332,7 +326,6 @@ sub sendinit $self->send(pc18()); } - # # This is the normal pcxx despatcher # @@ -340,6 +333,11 @@ sub normal { my ($self, $line) = @_; + if ($line =~ '^<\w+\s') { + DXXml::normal($self, $line); + return; + } + my @field = split /\^/, $line; return unless @field; @@ -347,6 +345,7 @@ sub normal # print join(',', @field), "\n"; + # process PC frames, this will fail unless the frame starts PCnn my ($pcno) = $field[0] =~ /^PC(\d\d)/; # just get the number unless (defined $pcno && $pcno >= 10 && $pcno <= 99) { @@ -361,16 +360,6 @@ sub normal return; } - # decrement any hop fields at this point - if ($line =~ /\^H(\d\d?)\^?~?$/) { - my $hops = $1 - 1; - if ($hops < 0) { - dbg("PCPROT: zero hop count, dumped") if isdbg('chanerr'); - return; - } - $line =~ s/\^H\d\d?(\^?~?)$/^H$hops$1/; - } - my $origin = $self->{call}; no strict 'subs'; my $sub = "handle_$pcno"; @@ -435,7 +424,7 @@ sub handle_10 } # remember a route to this node and also the node on which this user is - RouteDB::update($_[6], $origin); + RouteDB::update($_[6], $self->{call}); # RouteDB::update($to, $_[6]); # it is here and logged on @@ -488,6 +477,18 @@ 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*$/) { + dbg("PCPROT: blank callsign, dropped") if isdbg('chanerr'); + return; + } + if ($_[2] =~ /[a-z]/) { + dbg("PCPROT: lowercase characters, dropped") if isdbg('chanerr'); + return; + } + # if this is a 'nodx' node then ignore it if ($badnode->in($_[7])) { @@ -512,7 +513,7 @@ sub handle_11 } # is it 'baddx' - if ($baddx->in($_[2]) || BadWords::check($_[2])) { + if ($baddx->in($_[2]) || BadWords::check($_[2]) || $_[2] =~ /COCK/) { dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); return; } @@ -536,15 +537,27 @@ sub handle_11 # RouteDB::update($_[7], $self->{call}); # RouteDB::update($_[6], $_[7]); - my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $_[6], $_[7]); - - my $thing = Thingy::Dx->new(origin=>$main::mycall); - $thing->from_DXProt(DXProt=>$line,spotdata=>\@spot); - $thing->process($self); + my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]); + # global spot filtering on INPUT + if ($self->{inspotsfilter}) { + my ($filter, $hops) = $self->{inspotsfilter}->it(@spot); + unless ($filter) { + dbg("PCPROT: Rejected by input spot filter") if isdbg('chanerr'); + return; + } + } # 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'); + return; + } + + # add it + Spot::add(@spot); + # # @spot at this point contains:- # freq, spotted call, time, text, spotter, spotted cc, spotters cc, orig node @@ -598,6 +611,20 @@ sub handle_11 } } } + + # local processing + my $r; + eval { + $r = Local::spot($self, @spot); + }; + # dbg("Local::spot1 error $@") if isdbg('local') if $@; + return if $r; + + # DON'T be silly and send on PC26s! + return if $pcno == 26; + + # send out the filtered spots + send_dx_spot($self, $line, @spot) if @spot; } # announces @@ -689,7 +716,7 @@ sub handle_16 # dos I want users from this channel? unless ($self->user->wantpc16) { - dbg("PCPROT: don't send users to $origin") if isdbg('chanerr'); + dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); return; } # is it me? @@ -748,7 +775,7 @@ sub handle_16 dbg("PCPROT: PC19 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr'); $parent = undef; } - if ($parent) { + if ($parent) { my $r = $parent->add($ncall, $_->[1], $_->[2]); push @nrout, $r unless @nrout; } @@ -774,7 +801,7 @@ sub handle_16 return; } } else { - + $dxchan = $parent->dxchan; if ($dxchan && $dxchan ne $self) { dbg("PCPROT: PC16 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr'); @@ -785,23 +812,17 @@ sub handle_16 return unless $self->in_filter_route($parent); } - # is he under the control of the new protocol? - if ($parent && $parent->np) { - dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr'); - return; - } - my $i; my @rout; for ($i = 2; $i < $#_; $i++) { my ($call, $conf, $here) = $_[$i] =~ /^(\S+) (\S) (\d)/o; next unless $call && $conf && defined $here && is_callsign($call); next if $call eq $main::mycall; - + eph_del_regex("^PC17\\^$call\\^$ncall"); - + $conf = $conf eq '*'; - + # reject this if we think it is a node already my $r = Route::Node::get($call); my $u = DXUser->get_current($call) unless $r; @@ -809,10 +830,10 @@ sub handle_16 dbg("PCPROT: $call is a node") if isdbg('chanerr'); next; } - + $r = Route::User::get($call); - my $flags = $here; - + my $flags = Route::here($here)|Route::conf($conf); + if ($r) { my $au = $r->addparent($parent); if ($r->flags != $flags) { @@ -824,7 +845,7 @@ sub handle_16 push @rout, $parent->add_user($call, $flags); } - + # add this station to the user database, if required $call =~ s/-\d+$//o; # remove ssid for users my $user = DXUser->get_current($call); @@ -887,12 +908,6 @@ sub handle_17 return; } - # is he under the control of the new protocol? - if ($parent && $parent->np) { - dbg("PCPROT: $ncall aranea node, ignored") if isdbg('chanerr'); - return; - } - # input filter if required and then remove user if present if ($parent) { # return unless $self->in_filter_route($parent); @@ -921,8 +936,8 @@ sub handle_18 # record the type and version offered if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) { - $self->version(0 + $1); - $self->user->version(0 + $1); + $self->version(53 + $1); + $self->user->version(53 + $1); $self->build(0 + $2); $self->user->build(0 + $2); unless ($self->is_spider) { @@ -930,6 +945,7 @@ sub handle_18 $self->user->put; $self->sort('S'); } + $self->{handle_xml}++ if $main::do_xml && $_[1] =~ /\bxml\b/; } else { $self->version(50.0); $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/; @@ -937,7 +953,7 @@ sub handle_18 } # first clear out any nodes on this dxchannel - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); my @rout = $parent->del_nodes; $self->route_pc21($origin, $line, @rout, $parent) if @rout; $self->send_local_config(); @@ -959,9 +975,9 @@ sub handle_19 my @rout; # first get the INTERFACE node - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("DXPROT: my parent $origin has disappeared"); + dbg("DXPROT: my parent $self->{call} has disappeared"); $self->disconnect; return; } @@ -970,7 +986,7 @@ sub handle_19 if ($origin ne $self->call) { my $op = Route::Node::get($origin); unless ($op) { - $op = $parent->add($origin, 5000, 1); + $op = $parent->add($origin, 5000, Route::here(1)); my $user = DXUser->get_current($origin); if (!$user) { $user = DXUser->new($origin); @@ -1005,7 +1021,7 @@ sub handle_19 # check that this PC19 isn't trying to alter the wrong dxchan my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC19 from $origin trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); + dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); next; } @@ -1020,19 +1036,19 @@ sub handle_19 } $user->sort('A') unless $user->is_node; - RouteDB::update($call, $origin); + RouteDB::update($call, $self->{call}); # do we believe this call? my $genline = "PC19^$here^$call^$conf^$ver^$_[-1]^"; - unless ($call eq $origin || $self->is_believed($call)) { - my $pt = $user->lastping($origin) || 0; - if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $origin)) { - my $ivp = Investigate->new($call, $origin); + unless ($call eq $self->{call} || $self->is_believed($call)) { + my $pt = $user->lastping($self->{call}) || 0; + if ($pt+$investigation_int < $main::systime && !Investigate::get($call, $self->{call})) { + my $ivp = Investigate->new($call, $self->{call}); $ivp->version($ver); $ivp->here($here); $ivp->store_pcxx($pcno,$genline,$origin,'PC19',$here,$call,$conf,$ver,$_[-1]); } else { - dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr'); + dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr'); } $user->put; next; @@ -1044,13 +1060,8 @@ sub handle_19 } my $r = Route::Node::get($call); - my $flags = $here; + my $flags = Route::here($here)|Route::conf($conf); - # is he under the control of the new protocol? - if ($r && $r->np) { - dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr'); - next; - } # modify the routing table if it is in it, otherwise store it in the pc19list for now if ($r) { my $ar; @@ -1062,10 +1073,15 @@ sub handle_19 next; } } + if ($r->version ne $ver || $r->flags != $flags) { + $r->version($ver); + $r->flags($flags); + push @rout, $r unless $ar; + } } else { # if he is directly connected or allowed then add him, otherwise store him up for later - if ($call eq $origin || $user->wantroutepc19) { + if ($call eq $self->{call} || $user->wantroutepc19) { my $new = Route->new($call); # throw away if ($self->in_filter_route($new)) { my $ar = $parent->add($call, $ver, $flags); @@ -1077,7 +1093,7 @@ sub handle_19 } else { $pc19list{$call} = [] unless exists $pc19list{$call}; my $nl = $pc19list{$call}; - push @{$pc19list{$call}}, [$origin, $ver, $flags] unless grep $_->[0] eq $origin, @$nl; + push @{$pc19list{$call}}, [$self->{call}, $ver, $flags] unless grep $_->[0] eq $self->{call}, @$nl; } } @@ -1104,12 +1120,6 @@ sub handle_20 $self->send(pc22()); $self->state('normal'); $self->{lastping} = 0; - my $thing = Thingy::Rt->new(user=>$self->{call}); - my $nref = Route::Node::get($self->{call}); - $thing->copy_pc16_data($nref); - $thing->broadcast; - - $self->lastcf($main::systime); } # delete a cluster from the list @@ -1130,14 +1140,14 @@ sub handle_21 return; } - RouteDB::delete($call, $origin); + RouteDB::delete($call, $self->{call}); # check if we believe this - unless ($call eq $origin || $self->is_believed($call)) { - if (my $ivp = Investigate::get($call, $origin)) { + unless ($call eq $self->{call} || $self->is_believed($call)) { + if (my $ivp = Investigate::get($call, $self->{call})) { $ivp->store_pcxx($pcno,$line,$origin,@_); } else { - dbg("PCPROT: We don't believe $call on $origin") if isdbg('chanerr'); + dbg("PCPROT: We don't believe $call on $self->{call}") if isdbg('chanerr'); } return; } @@ -1146,13 +1156,13 @@ sub handle_21 # this routing table manipulation, just remove it from the list and dump it my @rout; if (my $nl = $pc19list{$call}) { - $pc19list{$call} = [ grep {$_->[0] ne $origin} @$nl ]; + $pc19list{$call} = [ grep {$_->[0] ne $self->{call}} @$nl ]; delete $pc19list{$call} unless @{$pc19list{$call}}; } else { - my $parent = Route::Node::get($origin); + my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("DXPROT: my parent $origin has disappeared"); + dbg("DXPROT: my parent $self->{call} has disappeared"); $self->disconnect; return; } @@ -1162,18 +1172,12 @@ sub handle_21 my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC21 from $origin trying to alter locally connected $call, ignored!") if isdbg('chanerr'); + dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); return; } # input filter it return unless $self->in_filter_route($node); - - # is he under the control of the new protocol? - if ($node->np) { - dbg("PCPROT: $call aranea node, ignored") if isdbg('chanerr'); - return; - } # routing objects push @rout, $node->del($parent); @@ -1196,11 +1200,6 @@ sub handle_22 my $origin = shift; $self->state('normal'); $self->{lastping} = 0; - my $thing = Thingy::Rt->new(user=>$self->{call}); - my $nref = Route::Node::get($self->{call}); - $thing->copy_pc16_data($nref); - $thing->broadcast; - $self->lastcf($main::systime); } # WWV info @@ -1235,13 +1234,24 @@ sub handle_23 dbg("PCPROT: WWV Date ($_[1] $_[2]) out of range") if isdbg('chanerr'); return; } - if (Geomag::dup($d,$sfi,$k,$i,$_[6])) { + + # global wwv filtering on INPUT + my @dxcc = ((Prefix::cty_data($_[7]))[0..2], (Prefix::cty_data($_[8]))[0..2]); + if ($self->{inwwvfilter}) { + my ($filter, $hops) = $self->{inwwvfilter}->it(@_[7,8], $origin, @dxcc); + unless ($filter) { + dbg("PCPROT: Rejected by input wwv filter") if isdbg('chanerr'); + return; + } + } + $_[7] =~ s/-\d+$//o; # remove spotter's ssid + if (Geomag::dup($d,$sfi,$k,$i,$_[6],$_[7])) { dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr'); return; } - $_[7] =~ s/-\d+$//o; # remove spotter's ssid - my $wwv = Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r); + # note this only takes the first one it gets + Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r); my $rep; eval { @@ -1403,7 +1413,7 @@ sub handle_39 my $pcno = shift; my $line = shift; my $origin = shift; - if ($_[1] eq $origin) { + if ($_[1] eq $self->{call}) { $self->disconnect(1); } else { dbg("PCPROT: came in on wrong channel") if isdbg('chanerr'); @@ -1519,11 +1529,11 @@ sub handle_50 my $call = $_[1]; - RouteDB::update($call, $origin); + RouteDB::update($call, $self->{call}); my $node = Route::Node::get($call); if ($node) { - return unless $node->call eq $origin; + return unless $node->call eq $self->{call}; $node->usercount($_[2]); # input filter if required @@ -1540,16 +1550,29 @@ sub handle_51 my $pcno = shift; my $line = shift; my $origin = shift; + my $to = $_[1]; + my $from = $_[2]; + my $flag = $_[3]; - if (eph_dup($line, 60)) { - dbg("PCPROT: dup PC51 detected") if isdbg('chanerr'); - return; - } + + # is it for us? + if ($to eq $main::mycall) { + if ($flag == 1) { + $self->send(pc51($from, $to, '0')); + } else { + DXXml::Ping::handle_ping_reply($self, $from); + } + } else { - my $thing = Thingy::Ping->new(origin=>$main::mycall); - $thing->from_DXProt(user=>$_[2], group=>$_[1], out=>$_[3], DXProt=>$line); - $thing->process($self); - + RouteDB::update($from, $self->{call}); + + if (eph_dup($line)) { + dbg("PCPROT: dup PC51 detected") if isdbg('chanerr'); + return; + } + # route down an appropriate thingy + $self->route($to, $line); + } } # dunno but route it @@ -1662,7 +1685,8 @@ sub process } foreach $dxchan (@dxchan) { - next unless $dxchan->is_node(); + next unless $dxchan->is_node; + next if $dxchan->handle_xml; next if $dxchan == $main::me; # send the pc50 @@ -1673,9 +1697,10 @@ sub process if ($dxchan->{nopings} <= 0) { $dxchan->disconnect; } else { - addping($main::mycall, $dxchan->call); + DXXml::Ping::add($main::me, $dxchan->call); $dxchan->{nopings} -= 1; $dxchan->{lastping} = $t; + $dxchan->{lastping} += $dxchan->{pingint} / 2 unless @{$dxchan->{pingtime}}; } } } @@ -1707,6 +1732,36 @@ sub process # +sub send_dx_spot +{ + my $self = shift; + my $line = shift; + my @dxchan = DXChannel::get_all(); + my $dxchan; + + # send it if it isn't the except list and isn't isolated and still has a hop count + # taking into account filtering and so on + foreach $dxchan (@dxchan) { + next if $dxchan == $main::me; + next if $dxchan == $self && $self->is_node; + $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call}); + } +} + +sub dx_spot +{ + my $self = shift; + my $line = shift; + my $isolate = shift; + my ($filter, $hops); + + if ($self->{spotsfilter}) { + ($filter, $hops) = $self->{spotsfilter}->it(@_); + return unless $filter; + } + send_prot_line($self, $filter, $hops, $isolate, $line); +} + sub send_prot_line { my ($self, $filter, $hops, $isolate, $line) = @_; @@ -1756,7 +1811,7 @@ sub wwv my ($filter, $hops); if ($self->{wwvfilter}) { - ($filter, $hops) = $self->{wwvfilter}->it(@_); + ($filter, $hops) = $self->{wwvfilter}->it(@_[7..$#_]); return unless $filter; } send_prot_line($self, $filter, $hops, $isolate, $line) @@ -1960,7 +2015,7 @@ sub send_local_config # don't appear outside of this node # send locally connected nodes - my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && ($_->is_node || $_->is_aranea) } DXChannel::get_all(); + my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes(); @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan; $self->send_route($main::mycall, \&pc19, scalar(@localnodes)+1, $main::routeroot, @localnodes); @@ -2080,7 +2135,7 @@ sub adjust_hops $s =~ s/\^H(\d+)(\^~?)$/\^H$newhops$2/ if $newhops; } else { # simply decrement it -# $hops--; this is done on receipt now + $hops--; return "" if !$hops; $s =~ s/\^H(\d+)(\^~?)$/\^H$hops$2/ if $hops; } @@ -2100,16 +2155,6 @@ sub load_hops return (); } - -# add a ping request to the ping queues -sub addping -{ - my ($from, $to, $via) = @_; - my $thing = Thingy::Ping->new_ping($from eq $main::mycall ? () : (user=>$from), $via ? (touser=> $to, group => $via) : (group => $to)); - $thing->remember; - $thing->broadcast; -} - sub process_rcmd { my ($self, $tonode, $fromnode, $user, $cmd) = @_; @@ -2254,14 +2299,11 @@ sub disconnect # broadcast to all other nodes that all the nodes connected to via me are gone unless ($pc39flag && $pc39flag == 2) { - my $thing = Thingy::Bye->new(user=>$call); - $thing->broadcast($self); - $self->route_pc21($main::mycall, undef, @rout) if @rout; } # remove outstanding pings - Thingy::Ping::forget($call); + delete $pings{$call}; # I was the last node visited $self->user->node($main::mycall);