X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=3e32f429cfe39e745bae74f3f3283ce160a342d4;hb=586cbb347e7639f5575b48572e75140501a109c0;hp=779139fc3a5c5b20b8869103e0271d2c82f18b18;hpb=dc016a0633cdb15d29b9a71fdec2c230fbad201b;p=spider.git diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm index 779139fc..3e32f429 100644 --- a/perl/DXChannel.pm +++ b/perl/DXChannel.pm @@ -4,7 +4,7 @@ # This is the base class for all channel operations, which is everything to do # with input and output really. # -# The instance variable in the outside world will be generally be called $dxchann +# The instance variable in the outside world will be generally be called $dxchan # # This class is 'inherited' (if that is the goobledegook for what I am doing) # by various other modules. The point to understand is that the 'instance variable' @@ -33,7 +33,7 @@ use DXDebug; use Filter; use strict; -use vars qw(%channels %valid); +use vars qw(%channels %valid @ISA); %channels = (); @@ -370,12 +370,11 @@ sub disconnect { my $self = shift; my $user = $self->{user}; - my $conn = $self->{conn}; my $call = $self->{call}; - $self->finish($conn); + $self->finish; $user->close() if defined $user; - $conn->disconnect() if $conn; + $self->{conn}->disconnect; $self->del(); } @@ -443,7 +442,7 @@ sub decode_input # the above regexp must work unless (defined $sort && defined $call && defined $line) { - $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg; +# $data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg; dbg('err', "DUFF Line on $chcall: $data"); return (); }