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;
+
+main::mkver($VERSION = q$Revision$);
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
}
# 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) {
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) {