projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
attempt to fix myalias/mycall external usurpation
[spider.git]
/
perl
/
DXProtHandle.pm
diff --git
a/perl/DXProtHandle.pm
b/perl/DXProtHandle.pm
index c4f31232ea0ce2537d6b0bc8ee0f395f74b8399f..73f139193a4279febaba885c4ba5d7965fe90d00 100644
(file)
--- a/
perl/DXProtHandle.pm
+++ b/
perl/DXProtHandle.pm
@@
-945,7
+945,7
@@
sub check_add_user
$user->node($homenode);
$user->priv(0);
}
$user->node($homenode);
$user->priv(0);
}
- $user->lastin($main::systime); # this make it last longer than just this invocation
+ $user->lastin($main::systime); # this make
s
it last longer than just this invocation
$user->put; # just to make sure it gets written away!!!
dbg("DXProt: PC92 new user record for $call created");
}
$user->put; # just to make sure it gets written away!!!
dbg("DXProt: PC92 new user record for $call created");
}
@@
-1032,6
+1032,12
@@
sub handle_19
next;
}
next;
}
+ if ($call eq $main::myalias) {
+ LogDbg('err', "ROUTE: $call eq \$myalias from $self->{call}, ignored!!!");
+ dbgprintring(3) if isdbg('nologchan');
+ next;
+ }
+
my $user = check_add_user($call, 'A');
# if (eph_dup($genline)) {
my $user = check_add_user($call, 'A');
# if (eph_dup($genline)) {
@@
-1807,7
+1813,12
@@
sub _add_thingy
$user->del if $user;
$call = $normcall; # this is safe because a route add will ignore duplicates
}
$user->del if $user;
$call = $normcall; # this is safe because a route add will ignore duplicates
}
-
+
+ if ($call eq $main::myalias && $is_node) {
+ LogDbg('err', "ROUTE: $call eq \$myalias from $ncall - downgraded to user!!!");
+ dbgprintring(3) if isdbg('nologchan');
+ $is_node = 0;
+ }
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
$user = check_add_user($call, 'A');
if ($is_node) {
dbg("ROUTE: added node $call to $ncall") if isdbg('routelow');
$user = check_add_user($call, 'A');
@@
-2249,7
+2260,9
@@
sub handle_92
dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
next;
}
dbg("PCPROT: $self->{call} : type $sort $_->[0] refers to me, ignored") if isdbg('route');
next;
}
- if ($_->[0] eq $main::myalias && $_->[1] || $_->[0] eq $main::mycall && $_->[1] == 0) {
+
+ my $isnode = ($_->[1] | $_->[2]);
+ if (($_->[0] eq $main::myalias && $isnode) || ($_->[0] eq $main::mycall && !$isnode)) {
LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
next;
}
LogDbg('err',"PCPROT: $self->{call} : type $sort $_->[0] trying to change type to " . $_->[1]?"Node":"User" . ", ignored");
next;
}