X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=7d340a6165f5cfde293b725b28efea2edf9c95b7;hb=2c50f9b4b2b3f29b000d77623a9d7c3748933aef;hp=99ae22a90960dec138e9339f3f9c60bae7310d0d;hpb=ad7e69f78ee4c0593e1d7576a7c1fd3b13931f84;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 99ae22a9..7d340a61 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -21,7 +21,7 @@ # # Copyright (c) 1998-2000 - Dirk Koopman G1TLH # -# $Id$ +# # package DXChannel; @@ -119,15 +119,12 @@ $count = 0; lastmsgpoll => '0,Last Msg Poll,atime', inscript => '9,In a script,yesno', handle_xml => '9,Handles XML,yesno', - do_pc92 => '9,Handles PC92,yesno', - send_pc92 => '9,Send PC92,atime', + do_pc9x => '9,Handles PC9x,yesno', inqueue => '9,Input Queue,parray', + next_pc92_update => '9,Next PC92 Update,atime', + next_pc92_keepalive => '9,Next PC92 KeepAlive,atime', ); - -use vars qw($VERSION $BRANCH); -($VERSION, $BRANCH) = dxver(q$Revision$); - # object destruction sub DESTROY { @@ -472,7 +469,7 @@ sub disconnect my $user = $self->{user}; $user->close() if defined $user; - $self->{conn}->disconnect; + $self->{conn}->disconnect if $self->{conn}; $self->del(); } @@ -577,28 +574,6 @@ sub decode_input return ($sort, $call, $line); } -sub rspfcheck -{ - my ($self, $flag, $node, $user) = @_; - my $nref = Route::Node::get($node); - my $dxchan = $nref->dxchan if $nref; - if ($nref && $dxchan) { - if ($dxchan == $self) { - return 1 unless $user; - return 1 if $user eq $node; - my @users = $nref->users; - return 1 if @users == 0 || grep $user eq $_, @users; - dbg("RSPF: $user not on $node") if isdbg('chanerr'); - } else { - dbg("RSPF: Shortest path for $node is " . $nref->dxchan->{call}) if isdbg('chanerr'); - } - } else { - return 1 if $flag; - dbg("RSPF: required $node not found" ) if isdbg('chanerr'); - } - return 0; -} - # broadcast a message to all clusters taking into account isolation # [except those mentioned after buffer] sub broadcast_nodes