use strict;
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
- @badmsg $badmsgfn $forwardfn @forward $timeout $waittime
- $queueinterval $lastq);
+ @badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
+ $queueinterval $lastq $importfn);
%work = (); # outstanding jobs
@msg = (); # messages we have
$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
+@badmsg = (); # bad message table
+@swop = (); # swop table
$timeout = 30*60; # forwarding timeout
-$waittime = 60*60; # time an aborted outgoing message waits before trying again
-$queueinterval = 2*60; # run the queue every 2 minutes
+$waittime = 30*60; # time an aborted outgoing message waits before trying again
+$queueinterval = 1*60; # run the queue every 1 minute
$lastq = 0;
-$badmsgfn = "$msgdir/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
+$swopfn = "$msgdir/swop.pl"; # the swopping table
+$importfn = "$msgdir/import"; # import directory
+
%valid = (
fromnode => '5,From Node',
# this is periodic processing
if (!$self || !$line) {
- # wander down the work queue stopping any messages that have timed out
- for (keys %busy) {
- my $node = $_;
- my $ref = $busy{$_};
- if (exists $ref->{lastt} && $main::systime > $ref->{lastt} + $timeout) {
- dbg('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
- $ref->stop_msg($node);
+ if ($main::systime > $lastq + $queueinterval) {
- # delay any outgoing messages that fail
- $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+ # wander down the work queue stopping any messages that have timed out
+ for (keys %busy) {
+ my $node = $_;
+ my $ref = $busy{$_};
+ if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
+ dbg('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
+ $ref->stop_msg($node);
+
+ # delay any outgoing messages that fail
+ $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+ }
}
- }
- # queue some message if the interval timer has gone off
- if ($main::systime > $lastq + $queueinterval) {
+ # queue some message if the interval timer has gone off
queue_msg(0);
+
+ # import any messages in the import directory
+ import_msgs();
+
$lastq = $main::systime;
}
# remove extraneous rubbish from the hash
# remove it from the work in progress vector
# stuff it on the msg queue
- if ($ref->{lines} && @{$ref->{lines}} > 0) { # ignore messages with 0 lines
+ if ($ref->{lines}) {
if ($ref->{file}) {
$ref->store($ref->{lines});
} else {
return;
}
}
-
+
+ # swop addresses
+ $ref->swop_it($self->call);
+
# look for 'bad' to addresses
- if (grep $ref->{to} eq $_, @badmsg) {
+# if (grep $ref->{to} eq $_, @badmsg) {
+ if ($ref->dump_it($self->call)) {
$ref->stop_msg($self->call);
- dbg('msg', "'Bad' TO address $ref->{to}");
- Log('msg', "'Bad' TO address $ref->{to}");
+ dbg('msg', "'Bad' message $ref->{to}");
+ Log('msg', "'Bad' message $ref->{to}");
return;
}
$ref->stop_msg($self->call);
$ref = undef;
}
-
last SWITCH;
}
my $call = shift;
my $ref;
my $clref;
- my @nodelist = DXProt::get_all_ak1a();
+ my @nodelist = DXChannel::get_all_ak1a();
# bat down the message list looking for one that needs to go off site and whose
# nearest node is not busy.
# deal with routed private messages
my $noderef;
if ($ref->{private}) {
+ next if $ref->{'read'}; # if it is read, it is stuck here
$clref = DXCluster->get_exact($ref->{to});
unless ($clref) { # otherwise look for a homenode
my $uref = DXUser->get($ref->{to});
my $dir = new IO::File;
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;
+ print "load badmsg: ", (load_badmsg() or "Ok"), "\n";
+ print "load forward: ", (load_forward() or "Ok"), "\n";
+ print "load swop: ", (load_swop() or "Ok"), "\n";
# read in the directory
opendir($dir, $msgdir) or confess "can't open $msgdir $!";
} elsif ($self->state eq 'sendbody') {
confess "local var gone missing" if !ref $self->{loc};
my $loc = $self->{loc};
- if ($line eq "\032" || uc $line eq "/EX") {
+ if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") {
my $to;
- if (@{$loc->{lines}} > 0) {
- foreach $to (@{$loc->{to}}) {
- my $ref;
- my $systime = $main::systime;
- my $mycall = $main::mycall;
- $ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
- uc $to,
- $self->call,
- $systime,
- $loc->{private},
- $loc->{subject},
- $mycall,
- '0',
- $loc->{rrreq});
- $ref->store($loc->{lines});
- $ref->add_dir();
- push @out, $self->msg('m11', $ref->{msgno}, $to);
- #push @out, "msgno $ref->{msgno} sent to $to";
- my $dxchan = DXChannel->get(uc $to);
- if ($dxchan) {
- if ($dxchan->is_user()) {
- $dxchan->send($dxchan->msg('m9'));
- }
+ foreach $to (@{$loc->{to}}) {
+ my $ref;
+ my $systime = $main::systime;
+ my $mycall = $main::mycall;
+ $ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
+ uc $to,
+ exists $loc->{from} ? $loc->{from} : $self->call,
+ $systime,
+ $loc->{private},
+ $loc->{subject},
+ exists $loc->{origin} ? $loc->{origin} : $mycall,
+ '0',
+ $loc->{rrreq});
+ $ref->swop_it($self->call);
+ $ref->store($loc->{lines});
+ $ref->add_dir();
+ push @out, $self->msg('m11', $ref->{msgno}, $to);
+ #push @out, "msgno $ref->{msgno} sent to $to";
+ my $dxchan = DXChannel->get(uc $to);
+ if ($dxchan) {
+ if ($dxchan->is_user()) {
+ $dxchan->send($dxchan->msg('m9'));
}
}
}
+
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
sub load_forward
{
my @out;
- do "$forwardfn" if -e "$forwardfn";
- push @out, $@ if $@;
+ my $s = readfilestr($forwardfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
return @out;
}
sub load_badmsg
{
my @out;
- do "$badmsgfn" if -e "$badmsgfn";
- push @out, $@ if $@;
+ my $s = readfilestr($badmsgfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
+ return @out;
+}
+
+# load the swop message table
+sub load_swop
+{
+ my @out;
+ my $s = readfilestr($swopfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
return @out;
}
# select field
$tested = $ref->{to} if $field eq 'T';
- my $at = $ref->{to} =~ /\@\s*(\S+)/;
- $tested = $at if $field eq '\@';
$tested = $ref->{from} if $field eq 'F';
$tested = $ref->{origin} if $field eq 'O';
$tested = $ref->{subject} if $field eq 'S';
return 0;
}
+sub dump_it
+{
+ my $ref = shift;
+ my $call = shift;
+ my $i;
+
+ for ($i = 0; $i < @badmsg; $i += 3) {
+ my ($sort, $field, $pattern) = @badmsg[$i..($i+2)];
+ my $tested;
+
+ # are we interested?
+ next if $ref->{private} && $sort ne 'P';
+ next 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 1;
+ }
+ }
+ return 0;
+}
+
+sub swop_it
+{
+ my $ref = shift;
+ my $call = shift;
+ my $i;
+ my $count = 0;
+
+ for ($i = 0; $i < @swop; $i += 5) {
+ my ($sort, $field, $pattern, $tfield, $topattern) = @swop[$i..($i+4)];
+ my $tested;
+ my $swop;
+ my $old;
+
+ # are we interested?
+ next if $ref->{private} && $sort ne 'P';
+ next 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';
+
+ # select swop field
+ $old = $swop = $ref->{to} if $tfield eq 'T';
+ $old = $swop = $ref->{from} if $tfield eq 'F';
+ $old = $swop = $ref->{origin} if $tfield eq 'O';
+ $old = $swop = $ref->{subject} if $tfield eq 'S';
+
+ if ($tested =~ m{$pattern}i) {
+ if ($tested eq $swop) {
+ $swop =~ s{$pattern}{$topattern}i;
+ } else {
+ $swop = $topattern;
+ }
+ Log('msg', "Msg $ref->{msgno}: $tfield $old -> $swop");
+ Log('dbg', "Msg $ref->{msgno}: $tfield $old -> $swop");
+ $ref->{to} = $swop if $tfield eq 'T';
+ $ref->{from} = $swop if $tfield eq 'F';
+ $ref->{origin} = $swop if $tfield eq 'O';
+ $ref->{subject} = $swop if $tfield eq 'S';
+ ++$count;
+ }
+ }
+ return $count;
+}
+
+# import any msgs in the import directory
+# the messages are in BBS format (but may have cluster extentions
+# so SB UK < GB7TLH is legal
+sub import_msgs
+{
+ # are there any to do in this directory?
+ return unless -d $importfn;
+ unless (opendir(DIR, $importfn)) {
+ dbg('msg', "can't open $importfn $!");
+ Log('msg', "can't open $importfn $!");
+ return;
+ }
+
+ my @names = readdir(DIR);
+ closedir(DIR);
+ my $name;
+ foreach $name (@names) {
+ next if $name =~ /^\./;
+ my $fn = "$importfn/$name";
+ next unless -f $fn;
+ unless (open(MSG, $fn)) {
+ dbg('msg', "can't open import file $fn $!");
+ Log('msg', "can't open import file $fn $!");
+ unlink($fn);
+ next;
+ }
+ my @msg = map { chomp; $_ } <MSG>;
+ close(MSG);
+ unlink($fn);
+ my @out = import_one($DXProt::me, \@msg);
+ Log('msg', @out);
+ }
+}
+
+# import one message as a list in bbs (as extended) mode
+# takes a reference to an array containing the whole message
+sub import_one
+{
+ my $dxchan = shift;
+ my $ref = shift;
+ my $private = '1';
+ my $rr = '0';
+ my $notincalls = 1;
+ my $from = $dxchan->call;
+ my $origin = $main::mycall;
+ my @to;
+ my @out;
+
+ # first line;
+ my $line = shift @$ref;
+ my @f = split /\s+/, $line;
+ unless ($f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
+ my $m = "invalid first line in import '$line'";
+ dbg('MSG', $m );
+ return (1, $m);
+ }
+ while (@f) {
+ my $f = uc shift @f;
+ next if $f eq 'SEND';
+
+ # private / noprivate / rr
+ if ($notincalls && ($f eq 'B' || $f eq 'SB' || $f =~ /^NOP/oi)) {
+ $private = '0';
+ } elsif ($notincalls && ($f eq 'P' || $f eq 'SP' || $f =~ /^PRI/oi)) {
+ ;
+ } elsif ($notincalls && ($f eq 'RR')) {
+ $rr = '1';
+ } elsif ($f eq '@' && @f) { # this is bbs syntax, for origin
+ $origin = uc shift @f;
+ } elsif ($f eq '<' && @f) { # this is bbs syntax for from call
+ $from = uc shift @f;
+ } elsif ($f =~ /^\$/) { # this is bbs syntax for a bid
+ next;
+ } elsif ($f =~ /^<\S+/) { # this is bbs syntax for from call
+ ($from) = $f =~ /^<(\S+)$/;
+ } elsif ($f =~ /^\@\S+/) { # this is bbs syntax for origin
+ ($origin) = $f =~ /^\@(\S+)$/;
+ } else {
+
+ # callsign ?
+ $notincalls = 0;
+
+ # is this callsign a distro?
+ my $fn = "$msgdir/distro/$f.pl";
+ if (-e $fn) {
+ my $fh = new IO::File $fn;
+ if ($fh) {
+ local $/ = undef;
+ my $s = <$fh>;
+ $fh->close;
+ my @call;
+ @call = eval $s;
+ return (1, "Error in Distro $f.pl:", $@) if $@;
+ if (@call > 0) {
+ push @f, @call;
+ next;
+ }
+ }
+ }
+
+ if (grep $_ eq $f, @DXMsg::badmsg) {
+ push @out, $dxchan->msg('m3', $f);
+ } else {
+ push @to, $f;
+ }
+ }
+ }
+
+ # subject is the next line
+ my $subject = shift @$ref;
+
+ # strip off trailing lines
+ pop @$ref while (@$ref && ($$ref[-1] eq '' || $$ref[-1] =~ /^\s+$/));
+
+ # strip off /EX or /ABORT
+ return ("aborted") if (@$ref && $$ref[-1] =~ m{^/ABORT$}i);
+ pop @$ref if (@$ref && $$ref[-1] =~ m{^/EX$}i);
+
+ # write all the messages away
+ my $to;
+ foreach $to (@to) {
+ my $systime = $main::systime;
+ my $mycall = $main::mycall;
+ my $mref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
+ $to,
+ $from,
+ $systime,
+ $private,
+ $subject,
+ $origin,
+ '0',
+ $rr);
+ $mref->swop_it($main::mycall);
+ $mref->store($ref);
+ $mref->add_dir();
+ push @out, $dxchan->msg('m11', $mref->{msgno}, $to);
+ #push @out, "msgno $ref->{msgno} sent to $to";
+ my $todxchan = DXChannel->get(uc $to);
+ if ($todxchan) {
+ if ($todxchan->is_user()) {
+ $todxchan->send($todxchan->msg('m9'));
+ }
+ }
+ }
+
+ return @out;
+}
+
no strict;
sub AUTOLOAD
{
projects / spider.git / blobdiff