added auto ping and obs count to dxchan

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 754cd5387127edab92d73b6ebec42a93199b5f05..33d353dbb84e2bb748c52d080b50b7e46c5c4f47 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -29,6 +29,7 @@ use Msg;
 use DXM;
 use DXUtil;
 use DXDebug;
+use Filter;
 use Carp;
 
 use strict;
@@ -42,14 +43,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,23 +60,51 @@ 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',
+                 inannfilter => '5,Input Ann Filter',
+                 inwwvfilter => '5,Input WWV Filter',
+                 inspotfilter => '5,Input Spot Filter',
                  passwd => '9,Passwd List,parray',
+                 pingint => '9,Ping Interval ',
+                 nopings => '9,Ping Obs Count',
+                 lastping => '9,Ping last sent,atime',
+          pingrec => '9,Pings no rec',
+                 pingtime => '9,Ping totaltime',
+                 pingave => '0,Ping ave time',
                 );
 
+# 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->{inannfilter};
+       undef $self->{inwwvfilter};
+       undef $self->{inspotfilter};
+       undef $self->{passwd};
+}
+
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
 sub alloc
 {
@@ -97,6 +126,12 @@ sub alloc
        $self->{oldstate} = 0;
        $self->{lang} = $main::lang if !$self->{lang};
        $self->{func} = "";
+
+       # get the filters
+       $self->{spotfilter} = Filter::read_in('spots', $call, 0);
+       $self->{wwvfilter} = Filter::read_in('wwv', $call, 0);
+       $self->{annfilter} = Filter::read_in('ann', $call, 0);
+
        bless $self, $pkg; 
        return $channels{$call} = $self;
 }
@@ -136,6 +171,13 @@ sub del
        delete $channels{$self->{call}};
 }
 
+# is it a bbs
+sub is_bbs
+{
+       my $self = shift;
+       return $self->{sort} eq 'B';
+}
+
 # is it an ak1a cluster ?
 sub is_ak1a
 {
@@ -163,13 +205,17 @@ sub send_now
 {
        my $self = shift;
        my $conn = $self->{conn};
+       return unless $conn;
        my $sort = shift;
        my $call = $self->{call};
        
        for (@_) {
                chomp;
-               $conn->send_now("$sort$call|$_") if $conn;
-               dbg('chan', "-> $sort $call $_") if $conn;
+        my @lines = split /\n/;
+               for (@lines) {
+                       $conn->send_now("$sort$call|$_");
+                       dbg('chan', "-> $sort $call $_");
+               }
        }
        $self->{t} = time;
 }
@@ -181,12 +227,16 @@ sub send                                          # this is always later and always data
 {
        my $self = shift;
        my $conn = $self->{conn};
+       return unless $conn;
        my $call = $self->{call};
 
        for (@_) {
                chomp;
-               $conn->send_later("D$call|$_") if $conn;
-               dbg('chan', "-> D $call $_") if $conn;
+        my @lines = split /\n/;
+               for (@lines) {
+                       $conn->send_later("D$call|$_");
+                       dbg('chan', "-> D $call $_");
+               }
        }
        $self->{t} = time;
 }