X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=d21497bdc4222b870945eff5a6d5d97560321098;hb=78ed3f6025103ec1c47c90725e37b417647d83c8;hp=fc0305a7208cc5dc789a60bb9f79f2716b1f78a9;hpb=1cf4bd14be226274d5deb05da8480ab91a5dac52;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index fc0305a7..d21497bd 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -29,17 +29,20 @@ 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',
   startt => '0,Start Time,atime',
   t => '9,Time,atime',
+  pc50_t => '9,Last PC50 Time,atime',
   priv => '9,Privilege',
   state => '0,Current State',
   oldstate => '5,Last State',
@@ -53,9 +56,11 @@ my %valid = (
   here => '0,Here?,yesno',
   confmode => '0,In Conference?,yesno',
   dx => '0,DX Spots,yesno',
+  redirect => '0,Redirect messages to',
+  lang => '0,Language',
+  func => '9,Function',
 );
 
-
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -120,6 +125,13 @@ sub is_user
   return $self->{sort} eq 'U';
 }
 
+# is it a connect type
+sub is_connect
+{
+  my $self = shift;
+  return $self->{sort} eq 'C';
+}
+
 # handle out going messages, immediately without waiting for the select to drop
 # this could, in theory, block
 sub send_now
@@ -132,8 +144,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;
 }
@@ -150,8 +162,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;
 }
@@ -183,7 +195,19 @@ sub state
   my $self = shift;
   $self->{oldstate} = $self->{state};
   $self->{state} = shift;
-  dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n");
+  dbg('state', "$self->{call} channel func $self->{func} 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
@@ -215,7 +239,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} ;
 }