X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=ef6101cea44cb1c713d62cfc3ed30c1129d16ac1;hb=57c9c65161ea49fee9d6f22be329f2faa490a46f;hp=26781885eb318f38292b2a9d1858c6549614ddc1;hpb=db0959118b4c5045e842cf07c399e2924bd6ca10;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index 26781885..ef6101ce 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -37,6 +37,9 @@ 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 @@ -102,6 +105,12 @@ sub handle_10 RouteDB::update($_[6], $self->{call}); # RouteDB::update($to, $_[6]); + # convert this to a PC93 and process it as such + $self->process(pc93($to, $from, $via, $_[3], $_[6])); + return; + + # this is all redundant but kept for now for reference + # it is here and logged on $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall; $dxchan = DXChannel::get($to) unless $dxchan; @@ -410,6 +419,7 @@ sub handle_16 dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); return; } + # is it me? if ($ncall eq $main::mycall) { dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr'); @@ -419,14 +429,13 @@ sub handle_16 my $h; $h = 1 if DXChannel::get($ncall); RouteDB::update($ncall, $self->{call}, $h); - - if (eph_dup($line)) { - dbg("PCPROT: dup PC16 detected") if isdbg('chanerr'); + if ($h && $self->{call} ne $ncall) { + dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr'); return; } - unless ($h) { - dbg("PCPROT: non-local PC16, ignored") if isdbg('chanerr'); + if (eph_dup($line)) { + dbg("PCPROT: dup PC16 detected") if isdbg('chanerr'); return; } @@ -441,6 +450,15 @@ sub handle_16 # input filter if required return unless $self->in_filter_route($parent); + } else { + $parent = Route::Node->new($ncall); + } + + unless ($h) { + if ($parent->via_pc92) { + dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr'); + return; + } } my $i; @@ -471,9 +489,10 @@ sub handle_16 $r->flags($flags); $au = $r; } - push @rout, $r if $au; + push @rout, $r if $h && $au; } else { - push @rout, $parent->add_user($call, $flags); + my @ans = $parent->add_user($call, $flags); + push @rout, @ans if $h && @ans; } # send info to all logged in thingies @@ -490,8 +509,8 @@ sub handle_16 $user->put; } if (@rout) { - $self->route_pc16($origin, $line, $parent, @rout); - $self->route_pc92a($main::mycall, undef, $parent, @rout); + $self->route_pc16($origin, $line, $parent, @rout) if @rout; +# $self->route_pc92a($main::mycall, undef, $parent, @rout) if $h && $self->{state} eq 'normal'; } } @@ -513,6 +532,7 @@ sub handle_17 dbg("PCPROT: don't send users to $self->{call}") if isdbg('chanerr'); return; } + if ($ncall eq $main::mycall) { dbg("PCPROT: trying to alter config on this node from outside!") if isdbg('chanerr'); return; @@ -540,6 +560,19 @@ sub handle_17 return; } + $dxchan = DXChannel::get($ncall); + unless ($dxchan) { + if ($parent->via_pc92) { + dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr'); + return; + } + } + + if (DXChannel::get($ucall)) { + dbg("PCPROT: trying do disconnect local user, ignored") if isdbg('chanerr'); + return; + } + # input filter if required and then remove user if present if ($parent) { # return unless $self->in_filter_route($parent); @@ -559,7 +592,7 @@ sub handle_17 $uref = Route->new($ucall) unless $uref; # throw away $self->route_pc17($origin, $line, $parent, $uref); - $self->route_pc92d($main::mycall, undef, $parent, $uref); +# $self->route_pc92d($main::mycall, undef, $parent, $uref) if $dxchan; } # link request @@ -582,8 +615,10 @@ sub handle_18 $self->user->put; $self->sort('S'); } - $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml\b/; - $self->{do_pc92}++ if $_[1] =~ /\bpc92\b/; + $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml/; + if ($_[1] =~ /\bpc9x/) { + $self->{do_pc9x}++; + } } else { $self->version(50.0); $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/; @@ -627,7 +662,7 @@ sub handle_19 my $newline = "PC19^"; # new routing list - my @rout; + my (@rout, @pc92out); # first get the INTERFACE node my $parent = Route::Node::get($self->{call}); @@ -637,6 +672,8 @@ sub handle_19 return; } + my $h; + # parse the PC19 # # We are making a major change from now on. We are only going to accept @@ -646,7 +683,8 @@ sub handle_19 # The justification for this is that most of it is wrong or out of date # anyway. # - # From now on we are only going to believe PC92 data. + # From now on we are only going to believe PC92 data and locally connected + # non-pc92 nodes. # for ($i = 1; $i < $#_-1; $i += 4) { my $here = $_[$i]; @@ -665,10 +703,15 @@ sub handle_19 next if $call eq $main::mycall; # check that this PC19 isn't trying to alter the wrong dxchan + $h = 0; my $dxchan = DXChannel::get($call); - if ($dxchan && $dxchan != $self) { - dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); - next; + if ($dxchan) { + if ($dxchan == $self) { + $h = 1; + } else { + dbg("PCPROT: PC19 from $self->{call} trying to alter wrong locally connected $call, ignored!") if isdbg('chanerr'); + next; + } } my $user = check_add_node($call); @@ -680,9 +723,11 @@ sub handle_19 RouteDB::update($call, $self->{call}, $dxchan ? 1 : undef); - unless ($dxchan) { - dbg("PCPROT: PC19 not directly connected, ignored") if isdbg('chanerr'); - next; + unless ($h) { + if ($parent->via_pc92) { + dbg("PCPROT: non-local node controlled by PC92, ignored") if isdbg('chanerr'); + next; + } } my $r = Route::Node::get($call); @@ -711,6 +756,7 @@ sub handle_19 my $ar = $parent->add($call, $ver, $flags); $user->wantroutepc19(1) unless defined $user->wantroutepc19; push @rout, $ar if $ar; + push @pc92out, $r if $h; } else { next; } @@ -729,12 +775,29 @@ sub handle_19 # but remember there will only be one (pair) these because any extras will be # thrown away. if (@rout) { - $self->route_pc21($self->{call}, $line, @rout); +# $self->route_pc21($self->{call}, $line, @rout); $self->route_pc19($self->{call}, $line, @rout); - $self->route_pc92a($main::mycall, $line, $main::routeroot, @rout); + } + if (@pc92out) { + $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 { @@ -742,10 +805,18 @@ sub handle_20 my $pcno = shift; my $line = shift; 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_local_config(); $self->send(pc22()); $self->state('normal'); $self->{lastping} = 0; + $self->send_delayed_pc92; } # delete a cluster from the list @@ -783,6 +854,11 @@ sub handle_21 my $node = Route::Node::get($call); if ($node) { + if ($node->via_pc92) { + dbg("PCPROT: controlled by PC92, ignored") if isdbg('chanerr'); + return; + } + my $dxchan = DXChannel::get($call); if ($dxchan && $dxchan != $self) { dbg("PCPROT: PC21 from $self->{call} trying to alter locally connected $call, ignored!") if isdbg('chanerr'); @@ -803,7 +879,7 @@ sub handle_21 if (@rout) { $self->route_pc21($origin, $line, @rout); - $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout); +# $self->route_pc92d($main::mycall, $line, $main::routeroot, @rout); } } @@ -814,8 +890,18 @@ sub handle_22 my $pcno = shift; my $line = shift; my $origin = shift; - $self->state('normal'); + + 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->{lastping} = 0; + $self->state('normal'); + $self->send_delayed_pc92; } # WWV info @@ -1264,7 +1350,7 @@ sub _decode_pc92_call my $icall = shift; my @part = split /:/, $icall; my ($flag, $call) = unpack "A A*", $part[0]; - return () unless $flag && $flag ge '0' && $flag le '7'; + return () unless defined $flag && $flag ge '0' && $flag le '7'; return () unless $call && is_callsign($call); my $is_node = $flag & 4; my $is_extnode = $flag & 2; @@ -1284,7 +1370,7 @@ sub _encode_pc92_call if ($ref->isa('Route::Node') || $ref->isa('DXProt')) { $flag |= 4; my $dxchan = DXChannel::get($call); - $flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc92}; + $flag |= 2 if $call ne $main::mycall && $dxchan && !$dxchan->{do_pc9x}; if ($ext) { if ($ref->version) { my $version = $ref->version || 1.0; @@ -1300,13 +1386,15 @@ sub _add_thingy { my $parent = shift; my $s = shift; - my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s); + my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s; my @rout; if ($call) { if ($is_node) { + dbg("ROUTE: added node $call to " . $parent->call) if isdbg('routelow'); @rout = $parent->add($call, $version, Route::here($here)); } else { + dbg("ROUTE: added user $call to " . $parent->call) if isdbg('routelow'); @rout = $parent->add_user($call, Route::here($here)); } } @@ -1317,14 +1405,16 @@ sub _del_thingy { my $parent = shift; my $s = shift; - my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($s); + my ($call, $is_node, $is_extnode, $here, $version, $build) = @$s; my @rout; if ($call) { if ($is_node) { my $nref = Route::Node::get($call); + dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('routelow'); @rout = $nref->del($parent) if $nref; } else { my $uref = Route::User::get($call); + dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('routelow'); @rout = $parent->del_user($uref) if $uref; } } @@ -1339,10 +1429,10 @@ sub gen_pc9x_t if (!$_last_time || $_last_time != $main::systime) { $_last_time = $main::systime; $_last_occurs = 0; - return $_last_time; + return $_last_time - $main::systime_daystart; } else { $_last_occurs++; - return sprintf "$_last_time.%02d", $_last_occurs; + return sprintf "%d.%02d", $_last_time - $main::systime_daystart, $_last_occurs; } } @@ -1352,11 +1442,11 @@ sub check_pc9x_t my $t = shift; my $pc = shift; my $create = shift; - + my $parent = ref $call ? $call : Route::Node::get($call); if ($parent) { my $lastid = $parent->lastid->{$pc} || 0; - if ($lastid >= $t) { + if ($lastid + $main::systime_daystart >= $t + $main::systime_daystart) { dbg("PCPROT: dup / old id on $call <= $lastid, ignored") if isdbg('chanerr'); return; } @@ -1364,7 +1454,7 @@ sub check_pc9x_t $parent = Route::Node->new($call); } $parent->lastid->{$pc} = $t; - + return $parent; } @@ -1376,7 +1466,9 @@ sub handle_92 my $line = shift; my $origin = shift; - $self->{do_pc92} ||= 1; + my (@radd, @rdel); + + $self->{do_pc9x} ||= 1; my $pcall = $_[1]; unless ($pcall) { @@ -1385,33 +1477,48 @@ sub handle_92 } my $t = $_[2]; my $sort = $_[3]; - - my @ent = grep {$_ && /^[0-7]/} @_[4 .. $#_]; + my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_]; if ($pcall eq $main::mycall) { dbg("PCPROT: looped back, ignored") if isdbg('chanerr'); return; } - my $parent = check_pc9x_t($pcall, $t, 92, 1); + if ($pcall eq $self->{call} && $self->{state} eq 'init') { + $self->state('init92'); + } + + my $parent = check_pc9x_t($pcall, $t, 92, 1) || return; + my $oparent = $parent; $parent->lastid->{92} = $t; - $parent->do_pc92(1); + $parent->do_pc9x(1); + $parent->via_pc92(1); 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) = _decode_pc92_call($ent[0]); + 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'); + 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; } - my $parent = check_pc9x_t($call, $t, 92) || 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'); @@ -1423,25 +1530,44 @@ sub handle_92 shift @ent; } - my (@radd, @rdel); - + # 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, $_; + } + if ($sort eq 'A') { - for (@ent) { + for (@nent) { push @radd, _add_thingy($parent, $_); } } elsif ($sort eq 'D') { - for (@ent) { + for (@nent) { push @rdel, _del_thingy($parent, $_); } } elsif ($sort eq 'C') { my (@nodes, @users); - for (@ent) { - my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_); - if ($call) { - if ($is_node) { - push @nodes, $call; + + # 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, $call; + push @users, $r->[0]; } } else { dbg("DXPROT: pc92 call entry '$_' not decoded, ignored") if isdbg('chanerr'); @@ -1450,13 +1576,20 @@ sub handle_92 my ($dnodes, $dusers, $nnodes, $nusers) = $parent->calc_config_changes(\@nodes, \@users); - for (@ent) { - my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_); + # add users here + foreach my $r (@nent) { + my $call = $r->[0]; if ($call) { - push @radd,_add_thingy($parent, $_) if grep $call eq $_, (@$nnodes, @$nusers); - push @rdel,_del_thingy($parent, $_) if grep $call eq $_, (@$dnodes, @$dusers); + 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]); + } } else { dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr'); return; @@ -1469,12 +1602,85 @@ sub handle_92 $self->route_pc21($pcall, undef, $r) if $r->isa('Route::Node'); $self->route_pc17($pcall, undef, $parent, $r) if $r->isa('Route::User'); } - foreach my $r (@radd) { - next unless $r; + 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; +} - $self->route_pc19($pcall, undef, $r) if $r->isa('Route::Node'); - $self->route_pc16($pcall, undef, $parent, $r) if $r->isa('Route::User'); +sub handle_93 +{ + my $self = shift; + my $pcno = shift; + my $line = shift; + my $origin = shift; + + $self->{do_pc9x} ||= 1; + + my $pcall = $_[1]; + unless (is_callsign($pcall)) { + dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr'); + return; } + my $t = $_[2]; + my $parent = check_pc9x_t($pcall, $t, 93, 1) || return; + + my $to = $_[3]; + my $from = $_[4]; + my $via = $_[5]; + my $text = $_[6]; + my $onode = $_[7]; + $onode = $pcall if @_ <= 8; + + # will we allow it at all? + if ($censorpc) { + my @bad; + if (@bad = BadWords::check($text)) { + dbg("PCPROT: Bad words: @bad, dropped") if isdbg('chanerr'); + return; + } + } + + # if this is a 'bad spotter' user then ignore it + my $nossid = $from; + $nossid =~ s/-\d+$//; + if ($badspotter->in($nossid)) { + dbg("PCPROT: Bad Spotter, dropped") if isdbg('chanerr'); + return; + } + + if (is_callsign($to)) { + # local talks + my $dxchan; + $dxchan = DXChannel::get($main::myalias) if $to eq $main::mycall; + $dxchan = DXChannel::get($to) unless $dxchan; + if ($dxchan && $dxchan->is_user) { + $dxchan->talk($from, $to, $via, $text, $onode); + return; + } + + # convert to PC10 talks where appropriate + my $ref = Route::get($to); + if ($ref) { + my @dxchan = $ref->alldxchan; + for $dxchan (@dxchan) { + if ($dxchan->{do_pc9x}) { + $dxchan->send($line); + } else { + $dxchan->talk($from, $to, $via, $text, $onode); + } + } + return; + } + + # otherwise, drop through and allow it to be broadcast + } elsif ($to eq '*' || $to eq 'SYSOP' || $to eq 'WX') { + # announces + } else { + # chat messages + } + $self->broadcast_route_pc9x($pcall, undef, $line, 0); } # if get here then rebroadcast the thing with its Hop count decremented (if @@ -1495,8 +1701,19 @@ sub handle_default if (eph_dup($line)) { dbg("PCPROT: Ephemeral dup, dropped") if isdbg('chanerr'); } else { - unless ($self->{isolate}) { - DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me + if ($pcno >= 90) { + my $pcall = $_[1]; + unless (is_callsign($pcall)) { + dbg("PCPROT: invalid callsign string '$_[1]', ignored") if isdbg('chanerr'); + return; + } + my $t = $_[2]; + my $parent = check_pc9x_t($pcall, $t, $pcno, 1) || return; + $self->broadcast_route_pc9x($pcall, undef, $line, 0); + } else { + unless ($self->{isolate}) { + DXChannel::broadcast_nodes($line, $self) if $line =~ /\^H\d+\^?~?$/; # send it to everyone but me + } } } }