X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=5a9ca3b2de56c41bfae40ef7f480c28e840a8f4f;hb=171a7a0bf86e9732a33c7829e808129ec01c51c2;hp=2b7573bb89c7a1ece843c9ddc66c8336093998e8;hpb=15c6f0c107d136f8366bca25e3dcb7d14f2ed24b;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 2b7573bb..5a9ca3b2 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -29,12 +29,14 @@ use Msg;
 use DXUtil;
 use DXM;
 use DXDebug;
+use Carp;
 
 use strict;
+use vars qw(%channels %valid);
 
-my %channels = undef;
+%channels = undef;
 
-my %valid = (
+%valid = (
   call => '0,Callsign',
   conn => '9,Msg Conn ref',
   user => '9,DXUser ref',
@@ -54,9 +56,10 @@ my %valid = (
   here => '0,Here?,yesno',
   confmode => '0,In Conference?,yesno',
   dx => '0,DX Spots,yesno',
+  redirect => '0,Redirect messages to',
+  lang => '0,Language',
 );
 
-
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -133,8 +136,8 @@ sub send_now
 	
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> $sort $call $line\n");
-	$conn->send_now("$sort$call|$line");
+	dbg('chan', "-> $sort $call $line\n") if $conn;
+	$conn->send_now("$sort$call|$line") if $conn;
   }
   $self->{t} = time;
 }
@@ -151,8 +154,8 @@ sub send              # this is always later and always data
 
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> D $call $line\n");
-	$conn->send_later("D$call|$line");
+	dbg('chan', "-> D $call $line\n") if $conn;
+	$conn->send_later("D$call|$line") if $conn;
   }
   $self->{t} = time;
 }
@@ -187,6 +190,18 @@ sub state
   dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n");
 }
 
+# disconnect this channel
+sub disconnect
+{
+  my $self = shift;
+  my $user = $self->{user};
+  my $conn = $self->{conn};
+  $self->finish();
+  $user->close() if defined $user;
+  $conn->disconnect() if defined $conn;
+  $self->del();
+}
+
 # various access routines
 
 #
@@ -216,7 +231,7 @@ sub AUTOLOAD
   return if $name =~ /::DESTROY$/;
   $name =~ s/.*:://o;
   
-  die "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+  confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
   @_ ? $self->{$name} = shift : $self->{$name} ;
 }