use IO::File;
use Fcntl;
+eval {
+ require Net::SMTP;
+};
+
use strict;
use vars qw($VERSION $BRANCH);
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
$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
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;
# 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');
$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}");
}
}
}
+sub notify
+{
+ my $ref = shift;
+ my $to = $ref->{to};
+ my $uref = DXUser->get($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
confess "can't open msg file $fn $!";
}
}
+
+ # actual remove all the 'deleted' messages in one hit.
+ # this has to me 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;
+ }
}
# delete a message
{
my $self = shift;
my $dxchan = shift;
+ my $call = '';
+ $call = ' by ' . $dxchan->call if $dxchan;
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;
- my $call = '';
- $call = ' by ' . $dxchan->call if $dxchan;
Log('msg', "Msgno $self->{msgno} expunged$call");
+ dbg("Msgno $self->{msgno} expunged$call") if isdbg('msg');
# remove the file
unlink filename($self->{msgno});
$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
sub clean_old
{
next if $ref->{tonode}; # ignore it if it already being processed
# is it awaiting deletion?
- if ($ref->{delete} && $main::systime >= $ref->{deletetime}) {
- $ref->del_msg;
- next;
- }
next if $ref->{delete};
# firstly, is it private and unread? if so can I find the recipient
# if all the available nodes are busy then stop
last if @nodelist == scalar grep { get_busy($_->call) } @nodelist;
}
+
+
}
# is there a message for me?
$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'));
- }
- }
+ $ref->notify;
}
} else {
Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
Log('msg', "line: $line");
$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;
- my $flag = $ref->read ? '-' : ' ';
- $flag = 'D' if $ref->delete;
- 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;
+ 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;
my @out = import_one($main::me, \@msg, $splitit);
Log('msg', @out);
}
- queue_msg(0);
}
# import one message as a list in bbs (as extended) mode
# first line;
my $line = shift @$ref;
- my @f = split /\b/, $line;
+ my @f = split /([\s\@\$])/, $line;
@f = map {s/\s+//g; length $_ ? $_ : ()} @f;
unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
} 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;
projects / spider.git / blobdiff