projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move debug for add/del_thingy into routelow
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 526762e514d623b72d8c1b18ca49e09403ac205a..65aeeefa08c68aec890e81a3dcde9a94224abaf1 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-605,9
+605,9
@@
sub handle_18
$self->user->put;
$self->sort('S');
}
$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+$/;
} else {
$self->version(50.0);
$self->version($_[2] / 100) if $_[2] && $_[2] =~ /^\d+$/;
@@
-793,6
+793,13
@@
sub handle_20
my $pcno = shift;
my $line = shift;
my $origin = shift;
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');
$self->send_local_config();
$self->send(pc22());
$self->state('normal');
@@
-871,6
+878,14
@@
sub handle_22
my $pcno = shift;
my $line = shift;
my $origin = shift;
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;
$self->state('normal');
$self->{lastping} = 0;
@@
-1364,8
+1379,10
@@
sub _add_thingy
if ($call) {
if ($is_node) {
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 {
@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));
}
}
@rout = $parent->add_user($call, Route::here($here));
}
}
@@
-1381,9
+1398,11
@@
sub _del_thingy
if ($call) {
if ($is_node) {
my $nref = Route::Node::get($call);
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);
@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;
}
}
@rout = $parent->del_user($uref) if $uref;
}
}
@@
-1435,6
+1454,8
@@
sub handle_92
my $line = shift;
my $origin = shift;
my $line = shift;
my $origin = shift;
+ my (@radd, @rdel);
+
$self->{do_pc92} ||= 1;
my $pcall = $_[1];
$self->{do_pc92} ||= 1;
my $pcall = $_[1];
@@
-1444,7
+1465,6
@@
sub handle_92
}
my $t = $_[2];
my $sort = $_[3];
}
my $t = $_[2];
my $sort = $_[3];
-
my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
if ($pcall eq $main::mycall) {
my @ent = map {[ _decode_pc92_call($_) ]} grep {$_ && /^[0-7]/} @_[4 .. $#_];
if ($pcall eq $main::mycall) {
@@
-1452,12
+1472,16
@@
sub handle_92
return;
}
return;
}
+ if ($pcall eq $self->{call} && $self->{state} eq 'init') {
+ $self->state('init92');
+ }
+
my $parent = check_pc9x_t($pcall, $t, 92, 1) || return;
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->lastid->{92} = $t;
$parent->do_pc92(1);
$parent->via_pc92(1);
- $parent->reset_obs;
if (@ent) {
if (@ent) {
@@
-1470,13
+1494,19
@@
sub handle_92
return;
}
if ($is_extnode) {
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;
}
# 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');
}
} else {
dbg("PCPROT: must be mycall or external node as first entry, ignored") if isdbg('chanerr');
@@
-1485,8
+1515,6
@@
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->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;
}
shift @ent;
}
@@
-1501,8
+1529,6
@@
sub handle_92
push @nent, $_;
}
push @nent, $_;
}
- my (@radd, @rdel);
-
if ($sort eq 'A') {
for (@nent) {
push @radd, _add_thingy($parent, $_);
if ($sort eq 'A') {
for (@nent) {
push @radd, _add_thingy($parent, $_);
@@
-1513,6
+1539,15
@@
sub handle_92
}
} elsif ($sort eq 'C') {
my (@nodes, @users);
}
} 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]) {
foreach my $r (@nent) {
# my ($call, $is_node, $is_extnode, $here, $version, $build) = _decode_pc92_call($_);
if ($r->[0]) {
@@
-1528,13
+1563,20
@@
sub handle_92
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);
foreach my $r (@nent) {
my $call = $r->[0];
if ($call) {
push @radd,_add_thingy($parent, $r) if grep $call eq $_, (@$nnodes, @$nusers);
- push @rdel,_del_thingy($parent, $r) if grep $call eq $_, (@$dnodes, @$dusers);
}
}
}
}
+ # 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;
} else {
dbg("PCPROT: unknown action '$sort', ignored") if isdbg('chanerr');
return;