added stat/cluster and stat/msg commands

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 2b4fda78a20bf554916139a28157b52d20621342..f577ded847405cbcfbac279f4f2b0ab7327ee828 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -42,14 +42,14 @@ 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',
@@ -59,22 +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',
-                 delayed => '9,Delayed messages,parray',
-                 annfilter => '9,Announce Filter',
-                 wwvfilter => '9,WWV Filter',
-                 spotfilter => '9,Spot Filter',
+                 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
 {
@@ -83,6 +100,7 @@ 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
        if (defined $user) {
                $self->{user} = $user;
@@ -210,7 +228,7 @@ sub msg
        return DXM::msg($self->{lang}, @_);
 }
 
-# stick a broadcast on the delayed queue
+# stick a broadcast on the delayed queue (but only up to 20 items)
 sub delay
 {
        my $self = shift;
@@ -218,6 +236,9 @@ sub delay
        
        $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 :-)
@@ -232,9 +253,7 @@ sub state
 
                # if there is any queued up broadcasts then splurge them out here
                if ($self->{delayed} && ($self->{state} eq 'prompt' || $self->{state} eq 'convers')) {
-                       for (@{$self->{delayed}}) {
-                               $self->send($_);
-                       }
+                       $self->send (@{$self->{delayed}});
                        delete $self->{delayed};
                }
        }