1. cluster seems to have a memory leak, put DESTROY functions in where

[spider.git] / perl / DXMsg.pm

diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm
index f10debfe8818d4f2c567e47c30e859df4a580ea8..87129ea0ed1ce990391b2f182dbeffd6c545a93d 100644 (file)
--- a/perl/DXMsg.pm
+++ b/perl/DXMsg.pm
@@ -11,6 +11,7 @@
 #
 # PC28 field 11 is the RR required flag
 # PC28 field 12 is a VIA routing (ie it is a node call) 
+#
 
 package DXMsg;
 
@@ -30,7 +31,7 @@ use Carp;
 
 use strict;
 use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
-                       @badmsg $badmsgfn);
+                       @badmsg $badmsgfn $forwardfn @forward);
 
 %work = ();                                            # outstanding jobs
 @msg = ();                                             # messages we have
@@ -38,8 +39,10 @@ use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
 $msgdir = "$main::root/msg";   # directory contain the msgs
 $maxage = 30 * 86400;                  # the maximum age that a message shall live for if not marked 
 $last_clean = 0;                               # last time we did a clean
+@forward = ();                  # msg forward table
 
-$badmsgfn = "$main::data/badmsg.pl";  # list of TO address we wont store
+$badmsgfn = "$msgdir/badmsg.pl";  # list of TO address we wont store
+$forwardfn = "$msgdir/forward.pl";  # the forwarding table
 
 %valid = (
                  fromnode => '9,From Node',
@@ -64,6 +67,13 @@ $badmsgfn = "$main::data/badmsg.pl";  # list of TO address we wont store
                  keep => '0,Keep this?,yesno',
                 );
 
+sub DESTROY
+{
+       my $self = shift;
+       undef $self->{lines};
+       undef $self->{gotit};
+}
+
 # allocate a new object
 # called fromnode, tonode, from, to, datetime, private?, subject, nolinesper  
 sub alloc                  
@@ -73,7 +83,7 @@ sub alloc
        $self->{msgno} = shift;
        my $to = shift;
        #  $to =~ s/-\d+$//o;
-       $self->{to} = $to;
+       $self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
        my $from = shift;
        $from =~ s/-\d+$//o;
        $self->{from} = uc $from;
@@ -104,7 +114,7 @@ sub workclean
 sub process
 {
        my ($self, $line) = @_;
-       my @f = split /[\^\~]/, $line;
+       my @f = split /\^/, $line;
        my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
        
  SWITCH: {
@@ -250,7 +260,7 @@ sub process
                        $f[3] =~ s/^\///o;   # remove the leading /
                        $f[3] = lc $f[3];       # to lower case;
                        dbg('msg', "incoming file $f[3]\n");
-                       last SWITCH if $f[3] =~ /^(perl|cmd|local|src|lib|include|sys|msg|connect)/; # prevent access to executables
+                       $f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
                        
                        # create any directories
                        my @part = split /\//, $f[3];
@@ -526,8 +536,10 @@ sub queue_msg
                        my $noderef;
                        foreach $noderef (@nodelist) {
                                next if $noderef->call eq $main::mycall;
-                               next if $noderef->isolate;               # maybe add code for stuff originated here?
                                next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
+                               next unless $ref->forward_it($noderef->call);           # check the forwarding file
+                               # next if $noderef->isolate;               # maybe add code for stuff originated here?
+                               # next if DXUser->get( ${$ref->{gotit}}[0] )->isolate;  # is the origin isolated?
                                
                                # if we are here we have a node that doesn't have this message
                                $ref->start_msg($noderef) if !get_busy($noderef->call)  && $noderef->state eq 'normal';
@@ -633,8 +645,11 @@ sub init
        my @dir;
        my $ref;
 
-       do "$badmsgfn" if -e "$badmsgfn";
-       print "$@\n" if $@;
+       # load various control files
+       my @in = load_badmsg();
+       print "@in\n" if @in;
+       @in = load_forward();
+       print "@in\n" if @in;
 
        # read in the directory
        opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@@ -643,7 +658,7 @@ sub init
 
        @msg = ();
        for (sort @dir) {
-               next unless /^m\d+/o;
+               next unless /^m\d+$/o;
                
                $ref = read_msg_header("$msgdir/$_");
                next unless $ref;
@@ -792,6 +807,57 @@ sub dir
                        $ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
 }
 
+# load the forward table
+sub load_forward
+{
+       my @out;
+       do "$forwardfn" if -e "$forwardfn";
+       push @out, $@ if $@;
+       return @out;
+}
+
+# load the bad message table
+sub load_badmsg
+{
+       my @out;
+       do "$badmsgfn" if -e "$badmsgfn";
+       push @out, $@ if $@;
+       return @out;
+}
+
+#
+# forward that message or not according to the forwarding table
+# returns 1 for forward, 0 - to ignore
+#
+
+sub forward_it
+{
+       my $ref = shift;
+       my $call = shift;
+       my $i;
+       
+       for ($i = 0; $i < @forward; $i += 5) {
+               my ($sort, $field, $pattern, $action, $bbs) = @forward[$i..($i+4)]; 
+               my $tested;
+               
+               # are we interested?
+               last if $ref->{private} && $sort ne 'P';
+               last if !$ref->{private} && $sort ne 'B';
+               
+               # select field
+               $tested = $ref->{to} if $field eq 'T';
+               $tested = $ref->{from} if $field eq 'F';
+               $tested = $ref->{origin} if $field eq 'O';
+               $tested = $ref->{subject} if $field eq 'S';
+
+               if (!$pattern || $tested =~ m{$pattern}i) {
+                       return 0 if $action eq 'I';
+                       return 1 if !$bbs || grep $_ eq $call, @{$bbs};
+               }
+       }
+       return 0;
+}
+
 no strict;
 sub AUTOLOAD
 {