X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProtHandle.pm;h=65aeeefa08c68aec890e81a3dcde9a94224abaf1;hb=a4a03d4c1437e6239c35343a275c2c4436af7751;hp=a91c3ce63df5535f803fe90b860e5499cba44b76;hpb=314a26e98d3c3e6a717a9f66ead3ed91cce09ea5;p=spider.git diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm index a91c3ce6..65aeeefa 100644 --- a/perl/DXProtHandle.pm +++ b/perl/DXProtHandle.pm @@ -558,6 +558,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 +605,9 @@ 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/; + my ($pc9x) = $_[1] =~ /\bpc9\[(\d+)\]/; + $self->{do_pc92}++ if defined $pc9x && $pc9x =~ /2/; } else { $self->version(50.0); $self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/; @@ -763,7 +768,7 @@ sub handle_19 $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'; } } @@ -788,6 +793,13 @@ sub handle_20 my $pcno = shift; my $line = shift; my $origin = shift; + + if ($self->{do_pc92} && $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,6 +878,14 @@ sub handle_22 my $pcno = shift; my $line = shift; my $origin = shift; + + if ($self->{do_pc92} && $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->state('normal'); $self->{lastping} = 0; @@ -1354,13 +1374,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 +1393,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,6 +1454,8 @@ sub handle_92 my $line = shift; my $origin = shift; + my (@radd, @rdel); + $self->{do_pc92} ||= 1; my $pcall = $_[1]; @@ -1439,39 +1465,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->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 +1515,46 @@ 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 +1563,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;