X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=8a300d5f24dd3823827d0f080f68cc176e54f0c1;hb=b67b50de92dbf61ce939b42f7c74e30dc58eba41;hp=d975ca0d93d052bb0ba6c8cc4f07d26eb91f55f6;hpb=c5e90df0d93d141f8687556a708068521b9b8f77;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index d975ca0d..8a300d5f 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'
@@ -28,13 +28,15 @@ package DXChannel;
 use Msg;
 use DXM;
 use DXUtil;
+use DXVars;
 use DXDebug;
 use Filter;
 
 use strict;
-use vars qw(%channels %valid);
+use vars qw(%channels %valid @ISA $count);
 
 %channels = ();
+$count = 0;
 
 %valid = (
 		  call => '0,Callsign',
@@ -74,11 +76,11 @@ use vars qw(%channels %valid);
 		  annfilter => '5,Announce Filter',
 		  wwvfilter => '5,WWV Filter',
 		  wcyfilter => '5,WCY Filter',
-		  spotfilter => '5,Spot Filter',
+		  spotsfilter => '5,Spot Filter',
 		  inannfilter => '5,Input Ann Filter',
 		  inwwvfilter => '5,Input WWV Filter',
 		  inwcyfilter => '5,Input WCY Filter',
-		  inspotfilter => '5,Input Spot Filter',
+		  inspotsfilter => '5,Input Spot Filter',
 		  passwd => '9,Passwd List,parray',
 		  pingint => '5,Ping Interval ',
 		  nopings => '5,Ping Obs Count',
@@ -88,26 +90,22 @@ use vars qw(%channels %valid);
 		  logininfo => '9,Login info req,yesno',
 		  talklist => '0,Talk List,parray',
 		  cluster => '5,Cluster data',
+		  isbasic => '9,Internal Connection', 
+		  errors => '9,Errors',
+		  route => '9,Route Data',
 		 );
 
 # object destruction
 sub DESTROY
 {
 	my $self = shift;
-	undef $self->{user};
-	undef $self->{conn};
-	undef $self->{loc};
-	undef $self->{pagedata};
-	undef $self->{group};
-	undef $self->{delayed};
-	undef $self->{annfilter};
-	undef $self->{wwvfilter};
-	undef $self->{spotfilter};
-	undef $self->{inannfilter};
-	undef $self->{inwwvfilter};
-	undef $self->{inspotfilter};
-	undef $self->{passwd};
-	undef $self->{node};
+	for (keys %$self) {
+		if (ref($self->{$_})) {
+			delete $self->{$_};
+		}
+	}
+	dbg('chan', "DXChannel $self->{call} destroyed ($count)");
+	$count--;
 }
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -133,12 +131,8 @@ sub alloc
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
 
-	# get the filters
-	$self->{spotfilter} = Filter::read_in('spots', $call, 0);
-	$self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
-	$self->{wcyfilter} = Filter::read_in('wcy', $call, 0);
-	$self->{annfilter} = Filter::read_in('ann', $call, 0);
-
+	$count++;
+	dbg('chan', "DXChannel $self->{call} created ($count)");
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
 }
@@ -374,12 +368,9 @@ sub disconnect
 {
 	my $self = shift;
 	my $user = $self->{user};
-	my $conn = $self->{conn};
-	my $call = $self->{call};
 	
-	$self->finish($conn);
 	$user->close() if defined $user;
-	$conn->disconnect() if $conn;
+	$self->{conn}->disconnect;
 	$self->del();
 }
 
@@ -446,12 +437,16 @@ sub decode_input
 	my $chcall = (ref $dxchan) ? $dxchan->call : "UN.KNOWN";
 	
 	# the above regexp must work
-	if (!defined $sort || !defined $call || !defined  $line ||
-		   (ref $dxchan && $call ne $chcall)) {
-		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
-		dbg('chan', "DUFF Line from $chcall: $data");
+	unless (defined $sort && defined $call && defined $line) {
+#		$data =~ s/([\x00-\x1f\x7f-\xff])/uc sprintf("%%%02x",ord($1))/eg;
+		dbg('err', "DUFF Line on $chcall: $data");
 		return ();
 	}
+
+	if(ref($dxchan) && $call ne $chcall) {
+		dbg('err', "DUFF Line come in for $call on wrong channel $chcall" );
+		return();
+	}
 	
 	return ($sort, $call, $line);
 }