1. added $actiondata to filter line to allow per action data such as no of hops

[spider.git] / perl / DXChannel.pm

diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index d540004e638f2c9ad2051dc487a37433f50f5549..e3878ecf719f6fe2c8181a2d11c8323821d59c0f 100644 (file)
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -51,6 +51,7 @@ use vars qw(%channels %valid);
                  consort => '9,Connection Type',
                  'sort' => '9,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',
@@ -68,6 +69,11 @@ use vars qw(%channels %valid);
                  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',
+                 passwd => '9,Passwd List,parray',
                 );
 
 # create a new channel object [$obj = DXChannel->new($call, $msg_conn_obj, $user_obj)]
@@ -79,14 +85,16 @@ sub alloc
        die "trying to create a duplicate channel for $call" if $channels{$call};
        $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; 
+       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;
@@ -203,6 +211,16 @@ sub msg
        return DXM::msg($self->{lang}, @_);
 }
 
+# stick a broadcast on the delayed queue
+sub delay
+{
+       my $self = shift;
+       my $s = shift;
+       
+       $self->{delayed} = [] unless $self->{delayed};
+       push @{$self->{delayed}}, $s;
+}
+
 # change the state of the channel - lots of scope for debugging here :-)
 sub state
 {
@@ -212,6 +230,14 @@ sub 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')) {
+                       for (@{$self->{delayed}}) {
+                               $self->send($_);
+                       }
+                       delete $self->{delayed};
+               }
        }
        return $self->{state};
 }
@@ -231,6 +257,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
 
 #