projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add cty-1701
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index 241b7c3a4b316b33e229f8f13004e4bcba0a305d..f04c6958f3f658e07a7ba9b367b09c72ef2f01b9 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-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;
@@
-1365,8
+1380,10
@@
sub _add_thingy
if ($call) {
if ($is_node) {
@rout = $parent->add($call, $version, Route::here($here));
if ($call) {
if ($is_node) {
@rout = $parent->add($call, $version, Route::here($here));
+ dbg("ROUTE: added node $call to " . $parent->call) if isdbg('route');
} else {
@rout = $parent->add_user($call, Route::here($here));
} else {
@rout = $parent->add_user($call, Route::here($here));
+ dbg("ROUTE: added user $call to " . $parent->call) if isdbg('route');
}
}
return @rout;
}
}
return @rout;
@@
-1382,9
+1399,11
@@
sub _del_thingy
if ($is_node) {
my $nref = Route::Node::get($call);
@rout = $nref->del($parent) if $nref;
if ($is_node) {
my $nref = Route::Node::get($call);
@rout = $nref->del($parent) if $nref;
+ dbg("ROUTE: deleting node $call from " . $parent->call) if isdbg('route');
} else {
my $uref = Route::User::get($call);
@rout = $parent->del_user($uref) if $uref;
} else {
my $uref = Route::User::get($call);
@rout = $parent->del_user($uref) if $uref;
+ dbg("ROUTE: deleting user $call from " . $parent->call) if isdbg('route');
}
}
return @rout;
}
}
return @rout;
@@
-1444,7
+1463,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
+1470,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) {
@@
-1481,7
+1503,8
@@
sub handle_92
dbg("PCPROT: no previous C or A for this external node received, ignored") if isdbg('chanerr');
return;
}
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');
@@
-1490,8
+1513,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;
}
@@
-1518,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]) {
@@
-1533,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;