#
# Copyright (c) 1998 Dirk Koopman G1TLH
#
-# $Id$
+#
#
#
# Notes for implementors:-
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,0));
-$main::build += $VERSION;
-$main::branch += $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
}
# clean the message queue
- clean_old() if $main::systime - $last_clean > 3600 ;
+ if ($main::systime >= $last_clean+3600) {
+ clean_old();
+ $last_clean = $main::systime;
+ }
# actual remove all the 'deleted' messages in one hit.
# this has to be delayed until here otherwise it only does one at
$_->del_msg;
}
- $last_clean = $main::systime;
}
# incoming message
$ref->store($ref->{lines});
} else {
+ # is it too old
+ if ($ref->{t}+$maxage < $main::systime ) {
+ $ref->stop_msg($fromnode);
+ dbg("old message from $ref->{from} -> $ref->{to} " . atime($ref->{t}) . " ignored") if isdbg('msg');
+ Log('msg', "old message from $ref->{from} -> $ref->{to} " . cldatetime($ref->{t}) . " ignored");
+ return;
+ }
+
# does an identical message already exist?
my $m;
for $m (@msg) {
}
# check the message for bad words
+ my @bad;
my @words;
+ @bad = BadWords::check($ref->{subject});
+ push @words, [$ref->{subject}, @bad] if @bad;
for (@{$ref->{lines}}) {
- push @words, BadWords::check($_);
+ @bad = BadWords::check($_);
+ push @words, [$_, @bad] if @bad;
}
- push @words, BadWords::check($ref->{subject});
if (@words) {
- dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $dxchan->call) if isdbg('msg');
- Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
- Log('msg',"subject: $ref->{subject}");
- for (@{$ref->{lines}}) {
- Log('msg', "line: $_");
+ LogDbg('msg',"$ref->{from} swore: $ref->{to} origin: $ref->{origin} via " . $dxchan->call);
+ LogDbg('msg',"subject: $ref->{subject}");
+ for (@words) {
+ my $r = $_;
+ my $line = shift @$r;
+ LogDbg('msg', "line: $line (using words: ". join(',', @$r).")");
}
$ref->stop_msg($fromnode);
return;
my $ref = shift;
my $to = $ref->{to};
my $uref = DXUser->get_current($to);
- my $dxchan = DXChannel->get($to);
+ my $dxchan = DXChannel::get($to);
if (((*Net::SMTP && $email_server) || $email_prog) && $uref && $uref->wantemail) {
my $email = $uref->email;
if ($email) {
$ref->notify;
}
} else {
- Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
+ LogDbg('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
}
delete $loc->{lines};