X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=808b4821206fb6ddc91cd3eaa1d232f8bb1a082d;hb=5d2f2feddd2c756e43868f62f72b3c5033c3d3a7;hp=b7b2d4bb84ec21ae1d76c5a3bd2f9ba89993fc97;hpb=4a8336156c820698be4933a3e36513750709926d;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index b7b2d4bb..808b4821 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -33,9 +33,10 @@ use DXDebug;
 use Filter;
 
 use strict;
-use vars qw(%channels %valid @ISA);
+use vars qw(%channels %valid @ISA $count);
 
 %channels = ();
+$count = 0;
 
 %valid = (
 		  call => '0,Callsign',
@@ -96,20 +97,13 @@ use vars qw(%channels %valid @ISA);
 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->{spotsfilter};
-	undef $self->{inannfilter};
-	undef $self->{inwwvfilter};
-	undef $self->{inspotsfilter};
-	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)]
@@ -135,6 +129,8 @@ sub alloc
 	$self->{lang} = $main::lang if !$self->{lang};
 	$self->{func} = "";
 
+	$count++;
+	dbg('chan', "DXChannel $self->{call} created ($count)");
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
 }
@@ -370,12 +366,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();
 }