X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=d55e15e362ecec7b5e83d8f5cac7ee563d548019;hb=05bed9a172a48255aff58f64ab01df58a4d87891;hp=cc22314851b15182de57bc43e1ca7cb63f723704;hpb=d7dbb7fe3680afb068ffc585b1f95690008a9a7d;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index cc223148..d55e15e3 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -5,7 +5,7 @@ # Copyright (c) 1998-2006 Dirk Koopman G1TLH # # $Id$ -# +# package DXProt; @@ -45,7 +45,7 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim $allowzero $decode_dk0wcy $send_opernam @checklist $eph_pc15_restime $pc9x_past_age $pc9x_future_age ); - + $pc9x_past_age = 15*60; # maximum age in the past of a px9x $pc9x_future_age = 5*60; # maximum age in the future ditto @@ -59,7 +59,7 @@ sub handle_10 # rsfp check return if $rspfcheck and !$self->rspfcheck(0, $_[6], $_[1]); - + # will we allow it at all? if ($censorpc) { my @bad; @@ -96,7 +96,7 @@ sub handle_10 # if we are converting announces to talk is it a dup? if ($ann_to_talk) { if (AnnTalk::is_talk_candidate($from, $_[3]) && AnnTalk::dup($from, $to, $_[3])) { - dbg("DXPROT: Dupe talk from announce, dropped") if isdbg('chanerr'); + dbg("PCPROT: Dupe talk from announce, dropped") if isdbg('chanerr'); return; } } @@ -108,7 +108,7 @@ sub handle_10 # convert this to a PC93 and process it as such $self->normal(pc93($to, $from, $via, $_[3], $_[6])); return; - + # this is all redundant but kept for now for reference # it is here and logged on @@ -132,11 +132,11 @@ sub handle_10 } # can we see an interface to send it down? - + # not visible here, send a message of condolence $vref = undef; $ref = Route::get($from); - $vref = $ref = Route::Node::get($_[6]) unless $ref; + $vref = $ref = Route::Node::get($_[6]) unless $ref; if ($ref) { $dxchan = $ref->dxchan; $dxchan->talk($main::mycall, $from, $vref ? $vref->call : undef, $dxchan->msg('talknh', $to) ); @@ -151,17 +151,17 @@ sub handle_11 my $line = shift; my $origin = shift; - # route 'foreign' pc26s + # route 'foreign' pc26s if ($pcno == 26) { if ($_[7] ne $main::mycall) { $self->route($_[7], $line); return; } } - + # 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*$/) { @@ -179,7 +179,7 @@ sub handle_11 dbg("PCPROT: Bad Node, dropped") if isdbg('chanerr'); return; } - + # if this is a 'bad spotter' user then ignore it my $nossid = $_[6]; $nossid =~ s/-\d+$//; @@ -187,7 +187,7 @@ sub handle_11 dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); return; } - + # convert the date to a unix date my $d = cltounix($_[3], $_[4]); # bang out (and don't pass on) if date is invalid or the spot is too old (or too young) @@ -201,7 +201,7 @@ sub handle_11 dbg("PCPROT: Bad DX spot, ignored") if isdbg('chanerr'); return; } - + # do some de-duping $_[5] =~ s/^\s+//; # take any leading blanks off $_[2] = unpad($_[2]); # take off leading and trailing blanks from spotted callsign @@ -220,7 +220,7 @@ sub handle_11 # remember a route # RouteDB::update($_[7], $self->{call}); # RouteDB::update($_[6], $_[7]); - + my @spot = Spot::prepare($_[1], $_[2], $d, $_[5], $nossid, $_[7]); # global spot filtering on INPUT if ($self->{inspotsfilter}) { @@ -239,7 +239,7 @@ sub handle_11 return; } - # add it + # add it Spot::add(@spot); # @@ -248,8 +248,8 @@ sub handle_11 # then spotted itu, spotted cq, spotters itu, spotters cq # you should be able to route on any of these # - - # fix up qra locators of known users + + # fix up qra locators of known users my $user = DXUser->get_current($spot[4]); if ($user) { my $qra = $user->qra; @@ -257,7 +257,7 @@ sub handle_11 my $lat = $user->lat; my $long = $user->long; if (defined $lat && defined $long) { - $user->qra(DXBearing::lltoqra($lat, $long)); + $user->qra(DXBearing::lltoqra($lat, $long)); $user->put; } } @@ -295,8 +295,8 @@ sub handle_11 } } } - - # local processing + + # local processing my $r; eval { $r = Local::spot($self, @spot); @@ -310,7 +310,7 @@ sub handle_11 # send out the filtered spots send_dx_spot($self, $line, @spot) if @spot; } - + # announces sub handle_12 { @@ -348,7 +348,7 @@ sub handle_12 my $dxchan; - + if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){ $self->send_chat(0, $line, @_[1..6]); } elsif ($_[2] eq '*' || $_[2] eq $main::mycall) { @@ -377,7 +377,7 @@ sub handle_12 } } } - + # send it $self->send_announce(0, $line, @_[1..6]); } else { @@ -400,8 +400,8 @@ sub handle_15 } } } - -# incoming user + +# incoming user sub handle_16 { my $self = shift; @@ -413,7 +413,7 @@ sub handle_16 my $dxchan; my $ncall = $_[1]; my $newline = "PC16^"; - + # dos I want users from this channel? unless ($self->user->wantpc16) { dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); @@ -439,7 +439,7 @@ sub handle_16 return; } - my $parent = Route::Node::get($ncall); + my $parent = Route::Node::get($ncall); if ($parent) { $dxchan = $parent->dxchan; @@ -469,7 +469,7 @@ sub handle_16 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 @@ -479,12 +479,12 @@ sub handle_16 dbg("PCPROT: $call is a node") if isdbg('chanerr'); next; } - + $r = Route::User::get($call); my $flags = Route::here($here)|Route::conf($conf); - + if ($r) { - my $au = $r->addparent($parent); + my $au = $r->addparent($parent); if ($r->flags != $flags) { $r->flags($flags); $au = $r; @@ -492,13 +492,13 @@ sub handle_16 push @rout, $r if $h && $au; } else { my @ans = $parent->add_user($call, $flags); - push @rout, @ans if $h && @ans; + push @rout, @ans if $h && @ans; } - + # send info to all logged in thingies $self->tell_login('loginu', "$ncall: $call") if DXUser->get_current($ncall)->is_local_node; $self->tell_buddies('loginb', $call, $ncall); - + # add this station to the user database, if required # $call =~ s/-\d+$//o; # remove ssid for users my $user = DXUser->get_current($call); @@ -513,7 +513,7 @@ sub handle_16 # $self->route_pc92a($main::mycall, undef, $parent, @rout) if $h && $self->{state} eq 'normal'; } } - + # remove a user sub handle_17 { @@ -526,7 +526,7 @@ sub handle_17 my $ucall = $_[1]; eph_del_regex("^PC16\\^$ncall.*$ucall"); - + # do I want users from this channel? unless ($self->user->wantpc16) { dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); @@ -549,7 +549,7 @@ sub handle_17 unless ($parent) { dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr'); return; - } + } $dxchan = DXChannel::get($ncall); if ($dxchan && $dxchan ne $self) { @@ -570,7 +570,7 @@ sub handle_17 } # input filter if required and then remove user if present -# return unless $self->in_filter_route($parent); +# return unless $self->in_filter_route($parent); $parent->del_user($uref); # send info to all logged in thingies @@ -585,7 +585,7 @@ sub handle_17 $self->route_pc17($origin, $line, $parent, $uref); # $self->route_pc92d($main::mycall, undef, $parent, $uref) if $dxchan; } - + # link request sub handle_18 { @@ -593,42 +593,53 @@ sub handle_18 my $pcno = shift; my $line = shift; my $origin = shift; - $self->state('init'); + $self->state('init'); + + my $parent = Route::Node::get($self->{call}); # record the type and version offered - if ($_[1] =~ /DXSpider Version: (\d+\.\d+) Build: (\d+\.\d+)/) { - $self->version(53 + $1); - $self->user->version(53 + $1); - $self->build(0 + $2); - $self->user->build(0 + $2); + if (my ($version) = $_[1] =~ /DXSpider Version: (\d+\.\d+)/) { + $self->{version} = 53 + $version; + $self->user->version(53 + $version); + $parent->version(0 + $version); + my ($build) = $_[1] =~ /Build: (\d+(?:\.\d+)?)/; + $self->{build} = 0 + $build; + $self->user->build(0 + $build); + $parent->build(0 + $build); + dbg("DXSpider version $version build $build"); unless ($self->is_spider) { + dbg("Change U " . $self->user->sort . " C $self->{sort} -> S"); $self->user->sort('S'); $self->user->put; $self->sort('S'); } - $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/; +# $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/; if ($_[1] =~ /\bpc9x/) { - $self->{do_pc9x} = 1; - dbg("Do px9x set on $self->{call}"); + if ($self->{isolate}) { + dbg("pc9x recognised, but is isolated, using old protocol"); + } else { + $self->{do_pc9x} = 1; + dbg("Do px9x set on $self->{call}"); + } } } else { + dbg("Unknown software"); $self->version(50.0); $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/; $self->user->version($self->version); } # first clear out any nodes on this dxchannel - 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(); $self->send(pc20()); } - + sub check_add_node { my $call = shift; - + # add this station to the user database, if required (don't remove SSID from nodes) my $user = DXUser->get_current($call); if (!$user) { @@ -659,22 +670,22 @@ sub handle_19 # first get the INTERFACE node my $parent = Route::Node::get($self->{call}); unless ($parent) { - dbg("DXPROT: my parent $self->{call} has disappeared"); + dbg("PCPROT: my parent $self->{call} has disappeared"); $self->disconnect; return; } my $h; - + # parse the PC19 - # + # # We are making a major change from now on. We are only going to accept # PC19s from directly connected nodes. This means that we are probably - # going to throw away most of the data that we are being sent. + # going to throw away most of the data that we are being sent. # # The justification for this is that most of it is wrong or out of date - # anyway. - # + # anyway. + # # From now on we are only going to believe PC92 data and locally connected # non-pc92 nodes. # @@ -686,7 +697,7 @@ sub handle_19 next unless defined $here && defined $conf && is_callsign($call); eph_del_regex("^PC(?:21\\^$call|17\\^[^\\^]+\\^$call)"); - + # check for sane parameters # $ver = 5000 if $ver eq '0000'; next unless $ver && $ver =~ /^\d+$/; @@ -707,7 +718,7 @@ sub handle_19 } my $user = check_add_node($call); - + # if (eph_dup($genline)) { # dbg("PCPROT: dup PC19 for $call detected") if isdbg('chanerr'); # next; @@ -758,7 +769,7 @@ sub handle_19 # unbusy and stop and outgoing mail (ie if somehow we receive another PC19 without a disconnect) my $mref = DXMsg::get_busy($call); $mref->stop_msg($call) if $mref; - + $user->lastin($main::systime) unless DXChannel::get($call); $user->put; } @@ -774,21 +785,6 @@ sub handle_19 $self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal'; } } - -sub send_delayed_pc92 -{ - my $self = shift; - - # send out new PC92 config to everyone else - my $line = gen_my_pc92_config($main::me); - $self->broadcast_route_pc9x($main::mycall, undef, $line, 0); - - # if this is an external node then send out the external config - unless ($self->{do_pc9x}) { - $line = gen_my_pc92_config(Route::Node::get($self->{call})); - $self->broadcast_route_pc9x($main::mycall, undef, $line, 0); - } -} # send local configuration sub handle_20 @@ -799,18 +795,16 @@ sub handle_20 my $origin = shift; if ($self->{do_pc9x} && $self->{state} ne 'init92') { - dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr'); - $self->send("**** You logged in with $self->{call} but that is NOT your \$mycall"); - $self->disconnect; - return; + $self->send("Reseting to oldstyle routing because login call not sent in any pc92"); + $self->{do_pc9x} = 0; } - $self->send_local_config(); + $self->send_local_config; $self->send(pc22()); $self->state('normal'); $self->{lastping} = 0; - $self->send_delayed_pc92; + $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call})); } - + # delete a cluster from the list # # This should never occur for directly connected nodes. @@ -824,7 +818,7 @@ sub handle_21 my $call = uc $_[1]; eph_del_regex("^PC1[679].*$call"); - + # if I get a PC21 from the same callsign as self then ignore it if ($call eq $self->call) { dbg("PCPROT: self referencing PC21 from $self->{call}"); @@ -841,11 +835,11 @@ sub handle_21 } my @rout; - + if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me! my $node = Route::Node::get($call); if ($node) { - + if ($node->via_pc92) { dbg("PCPROT: controlled by PC92, ignored") if isdbg('chanerr'); return; @@ -856,10 +850,10 @@ sub handle_21 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); - + # routing objects, force a PC21 if it is local push @rout, $node->del($parent); push @rout, $call if $dxchan && @rout == 0; @@ -879,7 +873,7 @@ sub handle_21 # $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout); } } - + sub handle_22 { @@ -890,17 +884,15 @@ sub handle_22 if ($self->{do_pc9x}) { if ($self->{state} ne 'init92') { - dbg("PCPROT: disconnecting because login call not sent in any pc92") if isdbg('chanerr'); - $self->send("**** You logged in with $self->{call} but that is NOT your \$mycall"); - $self->disconnect; - return; + $self->send("Reseting to oldstyle routing because login call not sent in any pc92"); + $self->{do_pc9x} = 0; } } $self->{lastping} = 0; $self->state('normal'); - $self->send_delayed_pc92; + $self->route_pc92a($main::mycall, undef, $main::routeroot, Route::Node::get($self->{call})); } - + # WWV info sub handle_23 { @@ -908,8 +900,8 @@ sub handle_23 my $pcno = shift; my $line = shift; my $origin = shift; - - # route foreign' pc27s + + # route foreign' pc27s if ($pcno == 27) { if ($_[8] ne $main::mycall) { $self->route($_[8], $line); @@ -948,7 +940,7 @@ sub handle_23 dbg("PCPROT: Dup WWV Spot ignored\n") if isdbg('chanerr'); return; } - + # note this only takes the first one it gets Geomag::update($d, $_[2], $sfi, $k, $i, @_[6..8], $r); @@ -965,7 +957,7 @@ sub handle_23 # broadcast to the eager world send_wwv_spot($self, $line, $d, $_[2], $sfi, $k, $i, @_[6..8]); } - + # set here status sub handle_24 { @@ -978,12 +970,12 @@ sub handle_24 $nref = Route::Node::get($call); $uref = Route::User::get($call); return unless $nref || $uref; # if we don't know where they are, it's pointless sending it on - + if (eph_dup($line)) { dbg("PCPROT: Dup PC24 ignored\n") if isdbg('chanerr'); return; } - + $nref->here($_[2]) if $nref; $uref->here($_[2]) if $uref; my $ref = $nref || $uref; @@ -991,7 +983,7 @@ sub handle_24 $self->route_pc24($origin, $line, $ref, $_[3]); } - + # merge request sub handle_25 { @@ -1009,7 +1001,7 @@ sub handle_25 } Log('DXProt', "Merge request for $_[3] spots and $_[4] WWV from $_[2]"); - + # spots if ($_[3] > 0) { my @in = reverse Spot::search(1, undef, undef, 0, $_[3]); @@ -1053,7 +1045,7 @@ sub handle_30 {goto &handle_28} sub handle_31 {goto &handle_28} sub handle_32 {goto &handle_28} sub handle_33 {goto &handle_28} - + sub handle_34 { my $self = shift; @@ -1066,7 +1058,7 @@ sub handle_34 $self->process_rcmd($_[1], $_[2], $_[2], $_[3]); } } - + # remote command replies sub handle_35 { @@ -1077,7 +1069,7 @@ sub handle_35 eph_del_regex("^PC35\\^$_[2]\\^$_[1]\\^"); $self->process_rcmd_reply($_[1], $_[2], $_[1], $_[3]); } - + sub handle_36 {goto &handle_34} # database stuff @@ -1104,7 +1096,7 @@ sub handle_38 my $line = shift; my $origin = shift; } - + # incoming disconnect sub handle_39 { @@ -1120,7 +1112,7 @@ sub handle_39 } sub handle_40 {goto &handle_28} - + # user info sub handle_41 { @@ -1131,13 +1123,13 @@ sub handle_41 my $call = $_[1]; my $sort = $_[2]; my $val = $_[3]; - + my $l = "PC41^$call^$sort"; if (eph_dup($l, $eph_info_restime)) { dbg("PCPROT: dup PC41, ignored") if isdbg('chanerr'); return; } - + # input filter if required # my $ref = Route::get($call) || Route->new($call); # return unless $self->in_filter_route($ref); @@ -1150,8 +1142,8 @@ sub handle_41 # add this station to the user database, if required my $user = DXUser->get_current($call); $user = DXUser->new($call) unless $user; - - if ($sort == 1) { + + if ($sort == 1) { if (($val =~ /spotter/i || $val =~ /self/i) && $user->name && $user->name ne $val) { dbg("PCPROT: invalid name") if isdbg('chanerr'); if ($main::mycall eq 'GB7DJK' || $main::mycall eq 'GB7BAA' || $main::mycall eq 'WR3D') { @@ -1205,7 +1197,7 @@ sub handle_45 {goto &handle_37} sub handle_46 {goto &handle_37} sub handle_47 {goto &handle_37} sub handle_48 {goto &handle_37} - + # message and database sub handle_49 { @@ -1218,7 +1210,7 @@ sub handle_49 dbg("PCPROT: Dup PC49 ignored\n") if isdbg('chanerr'); return; } - + if ($_[1] eq $main::mycall) { DXMsg::handle_49($self, @_); } else { @@ -1249,7 +1241,7 @@ sub handle_50 $self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line); } } - + # incoming ping requests/answers sub handle_51 { @@ -1261,7 +1253,7 @@ sub handle_51 my $from = $_[2]; my $flag = $_[3]; - + # is it for us? if ($to eq $main::mycall) { if ($flag == 1) { @@ -1303,7 +1295,7 @@ sub handle_73 my $line = shift; my $origin = shift; my $call = $_[1]; - + # do some de-duping my $d = cltounix($call, sprintf("%02d18Z", $_[2])); if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $_[2] < 0 || $_[2] > 23) { @@ -1315,7 +1307,7 @@ sub handle_73 dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr'); return; } - + my $wcy = WCY::update($d, @_[2..12]); my $rep; @@ -1373,7 +1365,7 @@ sub _encode_pc92_call my $ext = shift; my $flag = 0; - my $call = $ref->call; + my $call = $ref->call; my $extra = ''; $flag |= $ref->here ? 1 : 0; if ($ref->isa('Route::Node') || $ref->isa('DXProt')) { @@ -1462,13 +1454,13 @@ sub check_pc9x_t if ($parent->call ne $main::mycall) { my $lastid = $parent->lastid->{$pc} || 0; if ($t < $lastid) { - if (my $d = $lastid-86400+$t > $pc9x_past_age) { - dbg("PCPROT: $call id $t <= $lastid, ignored") if isdbg('chanerr'); + if ($lastid-86400+$t > $pc9x_past_age) { + dbg("PCPROT: dup id on $t <= $lastid (midnight rollover), ignored") if isdbg('chanerr'); return; - } + } } - if ($lastid == $t) { - dbg("PCPROT: dup id on $call = $lastid, ignored") if isdbg('chanerr'); + if ($lastid >= $t) { + dbg("PCPROT: dup id on $call $lastid >= $t, ignored") if isdbg('chanerr'); return; } } @@ -1489,7 +1481,7 @@ sub handle_92 my $origin = shift; my (@radd, @rdel); - + my $pcall = $_[1]; unless ($pcall) { dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr'); @@ -1497,7 +1489,7 @@ sub handle_92 } my $t = $_[2]; my $sort = $_[3]; - + if ($pcall eq $main::mycall) { dbg("PCPROT: looped back, ignored") if isdbg('chanerr'); return; @@ -1507,7 +1499,7 @@ sub handle_92 $self->state('init92'); $self->{do_pc9x} = 1; dbg("Do pc9x set on $pcall"); - } + } unless ($self->{do_pc9x}) { dbg("PCPROT: PC9x come in from non-PC9x node, ignored") if isdbg('chanerr'); return; @@ -1515,7 +1507,7 @@ sub handle_92 my $parent = check_pc9x_t($pcall, $t, 92, 1) || return; my $oparent = $parent; - + $parent->do_pc9x(1); $parent->via_pc92(1); @@ -1527,7 +1519,7 @@ sub handle_92 my $from = $_[4]; my $target = $_[5]; - + if ($sort eq 'F') { my $flag; my $ref; @@ -1567,39 +1559,49 @@ sub handle_92 # here is where all the routes are created and destroyed my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_]; + if (@ent) { # look at the first one which will always be a node of some sort - # and update any information that needs to be done. - my ($call, $is_node, $is_extnode, $here, $version, $build) = @{$ent[0]}; - if ($call && $is_node) { - if ($call eq $main::mycall) { - dbg("PCPROT: looped back on node entry, ignored") if isdbg('chanerr'); - return; - } - if ($is_extnode) { - # this is only accepted from my "self" - if (DXChannel::get($call) && $call ne $self->{call}) { - dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr'); + # except in the case of 'A' or 'D' in which the $pcall is used + # otherwise use the node call and update any information + # that needs to be done. + my ($call, $is_node, $is_extnode, $here, $version, $build) = @{$ent[0]}; + if (($sort eq 'A' || $sort eq 'D') && !$is_node) { + # parent is already set correctly + # this is to allow shortcuts for A and D records + # not repeating the origin call to no real purpose + ; + } else { + if ($call && $is_node) { + if ($call eq $main::mycall) { + dbg("PCPROT: $call looped back onto $main::mycall, ignored") if isdbg('chanerr'); return; } - # reparent to external node (note that we must have received a 'C' or 'A' record - # from the true parent node for this external before we get one for the this node - unless ($parent = Route::Node::get($call)) { - dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr'); - return; + if ($is_extnode) { + # this is only accepted from my "self" + if (DXChannel::get($call) && $call ne $self->{call}) { + dbg("PCPROT: locally connected node config for $call from other another node $self->{call}, ignored") if isdbg('chanerr'); + return; + } + # reparent to external node (note that we must have received a 'C' or 'A' record + # from the true parent node for this external before we get one for the this node + unless ($parent = Route::Node::get($call)) { + dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr'); + return; + } + $parent = check_pc9x_t($call, $t, 92) || return; + $parent->via_pc92(1); } - $parent = check_pc9x_t($call, $t, 92) || return; - $parent->via_pc92(1); + } else { + dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr'); + return; } - } else { - dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr'); - return; + $parent->here(Route::here($here)); + $parent->version($version) if $version && $version > $parent->version; + $parent->build($build) if $build && $build > $parent->build; + shift @ent; } - $parent->here(Route::here($here)); - $parent->version($version) if $version && $version > $parent->version; - $parent->build($build) if $build && $build > $parent->build; - shift @ent; } # do a pass through removing any references to either locally connected nodes or mycall @@ -1609,7 +1611,7 @@ sub handle_92 if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) { dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr'); next; - } + } push @nent, $_; } @@ -1632,9 +1634,9 @@ sub handle_92 dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('route'); } - # + # foreach my $r (@nent) { - # my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_); + # my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_); if ($r->[0]) { if ($r->[1]) { push @nodes, $r->[0]; @@ -1642,7 +1644,7 @@ sub handle_92 push @users, $r->[0]; } } else { - dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); + dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); } } @@ -1662,6 +1664,9 @@ sub handle_92 foreach my $r (@$dusers) { push @rdel,_del_thingy($parent, [$r, 0]); } + + # remember this last PC92C for rebroadcast on demand + $parent->last_PC92C($line); } else { dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr'); return; @@ -1669,7 +1674,7 @@ sub handle_92 foreach my $r (@rdel) { next unless $r; - + $self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node'); $self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User'); } @@ -1717,7 +1722,7 @@ sub handle_93 return; } } - + # if this is a 'bad spotter' user then ignore it my $nossid = $from; $nossid =~ s/-\d+$//; @@ -1727,7 +1732,7 @@ sub handle_93 } if (is_callsign($to)) { - # local talks + # local talks my $dxchan; $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall; $dxchan = DXChannel::get($to) unless $dxchan; @@ -1739,14 +1744,16 @@ sub handle_93 # convert to PC10 talks where appropriate my $ref = Route::get($to); if ($ref) { - my @dxchan = $ref->alldxchan; - for $dxchan (@dxchan) { + # just go for the "best" one for now (rather than broadcast) + $dxchan = $ref->dxchan; +# my @dxchan = $ref->alldxchan; +# for $dxchan (@dxchan) { if ($dxchan->{do_pc9x}) { $dxchan->send($line); } else { $dxchan->talk($from, $to, $via, $text, $onode); } - } +# } return; } @@ -1756,7 +1763,7 @@ sub handle_93 my $sysop = uc $to eq 'SYSOP' ? '*' : ' '; my $wx = uc $to eq 'WX' ? '1' : '0'; my $local = $via eq 'LOCAL' ? '*' : $via; - + $self->send_announce(1, pc12($from, $text, $local, $via, $sysop, $wx, $pcall), $from, $local, $text, $sysop, $pcall, $wx, $via eq 'LOCAL' ? $via : undef); return if $via eq 'LOCAL'; } else {