use IO::File;
use Fcntl;
+eval {
+ require Net::SMTP;
+};
+
use strict;
use vars qw($VERSION $BRANCH);
$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0));
$main::build += $VERSION;
$main::branch += $BRANCH;
-use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
+use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
+ $email_server $email_prog $email_from
$queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
%work = (); # outstanding jobs
$minchunk = 4800; # minimum chunk size for a split message
$maxchunk = 6000; # maximum chunk size
$bulltopriv = 1; # convert msgs with callsigns to private if they are bulls
-
+$residencetime = 2*86400; # keep deleted messages for this amount of time
+$email_server = undef; # DNS address of smtp server if 'smtp'
+$email_prog = undef; # program name + args for sending mail
+$email_from = undef; # the from address the email will appear to be from
$badmsgfn = "$msgdir/badmsg.pl"; # list of TO address we wont store
$forwardfn = "$msgdir/forward.pl"; # the forwarding table
keep => '0,Keep this?,yesno',
lastt => '5,Last processed,cldatetime',
waitt => '5,Wait until,cldatetime',
+ delete => '5,Awaiting Delete,yesno',
+ deletetime => '5,Deletion Time,cldatetime',
);
+# fix up the default sendmail if available
+for (qw(/usr/sbin/sendmail /usr/lib/sendmail /usr/sbin/sendmail)) {
+ if (-e $_) {
+ $email_prog = $_;
+ last;
+ }
+}
+
# allocate a new object
# called fromnode, tonode, from, to, datetime, private?, subject, nolinesper
sub alloc
# $to =~ s/-\d+$//o;
$self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
my $from = shift;
- $from =~ s/-\d+$//o;
$self->{from} = uc $from;
$self->{t} = shift;
$self->{private} = shift;
$self->{origin} = shift;
$self->{'read'} = shift;
$self->{rrreq} = shift;
+ $self->{delete} = shift;
+ $self->{deletetime} = shift || $self->{delete} ? 0 : ($self->{t} + $maxage);
$self->{gotit} = [];
# $self->{lastt} = $main::systime;
$self->{lines} = [];
return $self;
}
-sub workclean
-{
- my $ref = shift;
- delete $ref->{lines};
- delete $ref->{linesreq};
- delete $ref->{tonode};
- delete $ref->{fromnode};
- delete $ref->{stream};
- delete $ref->{file};
- delete $ref->{count};
- delete $ref->{lastt} if exists $ref->{lastt};
- delete $ref->{waitt} if exists $ref->{waitt};
-}
sub process
{
# clean the message queue
clean_old() if $main::systime - $last_clean > 3600 ;
+
+ # actual remove all the 'deleted' messages in one hit.
+ # this has to be delayed until here otherwise it only does one at
+ # a time because @msg is rewritten everytime del_msg is called.
+ my @del = grep {!$_->{tonode} && $_->{delete} && $_->{deletetime} < $main::systime} @msg;
+ for (@del) {
+ $_->del_msg;
+ }
+
+ $last_clean = $main::systime;
return;
}
my @f = split /\^/, $line;
my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
my ($tonode, $fromnode) = @f[1, 2];
- my $stream = $f[3] if $pcno > 29 && $pcno <= 33;
+ my $stream = $f[3] if ($pcno >= 29 && $pcno <= 33) || $pcno == 42;
SWITCH: {
if ($pcno == 28) { # incoming message
# and cancel them this should both resolve timed out incoming messages
# and crossing of message between nodes, incoming messages have priority
- if (exists $busy{$fromnode}) {
- my $ref = $busy{$fromnode};
+ my $ref = get_busy($fromnode);
+ if ($ref) {
my $otonode = $ref->{tonode} || "unknown";
dbg("Busy, stopping msgno: $ref->{msgno} $fromnode->$otonode") if isdbg('msg');
$ref->stop_msg($fromnode);
my $t = cltounix($f[5], $f[6]);
$stream = next_transno($fromnode);
- my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $origin, '0', $f[11]);
+ $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $origin, '0', $f[11]);
# fill in various forwarding state variables
$ref->{fromnode} = $fromnode;
$ref->{count} = 0; # no of lines between PC31s
dbg("new message from $f[4] to $f[3] '$f[8]' stream $fromnode/$stream\n") if isdbg('msg');
Log('msg', "Incoming message $f[4] to $f[3] '$f[8]' origin: $origin" );
- $work{"$fromnode,$stream"} = $ref; # store in work
- $busy{$fromnode} = $ref; # set interlock
+ set_fwq($fromnode, $stream, $ref); # store in work
+ set_busy($fromnode, $ref); # set interlock
$self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack
$ref->{lastt} = $main::systime;
}
if ($pcno == 29) { # incoming text
- my $ref = $work{"$fromnode,$stream"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
$f[4] =~ s/\%5E/^/g;
- push @{$ref->{lines}}, $f[4];
+ if (@{$ref->{lines}}) {
+ push @{$ref->{lines}}, $f[4];
+ } else {
+ # temporarily store any R: lines so that we end up with
+ # only the first and last ones stored.
+ if ($f[4] =~ m|^R:\d{6}/\d{4}|) {
+ push @{$ref->{tempr}}, $f[4];
+ } else {
+ if (exists $ref->{tempr}) {
+ push @{$ref->{lines}}, shift @{$ref->{tempr}};
+ push @{$ref->{lines}}, pop @{$ref->{tempr}} if @{$ref->{tempr}};
+ delete $ref->{tempr};
+ }
+ push @{$ref->{lines}}, $f[4];
+ }
+ }
$ref->{count}++;
if ($ref->{count} >= $ref->{linesreq}) {
$self->send(DXProt::pc31($fromnode, $tonode, $stream));
}
if ($pcno == 30) { # this is a incoming subject ack
- my $ref = $work{"$fromnode,"}; # note no stream at this stage
+ my $ref = get_fwq($fromnode); # note no stream at this stage
if ($ref) {
- delete $work{"$fromnode,"};
+ del_fwq($fromnode);
$ref->{stream} = $stream;
$ref->{count} = 0;
$ref->{linesreq} = 5;
- $work{"$fromnode,$stream"} = $ref; # new ref
+ set_fwq($fromnode, $stream, $ref); # new ref
+ set_busy($fromnode, $ref); # interlock
dbg("incoming subject ack stream $stream\n") if isdbg('msg');
- $busy{$fromnode} = $ref; # interlock
- push @{$ref->{lines}}, ($ref->read_msg_body);
+ $ref->{lines} = [ $ref->read_msg_body ];
$ref->send_tranche($self);
$ref->{lastt} = $main::systime;
} else {
}
if ($pcno == 31) { # acknowledge a tranche of lines
- my $ref = $work{"$fromnode,$stream"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
dbg("tranche ack stream $stream\n") if isdbg('msg');
$ref->send_tranche($self);
if ($pcno == 32) { # incoming EOM
dbg("stream $stream: EOM received\n") if isdbg('msg');
- my $ref = $work{"$fromnode,$stream"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
$self->send(DXProt::pc33($fromnode, $tonode, $stream)); # acknowledge it
# does an identical message already exist?
my $m;
for $m (@msg) {
- if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
+ if (substr($ref->{subject},0,28) eq substr($m->{subject},0,28) && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
$ref->stop_msg($fromnode);
my $msgno = $m->{msgno};
dbg("duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno") if isdbg('msg');
}
push @words, BadWords::check($ref->{subject});
if (@words) {
- dbg("message with badwords '@words' $ref->{from} -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
- Log('msg',"message with badwords '@words' $ref->{from} -> $ref->{to} origin: $ref->{origin} via " . $self->call);
+ dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
+ Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $self->call);
Log('msg',"subject: $ref->{subject}");
for (@{$ref->{lines}}) {
Log('msg', "line: $_");
$ref->{msgno} = next_transno("Msgno");
push @{$ref->{gotit}}, $fromnode; # mark this up as being received
$ref->store($ref->{lines});
+ $ref->notify;
add_dir($ref);
- my $dxchan = DXChannel->get($ref->{to});
- $dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
Log('msg', "Message $ref->{msgno} from $ref->{from} received from $fromnode for $ref->{to}");
}
}
}
if ($pcno == 33) { # acknowledge the end of message
- my $ref = $work{"$fromnode,$stream"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
if ($ref->{private}) { # remove it if it private and gone off site#
Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode and deleted");
- $ref->del_msg;
+ $ref->mark_delete;
} else {
Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode");
push @{$ref->{gotit}}, $fromnode; # mark this up as being received
$ref->{count} = 0; # no of lines between PC31s
$ref->{file} = 1;
$ref->{lastt} = $main::systime;
- $work{"$fromnode,$stream"} = $ref; # store in work
+ set_fwq($fromnode, $stream, $ref); # store in work
$self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack
last SWITCH;
if ($pcno == 42) { # abort transfer
dbg("stream $stream: abort received\n") if isdbg('msg');
- my $ref = $work{"$fromnode,$stream"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
$ref->stop_msg($fromnode);
$ref = undef;
if ($pcno == 49) { # global delete on subject
for (@msg) {
if ($_->{from} eq $f[1] && $_->{subject} eq $f[2]) {
- $_->del_msg();
+ $_->mark_delete;
Log('msg', "Message $_->{msgno} from $_->{from} ($_->{subject}) fully deleted");
DXChannel::broadcast_nodes($line, $self);
}
}
+sub notify
+{
+ my $ref = shift;
+ my $to = $ref->{to};
+ my $uref = DXUser->get_current($to);
+ my $dxchan = DXChannel->get($to);
+ if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
+ my $email = $uref->email;
+ if ($email) {
+ my @rcpt = ref $email ? @{$email} : $email;
+ my $fromaddr = $email_from || $main::myemail;
+ my @headers = ("To: $ref->{to}",
+ "From: $fromaddr",
+ "Subject: [DXSpider: $ref->{from}] $ref->{subject}",
+ "X-DXSpider-To: $ref->{to}",
+ "X-DXSpider-From: $ref->{from}\@$ref->{origin}",
+ "X-DXSpider-Gateway: $main::mycall"
+ );
+ my @data = ("Msgno: $ref->{msgno} To: $to From: $ref->{from}\@$ref->{origin} Gateway: $main::mycall",
+ "",
+ $ref->read_msg_body
+ );
+ my $msg;
+ undef $!;
+ if (*Net::SMTP && $email_server) {
+ $msg = Net::SMTP->new($email_server);
+ if ($msg) {
+ $msg->mail($fromaddr);
+ $msg->to(@rcpt);
+ $msg->data(map {"$_\n"} @headers, '', @data);
+ $msg->quit;
+ }
+ } elsif ($email_prog) {
+ $msg = new IO::File "|$email_prog " . join(' ', @rcpt);
+ if ($msg) {
+ print $msg map {"$_\r\n"} @headers, '', @data, '.';
+ $msg->close;
+ }
+ }
+ dbg("email forwarding error $!") if isdbg('msg') && !$msg && defined $!;
+ }
+ }
+ $dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
+}
+
# store a message away on disc or whatever
#
# NOTE the second arg is a REFERENCE not a list
if (defined $fh) {
my $rr = $ref->{rrreq} ? '1' : '0';
my $priv = $ref->{private} ? '1': '0';
- print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr\n";
+ my $del = $ref->{delete} ? '1' : '0';
+ my $delt = $ref->{deletetime} || $ref->{t} + $maxage;
+ print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt\n";
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
foreach $line (@{$lines}) {
+ $line =~ s/[\x00-\x08\x0a-\x1f\x80-\x9f]/./g;
$ref->{size} += (length $line) + 1;
print $fh "$line\n";
}
confess "can't open msg file $fn $!";
}
}
+
}
# delete a message
sub del_msg
{
my $self = shift;
+ my $dxchan = shift;
+ my $call = '';
+ $call = ' by ' . $dxchan->call if $dxchan;
- # remove it from the active message list
- dbg("\@msg = " . scalar @msg . " before delete") if isdbg('msg');
- @msg = grep { $_ != $self } @msg;
+ if ($self->{tonode}) {
+ $self->{delete}++;
+ $self->{deletetime} = 0;
+ dbg("Msgno $self->{msgno} but marked as expunged$call") if isdbg('msg');
+ } else {
+ # remove it from the active message list
+ @msg = grep { $_ != $self } @msg;
+
+ Log('msg', "Msgno $self->{msgno} expunged$call");
+ dbg("Msgno $self->{msgno} expunged$call") if isdbg('msg');
+
+ # remove the file
+ unlink filename($self->{msgno});
+ }
+}
+
+sub mark_delete
+{
+ my $ref = shift;
+ my $t = shift;
+ $t = $main::systime + $residencetime unless defined $t;
- # remove the file
- unlink filename($self->{msgno});
- dbg("deleting $self->{msgno}\n") if isdbg('msg');
- dbg("\@msg = " . scalar @msg . " after delete") if isdbg('msg');
+ $ref->{delete}++;
+ $ref->{deletetime} = $t;
+ $ref->store( [$ref->read_msg_body] );
+}
+
+sub unmark_delete
+{
+ my $ref = shift;
+ my $t = shift;
+ delete $ref->{delete};
+ delete $ref->{deletetime};
}
# clean out old messages from the message queue
my $ref;
# mark old messages for deletion
- dbg("\@msg = " . scalar @msg . " before delete") if isdbg('msg');
foreach $ref (@msg) {
- if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
- $ref->{deleteme} = 1;
- unlink filename($ref->{msgno});
- dbg("deleting old $ref->{msgno}\n") if isdbg('msg');
+ if (ref($ref) && !$ref->{keep} && $ref->{deletetime} < $main::systime) {
+
+ # this is for IMMEDIATE destruction
+ $ref->{delete}++;
+ $ref->{deletetime} = 0;
}
}
-
- # remove them all from the active message list
- @msg = grep { !$_->{deleteme} } @msg;
- dbg("\@msg = " . scalar @msg . " after delete") if isdbg('msg');
- $last_clean = $main::systime;
}
# read in a message header
if (!open($file, $fn)) {
dbg("Error reading $fn $!");
Log('err' ,"Error reading $fn $!");
- return undef;
+ return ();
}
@out = map {chomp; $_} <$file>;
close($file);
$ref->stop_msg($node);
# delay any outgoing messages that fail
- $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+ $ref->{waitt} = $main::systime + $waittime + int rand(120) if $node ne $main::mycall;
delete $ref->{lastt};
next;
}
+ # is it being sent anywhere currently?
+ next if $ref->{tonode}; # ignore it if it already being processed
+
+ # is it awaiting deletion?
+ next if $ref->{delete};
+
# firstly, is it private and unread? if so can I find the recipient
# in my cluster node list offsite?
my $dxchan;
if ($ref->{private}) {
next if $ref->{'read'}; # if it is read, it is stuck here
- next if $ref->{tonode}; # ignore it if it already being processed
$clref = Route::get($ref->{to});
if ($clref) {
$dxchan = $clref->dxchan;
# if all the available nodes are busy then stop
last if @nodelist == scalar grep { get_busy($_->call) } @nodelist;
}
+
+
}
# is there a message for me?
{
my $call = uc shift;
my $ref;
+ my $count;
foreach $ref (@msg) {
# is it for me, private and unread?
if ($ref->{to} eq $call && $ref->{private}) {
- return 1 if !$ref->{'read'};
+ $count++ unless $ref->{'read'} || $ref->{delete};
}
}
- return 0;
+ return $count;
}
# start the message off on its travels with a PC28
$self->{count} = 0;
$self->{tonode} = $dxchan->call;
$self->{fromnode} = $main::mycall;
- $busy{$self->{tonode}} = $self;
- $work{"$self->{tonode},"} = $self;
+ set_busy($self->{tonode}, $self);
+ set_fwq($self->{tonode}, undef, $self);
$self->{lastt} = $main::systime;
my ($fromnode, $origin);
$fromnode = $self->{fromnode};
return $busy{$call};
}
-# get the busy queue
+sub set_busy
+{
+ my $call = shift;
+ return $busy{$call} = shift;
+}
+
+sub del_busy
+{
+ my $call = shift;
+ return delete $busy{$call};
+}
+
+# get the whole busy queue
sub get_all_busy
{
return keys %busy;
{
my $self = shift;
my $node = shift;
- my $stream = $self->{stream} if exists $self->{stream};
+ my $stream = $self->{stream};
dbg("stop msg $self->{msgno} -> node $node\n") if isdbg('msg');
- delete $work{"$node,"};
- delete $work{"$node,$stream"} if $stream;
+ del_fwq($node, $stream);
$self->workclean;
- delete $busy{$node};
+ del_busy($node);
+}
+
+sub workclean
+{
+ my $ref = shift;
+ delete $ref->{lines};
+ delete $ref->{linesreq};
+ delete $ref->{tonode};
+ delete $ref->{fromnode};
+ delete $ref->{stream};
+ delete $ref->{file};
+ delete $ref->{count};
+ delete $ref->{tempr};
+ delete $ref->{lastt};
+ delete $ref->{waitt};
}
# get a new transaction number from the file specified
if (my @ans = BadWords::check($line)) {
$self->{badcount} += @ans;
Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} in msg");
- return ($self->msg('e17', @ans), $self->msg('m1'));
+ $loc->{reject}++;
}
$loc->{subject} = $line;
$loc->{lines} = [];
my $loc = $self->{loc};
if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") {
my $to;
-
- 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'));
- }
+ unless ($loc->{reject}) {
+ 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";
+ $ref->notify;
}
+ } else {
+ Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
}
-
+
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
delete $self->{loc};
$self->func(undef);
$self->state('prompt');
+ } elsif ($line =~ m|^/+\w+|) {
+ # this is a command that you want display for your own reference
+ # or if it has TWO slashes is a command
+ $line =~ s|^/||;
+ my $store = $line =~ s|^/+||;
+ my @in = $self->run_cmd($line);
+ push @out, @in;
+ if ($store) {
+ foreach my $l (@in) {
+ if (my @ans = BadWords::check($l)) {
+ $self->{badcount} += @ans;
+ Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg") unless $loc->{reject};
+ Log('msg', "line: $l");
+ $loc->{reject}++;
+ }
+ push @{$loc->{lines}}, length($l) > 0 ? $l : " ";
+ }
+ }
} else {
if (my @ans = BadWords::check($line)) {
$self->{badcount} += @ans;
- Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg");
+ Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg") unless $loc->{reject};
Log('msg', "line: $line");
- return ($self->msg('e17', @ans));
+ $loc->{reject}++;
+ }
+
+ if ($loc->{lines} && @{$loc->{lines}}) {
+ push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+ } else {
+ # temporarily store any R: lines so that we end up with
+ # only the first and last ones stored.
+ if ($line =~ m|^R:\d{6}/\d{4}|) {
+ push @{$loc->{tempr}}, $line;
+ } else {
+ if (exists $loc->{tempr}) {
+ push @{$loc->{lines}}, shift @{$loc->{tempr}};
+ push @{$loc->{lines}}, pop @{$loc->{tempr}} if @{$loc->{tempr}};
+ delete $loc->{tempr};
+ }
+ push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
+ }
}
# i.e. it ain't and end or abort, therefore store the line
- push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
}
}
return @out;
sub dir
{
my $ref = shift;
- return sprintf "%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s",
- $ref->msgno, $ref->read ? '-' : ' ', $ref->private ? 'p' : ' ', $ref->size,
- $ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
+ my $flag = $ref->{private} && $ref->{read} ? '-' : ' ';
+ if ($ref->{delete}) {
+ $flag = $ref->{deletetime} > $main::systime ? 'D' : 'E';
+ }
+ return sprintf("%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s",
+ $ref->{msgno}, $flag, $ref->{private} ? 'p' : ' ',
+ $ref->{size}, $ref->{to}, $ref->{from}, cldate($ref->{t}),
+ ztime($ref->{t}), $ref->{subject});
}
# load the forward table
return 0;
}
+#
+# look down the forward table to see whether this is a valid bull
+# or not (ie it will forward somewhere even if it is only here)
+#
+sub valid_bull_addr
+{
+ my $call = shift;
+ my $i;
+
+ unless (@forward) {
+ return 1 if $call =~ /^ALL/;
+ return 1 if $call =~ /^DX/;
+ return 0;
+ }
+
+ for ($i = 0; $i < @forward; $i += 5) {
+ my ($sort, $field, $pattern, $action, $bbs) = @forward[$i..($i+4)];
+ if ($field eq 'T') {
+ if (!$pattern || $call =~ m{$pattern}i) {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
sub dump_it
{
my $ref = shift;
# first line;
my $line = shift @$ref;
- my @f = split /\s+/, $line;
+ my @f = split /([\s\@\$])/, $line;
+ @f = map {s/\s+//g; length $_ ? $_ : ()} @f;
+
unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
my $m = "invalid first line in import '$line'";
dbg($m) if isdbg('msg');
;
} elsif ($notincalls && ($f eq 'RR')) {
$rr = '1';
- } elsif ($f eq '@' && @f) { # this is bbs syntax, for origin
- $origin = uc shift @f;
+ } elsif (($f =~ /^[\@\.\#\$]$/ || $f eq '.#') && @f) { # this is bbs syntax, for AT
+ 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+)$/;
+ } elsif ($f =~ /^<(\S+)/) { # this is bbs syntax for from call
+ $from = $1;
+ } elsif ($f =~ /^\$\S+/) { # this is bbs syntax for bid
+ ;
} else {
# callsign ?
} else {
push @chunk, $ref;
}
-
+
+ # does an identical message already exist?
+ my $m;
+ for $m (@msg) {
+ if (substr($subject,0,28) eq substr($m->{subject},0,28) && $from eq $m->{from} && grep $m->{to} eq $_, @to) {
+ my $msgno = $m->{msgno};
+ dbg("duplicate message from $from -> $m->{to} to msg: $msgno") if isdbg('msg');
+ Log('msg', "duplicate message from $from -> $m->{to} to msg: $msgno");
+ return;
+ }
+ }
+
# write all the messages away
my $i;
for ( $i = 0; $i < @chunk; $i++) {
$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'));
- }
- }
+ $mref->notify;
}
}
return @out;
}
-no strict;
+#no strict;
sub AUTOLOAD
{
my $self = shift;
+ no strict;
my $name = $AUTOLOAD;
return if $name =~ /::DESTROY$/;
- $name =~ s/.*:://o;
+ $name =~ s/^.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
# this clever line of code creates a subroutine which takes over from autoload
# from OO Perl - Conway
- *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
- @_ ? $self->{$name} = shift : $self->{$name} ;
+ *$AUTOLOAD = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}};
+ &$AUTOLOAD($self, @_);
+# *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
+# @_ ? $self->{$name} = shift : $self->{$name} ;
}
1;