X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=99eb71d27464c27299708a1a2590390ecbd84a01;hb=90b87fdbe4bb4f904e89939640aa7764a69e5616;hp=641299d36c5b126f2abf40f7769b9c27b81c9e3d;hpb=d574e297e8a9d56ee1d4337b80f88ef38b179512;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 641299d3..99eb71d2 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -5,7 +5,7 @@ # Copyright (c) 1998-2006 Dirk Koopman G1TLH # # $Id$ -# +# package DXProt; @@ -37,18 +37,18 @@ use RouteDB; use strict; -use vars qw($VERSION $BRANCH); -($VERSION, $BRANCH) = dxver(q$Revision$); - 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 - $eph_pc15_restime + $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 + # incoming talk commands sub handle_10 { @@ -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,9 +348,9 @@ sub handle_12 my $dxchan; - + if ((($dxchan = DXChannel::get($_[2])) && $dxchan->is_user) || $_[4] =~ /^[\#\w.]+$/){ - $self->send_chat($line, @_[1..6]); + $self->send_chat(0, $line, @_[1..6]); } elsif ($_[2] eq '*' || $_[2] eq $main::mycall) { # remember a route @@ -377,9 +377,9 @@ sub handle_12 } } } - + # send it - $self->send_announce($line, @_[1..6]); + $self->send_announce(0, $line, @_[1..6]); } else { $self->route($_[2], $line); } @@ -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,50 @@ 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); + if ($_[1] =~ /DXSpider Version: (\d+\.\d+)/) { + $self->{version} = 53 + $1; $self->user->version(53 + $1); - $self->build(0 + $2); - $self->user->build(0 + $2); + $parent->version(0 + $1); + dbg("DXSpider version $1"); + my ($build) = $_[1] =~ /Build: (\d+(?:\.\d+)?)/; + $self->{build} = 0 + $build; + $self->user->build(0 + $build); + $parent->build(0 + $build); + dbg("DXSpider 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}"); } } 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 +667,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 +694,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 +715,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 +766,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 +782,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 +792,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 +815,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 +832,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 +847,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; @@ -869,12 +860,17 @@ sub handle_21 return; } + if (eph_dup($line)) { + dbg("PCPROT: dup PC21 detected") if isdbg('chanerr'); + return; + } + if (@rout) { $self->route_pc21($origin, $line, @rout); # $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout); } } - + sub handle_22 { @@ -885,17 +881,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 { @@ -903,8 +897,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); @@ -943,7 +937,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); @@ -960,7 +954,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 { @@ -973,12 +967,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; @@ -986,7 +980,7 @@ sub handle_24 $self->route_pc24($origin, $line, $ref, $_[3]); } - + # merge request sub handle_25 { @@ -1004,7 +998,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]); @@ -1048,7 +1042,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; @@ -1061,7 +1055,7 @@ sub handle_34 $self->process_rcmd($_[1], $_[2], $_[2], $_[3]); } } - + # remote command replies sub handle_35 { @@ -1072,7 +1066,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 @@ -1099,7 +1093,7 @@ sub handle_38 my $line = shift; my $origin = shift; } - + # incoming disconnect sub handle_39 { @@ -1115,7 +1109,7 @@ sub handle_39 } sub handle_40 {goto &handle_28} - + # user info sub handle_41 { @@ -1124,19 +1118,20 @@ sub handle_41 my $line = shift; my $origin = shift; my $call = $_[1]; + my $sort = $_[2]; + my $val = $_[3]; - my $l = $line; - $l =~ s/[\x00-\x20\x7f-\xff]+//g; # remove all funny characters and spaces for dup checking + 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); - if ($_[3] eq $_[2] || $_[3] =~ /^\s*$/) { + if ($val eq $sort || $val =~ /^\s*$/) { dbg('PCPROT: invalid value') if isdbg('chanerr'); return; } @@ -1144,36 +1139,36 @@ 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 ($_[2] == 1) { - if (($_[3] =~ /spotter/i || $_[3] =~ /self/i) && $user->name && $user->name ne $_[3]) { + + 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') { DXChannel::broadcast_nodes(pc41($_[1], 1, $user->name)); # send it to everyone including me } return; } - $user->name($_[3]); - } elsif ($_[2] == 2) { - $user->qth($_[3]); - } elsif ($_[2] == 3) { - if (is_latlong($_[3])) { - my ($lat, $long) = DXBearing::stoll($_[3]); - $user->lat($lat); - $user->long($long); - $user->qra(DXBearing::lltoqra($lat, $long)); + $user->name($val); + } elsif ($sort == 2) { + $user->qth($val); + } elsif ($sort == 3) { + if (is_latlong($val)) { + my ($lat, $long) = DXBearing::stoll($val); + $user->lat($lat) if $lat; + $user->long($long) if $long; + $user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra; } else { dbg('PCPROT: not a valid lat/long') if isdbg('chanerr'); return; } - } elsif ($_[2] == 4) { - $user->homenode($_[3]); - } elsif ($_[2] == 5) { - if (is_qra(uc $_[3])) { - my ($lat, $long) = DXBearing::qratoll(uc $_[3]); - $user->lat($lat); - $user->long($long); - $user->qra(uc $_[3]); + } elsif ($sort == 4) { + $user->homenode($val); + } elsif ($sort == 5) { + if (is_qra(uc $val)) { + my ($lat, $long) = DXBearing::qratoll(uc $val); + $user->lat($lat) if $lat && !$user->lat; + $user->long($long) if $long && !$user->long; + $user->qra(uc $val); } else { dbg('PCPROT: not a valid QRA locator') if isdbg('chanerr'); return; @@ -1187,7 +1182,7 @@ sub handle_41 } # perhaps this IS what we want after all - # $self->route_pc41($ref, $call, $_[2], $_[3], $_[4]); + # $self->route_pc41($ref, $call, $sort, $val, $_[4]); } sub handle_42 {goto &handle_28} @@ -1199,7 +1194,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 { @@ -1212,7 +1207,7 @@ sub handle_49 dbg("PCPROT: Dup PC49 ignored\n") if isdbg('chanerr'); return; } - + if ($_[1] eq $main::mycall) { DXMsg::handle_49($self, @_); } else { @@ -1243,7 +1238,7 @@ sub handle_50 $self->route_pc50($origin, $line, $node, $_[2], $_[3]) unless eph_dup($line); } } - + # incoming ping requests/answers sub handle_51 { @@ -1255,7 +1250,7 @@ sub handle_51 my $from = $_[2]; my $flag = $_[3]; - + # is it for us? if ($to eq $main::mycall) { if ($flag == 1) { @@ -1297,7 +1292,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) { @@ -1309,7 +1304,7 @@ sub handle_73 dbg("PCPROT: Dup WCY Spot ignored\n") if isdbg('chanerr'); return; } - + my $wcy = WCY::update($d, @_[2..12]); my $rep; @@ -1361,9 +1356,13 @@ sub _decode_pc92_call sub _encode_pc92_call { my $ref = shift; + + # plain call or value + return $ref unless ref $ref; + 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')) { @@ -1444,10 +1443,23 @@ sub check_pc9x_t my $parent = ref $call ? $call : Route::Node::get($call); if ($parent) { - my $lastid = $parent->lastid->{$pc} || 0; - if ($lastid + $main::systime_daystart >= $t + $main::systime_daystart) { - dbg("PCPROT: dup / old id on $call <= $lastid, ignored") if isdbg('chanerr'); - return; + # we only do this for external calls whose routing table + # record come and go. The reference for mycall is permanent + # and not that frequently used, it also never times out, so + # the id on it is completely unreliable. Besides, only commands + # originating on this box will go through this code... + if ($parent->call ne $main::mycall) { + my $lastid = $parent->lastid->{$pc} || 0; + if ($t < $lastid) { + 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 >= $t, ignored") if isdbg('chanerr'); + return; + } } } elsif ($create) { $parent = Route::Node->new($call); @@ -1466,7 +1478,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'); @@ -1474,8 +1486,7 @@ sub handle_92 } my $t = $_[2]; my $sort = $_[3]; - my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_]; - + if ($pcall eq $main::mycall) { dbg("PCPROT: looped back, ignored") if isdbg('chanerr'); return; @@ -1485,7 +1496,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; @@ -1493,124 +1504,189 @@ sub handle_92 my $parent = check_pc9x_t($pcall, $t, 92, 1) || return; my $oparent = $parent; - + $parent->do_pc9x(1); $parent->via_pc92(1); - if (@ent) { + if ($sort eq 'F' || $sort eq 'R') { + + # this is the route finding section + # here is where the consequences of the 'find' command + # are dealt with + + my $from = $_[4]; + my $target = $_[5]; - # 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'); + if ($sort eq 'F') { + my $flag; + my $ref; + my $dxchan; + if ($ref = DXChannel::get($target)) { + $flag = 1; # we are directly connected + } else { + $ref = Route::get($target); + $dxchan = $ref->dxchan; + $flag = 2; + } + if ($ref && $flag && $dxchan) { + $self->send(pc92r($from, $target, $flag, int($dxchan->{pingave}*1000))); 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; + } elsif ($sort eq 'R') { + if (my $dxchan = DXChannel::get($from)) { + handle_pc92_find_reply($dxchan, $pcall, $from, $target, @_[6,7]); + } else { + my $ref = Route::get($from); + if ($ref) { + my @dxchan = grep {$_->do_pc9x} $ref->alldxchan; + if (@dxchan) { + $_->send($line) for @dxchan; + } else { + dbg("PCPROT: no return route, ignored") if isdbg('chanerr') + } + } else { + dbg("PCPROT: no return route, ignored") if isdbg('chanerr') } - $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; } - $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 - my @nent; - for (@ent) { - next unless $_; - if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) { - dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr'); - next; - } - push @nent, $_; - } + } elsif ($sort eq 'A' || $sort eq 'D' || $sort eq 'C') { - if ($sort eq 'A') { - for (@nent) { - push @radd, _add_thingy($parent, $_); - } - } elsif ($sort eq 'D') { - for (@nent) { - push @rdel, _del_thingy($parent, $_); + # this is the main route section + # 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 + # 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; + } + 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); + } + } 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; + } } - } elsif ($sort eq 'C') { - my (@nodes, @users); - - # we only reset obscounts on config records - $oparent->reset_obs; - dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('route'); - if ($oparent != $parent) { - $parent->reset_obs; - dbg("ROUTE: reset obscount on $parent->{call} now " . $parent->obscount) if isdbg('route'); + + # do a pass through removing any references to either locally connected nodes or mycall + my @nent; + for (@ent) { + next unless $_; + if ($_->[0] eq $main::mycall || DXChannel::get($_->[0])) { + dbg("PCPROT: $_->[0] refers to locally connected node, ignored") if isdbg('chanerr'); + next; + } + push @nent, $_; } - # - foreach my $r (@nent) { -# my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_); - if ($r->[0]) { - if ($r->[1]) { - push @nodes, $r->[0]; + if ($sort eq 'A') { + for (@nent) { + push @radd, _add_thingy($parent, $_); + } + } elsif ($sort eq 'D') { + for (@nent) { + push @rdel, _del_thingy($parent, $_); + } + } elsif ($sort eq 'C') { + my (@nodes, @users); + + # we only reset obscounts on config records + $oparent->reset_obs; + dbg("ROUTE: reset obscount on $pcall now " . $oparent->obscount) if isdbg('route'); + if ($oparent != $parent) { + $parent->reset_obs; + 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($_); + if ($r->[0]) { + if ($r->[1]) { + push @nodes, $r->[0]; + } else { + push @users, $r->[0]; + } } else { - push @users, $r->[0]; + dbg("PCPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); } - } else { - dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); } - } - my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users); + my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users); - # add users here - foreach my $r (@nent) { - my $call = $r->[0]; - if ($call) { - push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers); + # add users here + foreach my $r (@nent) { + my $call = $r->[0]; + if ($call) { + push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers); + } } + # del users here + foreach my $r (@$dnodes) { + push @rdel,_del_thingy($parent, [$r, 1]); + } + 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; } - # del users here - foreach my $r (@$dnodes) { - push @rdel,_del_thingy($parent, [$r, 1]); - } - foreach my $r (@$dusers) { - push @rdel,_del_thingy($parent, [$r, 0]); + + 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'); } - } else { - dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr'); - return; + my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd; + my @pc16 = grep { $_ && $_->isa('Route::User') } @radd; + unshift @pc19, $parent if $self->{state} eq 'init92' && $oparent == $parent; + $self->route_pc19($pcall, undef, @pc19) if @pc19; + $self->route_pc16($pcall, undef, $parent, @pc16) if @pc16; } + # broadcast it if we get here $self->broadcast_route_pc9x($pcall, undef, $line, 0); - 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'); - } - my @pc19 = grep { $_ && $_->isa('Route::Node') } @radd; - my @pc16 = grep { $_ && $_->isa('Route::User') } @radd; - unshift @pc19, $parent if $self->{state} eq 'init92' && $oparent == $parent; - $self->route_pc19($pcall, undef, @pc19) if @pc19; - $self->route_pc16($pcall, undef, $parent, @pc16) if @pc16; } + sub handle_93 { my $self = shift; @@ -1643,7 +1719,7 @@ sub handle_93 return; } } - + # if this is a 'bad spotter' user then ignore it my $nossid = $from; $nossid =~ s/-\d+$//; @@ -1653,7 +1729,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; @@ -1677,10 +1753,17 @@ sub handle_93 } # otherwise, drop through and allow it to be broadcast - } elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') { + } elsif ($to eq '*' || uc $to eq 'SYSOP' || uc $to eq 'WX') { # announces + 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 { - # chat messages + # chat messages to non-pc9x nodes + $self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0'); } $self->broadcast_route_pc9x($pcall, undef, $line, 0); }