X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=970832d53df28987489e28ad48c25b53578b1f5e;hb=2546ef0cfaaca39e65985e414258071a636979af;hp=24b875664c25d4174932bec8f450a0301c2839c0;hpb=20b0104deaeab77fa7ab1444dbcedfcdbf5865f8;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 24b87566..970832d5 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -29,6 +29,10 @@ use Msg;
 use DXUtil;
 use DXM;
 use DXDebug;
+use Carp;
+
+use strict;
+use vars qw(%channels %valid);
 
 %channels = undef;
 
@@ -38,6 +42,7 @@ use DXDebug;
   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',
@@ -45,11 +50,17 @@ use DXDebug;
   name => '0,User Name',
   consort => '9,Connection Type',
   sort => '9,Type of Channel',
+  wwv => '0,Want WWV,yesno',
+  talk => '0,Want Talk,yesno',
+  ann => '0,Want Announce,yesno',
+  here => '0,Here?,yesno',
+  confmode => '0,In Conference?,yesno',
+  dx => '0,DX Spots,yesno',
+  redirect => '0,Redirect messages to',
 );
 
-
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
-sub new
+sub alloc
 {
   my ($pkg, $call, $conn, $user) = @_;
   my $self = {};
@@ -98,6 +109,19 @@ sub del
   delete $channels{$self->{call}};
 }
 
+# is it an ak1a cluster ?
+sub is_ak1a
+{
+  my $self = shift;
+  return $self->{sort} eq 'A';
+}
+
+# is it a user?
+sub is_user
+{
+  my $self = shift;
+  return $self->{sort} eq 'U';
+}
 
 # handle out going messages, immediately without waiting for the select to drop
 # this could, in theory, block
@@ -111,8 +135,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;
 }
@@ -129,8 +153,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;
 }
@@ -165,6 +189,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
 
 #
@@ -186,15 +222,15 @@ sub field_prompt
   return $valid{$ele};
 }
 
+no strict;
 sub AUTOLOAD
 {
   my $self = shift;
   my $name = $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} ;
 }