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

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 36a84aa1..fc0305a7 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -30,24 +30,34 @@ use DXUtil;
 use DXM;
 use DXDebug;
 
-%channels = undef;
+use strict;
 
-%valid = (
+my %channels = undef;
+
+my %valid = (
   call => '0,Callsign',
   conn => '9,Msg Conn ref',
   user => '9,DXUser ref',
-  t => '0,Time,atime',
+  startt => '0,Start Time,atime',
+  t => '9,Time,atime',
   priv => '9,Privilege',
   state => '0,Current State',
   oldstate => '5,Last State',
   list => '9,Dep Chan List',
   name => '0,User Name',
-  consort => '9,Connection Type'
+  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',
 );
 
 
 # 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 = {};
@@ -56,7 +66,7 @@ sub new
   $self->{call} = $call;
   $self->{conn} = $conn if defined $conn;   # if this isn't defined then it must be a list
   $self->{user} = $user if defined $user; 
-  $self->{t} = time;
+  $self->{startt} = $self->{t} = time;
   $self->{state} = 0;
   $self->{oldstate} = 0;
   bless $self, $pkg; 
@@ -96,6 +106,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
@@ -103,25 +126,16 @@ sub send_now
 {
   my $self = shift;
   my $conn = $self->{conn};
-
-  # is this a list of channels ?
-  if (!defined $conn) {
-    die "tried to send_now to an invalid channel list" if !defined $self->{list};
-	my $lself;
-	foreach $lself (@$self->{list}) {
-	  $lself->send_now(@_);             # it's recursive :-)
-	}
-  } else {
-    my $sort = shift;
-    my $call = $self->{call};
-    my $line;
+  my $sort = shift;
+  my $call = $self->{call};
+  my $line;
 	
-    foreach $line (@_) {
-	  chomp $line;
-      dbg('chan', "-> $sort $call $line\n");
-      $conn->send_now("$sort$call|$line");
-	}
+  foreach $line (@_) {
+    chomp $line;
+	dbg('chan', "-> $sort $call $line\n");
+	$conn->send_now("$sort$call|$line");
   }
+  $self->{t} = time;
 }
 
 #
@@ -131,24 +145,15 @@ sub send              # this is always later and always data
 {
   my $self = shift;
   my $conn = $self->{conn};
- 
-  # is this a list of channels ?
-  if (!defined $conn) {
-    die "tried to send to an invalid channel list" if !defined $self->{list};
-	my $lself;
-	foreach $lself (@$self->{list}) {
-	  $lself->send(@_);                 # here as well :-) :-)
-	}
-  } else {
-    my $call = $self->{call};
-    my $line;
-
-    foreach $line (@_) {
-	  chomp $line;
-	  dbg('chan', "-> D $call $line\n");
-	  $conn->send_later("D$call|$line");
-	}
+  my $call = $self->{call};
+  my $line;
+
+  foreach $line (@_) {
+    chomp $line;
+	dbg('chan', "-> D $call $line\n");
+	$conn->send_later("D$call|$line");
   }
+  $self->{t} = time;
 }
 
 # send a file (always later)
@@ -202,11 +207,11 @@ sub field_prompt
   return $valid{$ele};
 }
 
+no strict;
 sub AUTOLOAD
 {
   my $self = shift;
   my $name = $AUTOLOAD;
-  
   return if $name =~ /::DESTROY$/;
   $name =~ s/.*:://o;