projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4fe4a73
)
ignore PC17 from unknown nodes / users
author
minima
<minima>
Mon, 22 Jan 2007 22:57:23 +0000
(22:57 +0000)
committer
minima
<minima>
Mon, 22 Jan 2007 22:57:23 +0000
(22:57 +0000)
Changes
patch
|
blob
|
history
perl/DXProt.pm
patch
|
blob
|
history
diff --git
a/Changes
b/Changes
index 2188d2d35ef3b31599b9524ba61c4d98b2102b9e..f6a8dfb72bcdcc2aa5dbdb9f3ab21861240e657e 100644
(file)
--- a/
Changes
+++ b/
Changes
@@
-1,5
+1,6
@@
22Jan06=======================================================================
1. disable default propagation of PC9x sentences
22Jan06=======================================================================
1. disable default propagation of PC9x sentences
+2. simplify PC17 handling
16Jan06=======================================================================
1. back ported a change to PC16 handling so that a locally connected node's
info clears out and generally overrides any residual PC16 info gathered from
16Jan06=======================================================================
1. back ported a change to PC16 handling so that a locally connected node's
info clears out and generally overrides any residual PC16 info gathered from
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index a6abadc83ab1384936093c0954f11fce13a19f9d..1002023c4f9b3980920a49a50d5396bdc4bdd76b 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-929,25
+929,23
@@
sub handle_17
my $uref = Route::User::get($ucall);
unless ($uref) {
dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
my $uref = Route::User::get($ucall);
unless ($uref) {
dbg("PCPROT: Route::User $ucall not in config") if isdbg('chanerr');
+ return;
}
my $parent = Route::Node::get($ncall);
unless ($parent) {
dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
}
my $parent = Route::Node::get($ncall);
unless ($parent) {
dbg("PCPROT: Route::Node $ncall not in config") if isdbg('chanerr');
+ return;
}
}
- $dxchan =
$parent->dxchan if $parent
;
+ $dxchan =
DXChannel::get($ncall)
;
if ($dxchan && $dxchan ne $self) {
dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
# input filter if required and then remove user if present
if ($dxchan && $dxchan ne $self) {
dbg("PCPROT: PC17 from $self->{call} trying to alter locally connected $ncall, ignored!") if isdbg('chanerr');
return;
}
# input filter if required and then remove user if present
- if ($parent) {
# return unless $self->in_filter_route($parent);
# return unless $self->in_filter_route($parent);
- $parent->del_user($uref) if $uref;
- } else {
- $parent = Route->new($ncall); # throw away
- }
+ $parent->del_user($uref);
# send info to all logged in thingies
$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
# send info to all logged in thingies
$self->tell_login('logoutu', "$ncall: $ucall") if DXUser->get_current($ncall)->is_local_node;
@@
-958,7
+956,6
@@
sub handle_17
return;
}
return;
}
- $uref = Route->new($ucall) unless $uref; # throw away
$self->route_pc17($origin, $line, $parent, $uref);
}
$self->route_pc17($origin, $line, $parent, $uref);
}