X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=640bc4e5345bbf1800a4ee4590cac543666bc462;hb=337f38bfac57a5e5df34c63094fb869b0e2f6bee;hp=519a0b48860e093aa102df570720dcf7a2cd456a;hpb=21e7642d216656c60b164d76208633a0c81cf5db;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 519a0b48..640bc4e5 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -26,16 +26,17 @@
 package DXChannel;
 
 use Msg;
-use DXUtil;
 use DXM;
+use DXUtil;
 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',
@@ -55,6 +56,17 @@ 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',
+  loc => '9,Local Vars',     # used by func to store local variables in
+  beep => '0,Want Beeps,yesno',
+  lastread => '9,Last Msg Read',
+  outbound => '9,outbound?,yesno',
+  remotecmd => '9,doing rcmd,yesno',
+  pagelth => '0,Page Length',
+  pagedata => '9,Page Data Store',
+  group => '0,Access Group,parray',               # used to create a group of users/nodes for some purpose or other
 );
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -70,6 +82,10 @@ sub alloc
   $self->{startt} = $self->{t} = time;
   $self->{state} = 0;
   $self->{oldstate} = 0;
+  $self->{lang} = $user->{lang} if defined $user;
+  $self->{lang} = $main::lang if !$self->{lang};
+  $user->new_group() if !$user->group;
+  $self->{group} = $user->group;
   bless $self, $pkg; 
   return $channels{$call} = $self;
 }
@@ -104,6 +120,7 @@ sub get_by_cnum
 sub del
 {
   my $self = shift;
+  $self->{group} = undef;      # belt and braces
   delete $channels{$self->{call}};
 }
 
@@ -121,6 +138,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
@@ -133,8 +157,8 @@ sub send_now
 	
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> $sort $call $line\n") if $conn;
 	$conn->send_now("$sort$call|$line") if $conn;
+	dbg('chan', "-> $sort $call $line") if $conn;
   }
   $self->{t} = time;
 }
@@ -151,8 +175,8 @@ sub send              # this is always later and always data
 
   foreach $line (@_) {
     chomp $line;
-	dbg('chan', "-> D $call $line\n") if $conn;
 	$conn->send_later("D$call|$line") if $conn;
+	dbg('chan', "-> D $call $line") if $conn;
   }
   $self->{t} = time;
 }
@@ -171,20 +195,35 @@ sub send_file
   $self->send(@buf);
 }
 
-# just a shortcut for $dxchan->send(msg(...));
+# this will implement language independence (in time)
 sub msg
 {
   my $self = shift;
-  $self->send(DXM::msg(@_));
+  return DXM::msg($self->{lang}, @_);
 }
 
 # change the state of the channel - lots of scope for debugging here :-)
 sub state
 {
   my $self = shift;
-  $self->{oldstate} = $self->{state};
-  $self->{state} = shift;
-  dbg('state', "$self->{call} channel state $self->{oldstate} -> $self->{state}\n");
+  if (@_) {
+    $self->{oldstate} = $self->{state};
+    $self->{state} = shift;
+    dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+  }
+  return $self->{state};
+}
+
+# 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