X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXChannel.pm;h=f577ded847405cbcfbac279f4f2b0ab7327ee828;hb=30dbf70f84b53174005810f64f546d2181e1a8c6;hp=7319344caeb51fa8bda7770f5c12f397f685e7c6;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 7319344c..f577ded8 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -42,15 +42,16 @@ use vars qw(%channels %valid);
 		  user => '9,DXUser ref',
 		  startt => '0,Start Time,atime',
 		  t => '9,Time,atime',
-		  pc50_t => '9,Last PC50 Time,atime',
+		  pc50_t => '5,Last PC50 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',
-		  'sort' => '9,Type of Channel',
+		  consort => '5,Connection Type',
+		  'sort' => '5,Type of Channel',
 		  wwv => '0,Want WWV,yesno',
+		  wx => '0,Want WX,yesno',
 		  talk => '0,Want Talk,yesno',
 		  ann => '0,Want Announce,yesno',
 		  here => '0,Here?,yesno',
@@ -58,18 +59,39 @@ use vars qw(%channels %valid);
 		  dx => '0,DX Spots,yesno',
 		  redirect => '0,Redirect messages to',
 		  lang => '0,Language',
-		  func => '9,Function',
+		  func => '5,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',
+		  lastread => '5,Last Msg Read',
+		  outbound => '5,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
-		  isolate => '9,Isolate network,yesno',
+		  isolate => '5,Isolate network,yesno',
+		  delayed => '5,Delayed messages,parray',
+		  annfilter => '5,Announce Filter',
+		  wwvfilter => '5,WWV Filter',
+		  spotfilter => '5,Spot Filter',
+		  passwd => '9,Passwd List,parray',
 		 );
 
+# object destruction
+sub DESTROY
+{
+	my $self = shift;
+	undef $self->{user};
+	undef $self->{conn};
+	undef $self->{loc};
+	undef $self->{pagedata};
+	undef $self->{group};
+	undef $self->{delayed};
+	undef $self->{annfilter};
+	undef $self->{wwvfilter};
+	undef $self->{spotfilter};
+	undef $self->{passwd};
+}
+
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -78,15 +100,18 @@ sub alloc
   
 	die "trying to create a duplicate channel for $call" if $channels{$call};
 	$self->{call} = $call;
+	$self->{priv} = 0;
 	$self->{conn} = $conn if defined $conn;	# if this isn't defined then it must be a list
-	$self->{user} = $user if defined $user; 
+	if (defined $user) {
+		$self->{user} = $user;
+		$self->{lang} = $user->lang;
+		$user->new_group() if !$user->group;
+		$self->{group} = $user->group;
+	}
 	$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;
 	$self->{func} = "";
 	bless $self, $pkg; 
 	return $channels{$call} = $self;
@@ -156,12 +181,11 @@ sub send_now
 	my $conn = $self->{conn};
 	my $sort = shift;
 	my $call = $self->{call};
-	my $line;
 	
-	foreach $line (@_) {
-		chomp $line;
-		$conn->send_now("$sort$call|$line") if $conn;
-		dbg('chan', "-> $sort $call $line") if $conn;
+	for (@_) {
+		chomp;
+		$conn->send_now("$sort$call|$_") if $conn;
+		dbg('chan', "-> $sort $call $_") if $conn;
 	}
 	$self->{t} = time;
 }
@@ -174,12 +198,11 @@ sub send						# this is always later and always data
 	my $self = shift;
 	my $conn = $self->{conn};
 	my $call = $self->{call};
-	my $line;
 
-	foreach $line (@_) {
-		chomp $line;
-		$conn->send_later("D$call|$line") if $conn;
-		dbg('chan', "-> D $call $line") if $conn;
+	for (@_) {
+		chomp;
+		$conn->send_later("D$call|$_") if $conn;
+		dbg('chan', "-> D $call $_") if $conn;
 	}
 	$self->{t} = time;
 }
@@ -205,6 +228,19 @@ sub msg
 	return DXM::msg($self->{lang}, @_);
 }
 
+# stick a broadcast on the delayed queue (but only up to 20 items)
+sub delay
+{
+	my $self = shift;
+	my $s = shift;
+	
+	$self->{delayed} = [] unless $self->{delayed};
+	push @{$self->{delayed}}, $s;
+	if (@{$self->{delayed}} >= 20) {
+		shift @{$self->{delayed}};   # lose oldest one
+	}
+}
+
 # change the state of the channel - lots of scope for debugging here :-)
 sub state
 {
@@ -212,7 +248,14 @@ sub state
 	if (@_) {
 		$self->{oldstate} = $self->{state};
 		$self->{state} = shift;
+		$self->{func} = '' unless defined $self->{func};
 		dbg('state', "$self->{call} channel func $self->{func} state $self->{oldstate} -> $self->{state}\n");
+
+		# if there is any queued up broadcasts then splurge them out here
+		if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'convers')) {
+			$self->send (@{$self->{delayed}});
+			delete $self->{delayed};
+		}
 	}
 	return $self->{state};
 }
@@ -232,6 +275,22 @@ sub disconnect
 	$self->del();
 }
 
+#
+# just close all the socket connections down without any fiddling about, cleaning, being
+# nice to other processes and otherwise telling them what is going on.
+#
+# This is for the benefit of forked processes to prepare for starting new programs, they
+# don't want or need all this baggage.
+#
+
+sub closeall
+{
+	my $ref;
+	foreach $ref (values %channels) {
+		$ref->{conn}->disconnect() if $ref->{conn};
+	}
+}
+
 # various access routines
 
 #