From: minima Date: Mon, 22 Jan 2007 22:57:23 +0000 (+0000) Subject: ignore PC17 from unknown nodes / users X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=abaaa7a242556e46bac5e47d10f980c19cd0eabc;p=spider.git ignore PC17 from unknown nodes / users --- diff --git a/Changes b/Changes index 2188d2d3..f6a8dfb7 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,6 @@ 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 diff --git a/perl/DXProt.pm b/perl/DXProt.pm index a6abadc8..1002023c 100644 --- 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'); + return; } 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 ($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; @@ -958,7 +956,6 @@ sub handle_17 return; } - $uref = Route->new($ucall) unless $uref; # throw away $self->route_pc17($origin, $line, $parent, $uref); }