X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=ef6101cea44cb1c713d62cfc3ed30c1129d16ac1;hb=57c9c65161ea49fee9d6f22be329f2faa490a46f;hp=a91c3ce63df5535f803fe90b860e5499cba44b76;hpb=314a26e98d3c3e6a717a9f66ead3ed91cce09ea5;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index a91c3ce6..ef6101ce 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -105,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; @@ -423,6 +429,10 @@ sub handle_16 my $h; $h = 1 if DXChannel::get($ncall); RouteDB::update($ncall, $self->{call}, $h); + if ($h && $self->{call} ne $ncall) { + dbg("PCPROT: trying to update a local node, ignored") if isdbg('chanerr'); + return; + } if (eph_dup($line)) { dbg("PCPROT: dup PC16 detected") if isdbg('chanerr'); @@ -558,6 +568,11 @@ sub handle_17 } } + 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); @@ -600,9 +615,10 @@ sub handle_18 $self->user->put; $self->sort('S'); } - $self->{handle_xml}++ if DXXml::available() && $_[1] =~ /\bxml\b/; - my ($pc9x) = $_[1] =~ /\bpc9\[(\d+)\]\b/; - $self->{do_pc92}++ if (defined $pc9x && $pc9x =~ /2/) || $_[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+$/; @@ -759,11 +775,11 @@ 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); } if (@pc92out) { -# $self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal'; + $self->route_pc92a($main::mycall, $line, $main::routeroot, @pc92out) if $self->{state} eq 'normal'; } } @@ -771,13 +787,14 @@ sub send_delayed_pc92 { my $self = shift; - # send out delayed PC92 config for this node if it is external - unless ($self->{do_pc92}) { - my $node = Route::Node::get($self->{call}); - if ($node) { - my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users; - $self->route_pc92c($main::mycall, undef, $node, @rout); - } + # 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); } } @@ -788,6 +805,13 @@ 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'); @@ -866,10 +890,18 @@ sub handle_22 my $pcno = shift; my $line = shift; my $origin = shift; - $self->state('normal'); - $self->{lastping} = 0; - $self->send_delayed_pc92 + 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 @@ -1338,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; @@ -1354,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)); } } @@ -1371,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; } } @@ -1430,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) { @@ -1439,39 +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; } + 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); - $parent->reset_obs; 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'); @@ -1480,30 +1527,47 @@ sub handle_92 $parent->here(Route::here($here)); $parent->version($version) if $version && $version > $parent->version; $parent->build($build) if $build && $build > $parent->build; - $parent->via_pc92(1); - $parent->reset_obs; 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'); @@ -1512,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; @@ -1533,10 +1604,85 @@ sub handle_92 } 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; + 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 # there is one). If it has a hop count and it decrements to zero then don't # rebroadcast it. @@ -1555,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 + } } } }