projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed A & K to be right way round
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 45f3afb9b6d9bd408198879277421f9d94e33ba9..39bd3065ab57e0fd3e4af2550d41107c6877b842 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-29,7
+29,8
@@
use FileHandle;
use Carp;
use strict;
use Carp;
use strict;
-use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
+use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
+ @badmsg $badmsgfn $forwardfn @forward);
%work = (); # outstanding jobs
@msg = (); # messages we have
%work = (); # outstanding jobs
@msg = (); # messages we have
@@
-37,6
+38,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
$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 = "$msgdir/badmsg.pl"; # list of TO address we wont store
+$forwardfn = "$msgdir/forward.pl"; # the forwarding table
%valid = (
fromnode => '9,From Node',
%valid = (
fromnode => '9,From Node',
@@
-101,7
+106,7
@@
sub workclean
sub process
{
my ($self, $line) = @_;
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: {
my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
SWITCH: {
@@
-195,6
+200,14
@@
sub process
return;
}
}
return;
}
}
+
+ # look for 'bad' to addresses
+ if (grep $ref->{to} eq $_, @badmsg) {
+ $ref->stop_msg($self);
+ dbg('msg', "'Bad' TO address $ref->{to}");
+ Log('msg', "'Bad' TO address $ref->{to}");
+ return;
+ }
$ref->{msgno} = next_transno("Msgno");
push @{$ref->{gotit}}, $f[2]; # mark this up as being received
$ref->{msgno} = next_transno("Msgno");
push @{$ref->{gotit}}, $f[2]; # mark this up as being received
@@
-517,6
+530,7
@@
sub queue_msg
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 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 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';
# 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';
@@
-621,22
+635,35
@@
sub init
my $dir = new FileHandle;
my @dir;
my $ref;
my $dir = new FileHandle;
my @dir;
my $ref;
-
+
+ # 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 $!";
@dir = readdir($dir);
closedir($dir);
# read in the directory
opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@dir = readdir($dir);
closedir($dir);
-
+
+ @msg = ();
for (sort @dir) {
for (sort @dir) {
- next if /^\./o;
- next if ! /^m\d+/o;
+ next unless /^m\d+$/o;
$ref = read_msg_header("$msgdir/$_");
$ref = read_msg_header("$msgdir/$_");
- next
if !
$ref;
+ next
unless
$ref;
+ # delete any messages to 'badmsg.pl' places
+ if (grep $ref->{to} eq $_, @badmsg) {
+ dbg('msg', "'Bad' TO address $ref->{to}");
+ Log('msg', "'Bad' TO address $ref->{to}");
+ $ref->del_msg;
+ next;
+ }
+
# add the message to the available queue
add_dir($ref);
# add the message to the available queue
add_dir($ref);
-
}
}
}
}
@@
-771,6
+798,24
@@
sub dir
$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
}
$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;
+}
+
no strict;
sub AUTOLOAD
{
no strict;
sub AUTOLOAD
{