package DXMsg;
-@ISA = qw(DXProt DXChannel);
-
use DXUtil;
use DXChannel;
use DXUser;
waitt => '5,Wait until,cldatetime',
);
-sub DESTROY
-{
- my $self = shift;
- undef $self->{lines};
- undef $self->{gotit};
-}
-
# allocate a new object
# called fromnode, tonode, from, to, datetime, private?, subject, nolinesper
sub alloc
# look to see whether this is a non private message sent to a known callsign
my $uref = DXUser->get_current($ref->{to});
- if (iscallsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
+ if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
$ref->{private} = 1;
dbg('msg', "set bull to $ref->{to} to private");
}
$ref->swop_it($self->call);
# look for 'bad' to addresses
-# if (grep $ref->{to} eq $_, @badmsg) {
- if ($ref->dump_it($self->call)) {
+ if ($ref->dump_it) {
$ref->stop_msg($self->call);
dbg('msg', "'Bad' message $ref->{to}");
Log('msg', "'Bad' message $ref->{to}");
my $self = shift;
# remove it from the active message list
- @msg = grep { ref($_) && $_ != $self } @msg;
-
- # belt and braces (one day I will ask someone if this is REALLY necessary)
- delete $self->{gotit};
- delete $self->{list};
+ dbg('msg', "\@msg = " . scalar @msg . " before delete");
+ @msg = grep { $_ != $self } @msg;
# remove the file
unlink filename($self->{msgno});
dbg('msg', "deleting $self->{msgno}\n");
+ dbg('msg', "\@msg = " . scalar @msg . " after delete");
}
# clean out old messages from the message queue
my $ref;
# mark old messages for deletion
+ dbg('msg', "\@msg = " . scalar @msg . " before delete");
foreach $ref (@msg) {
if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
$ref->{deleteme} = 1;
- delete $ref->{gotit};
- delete $ref->{list};
unlink filename($ref->{msgno});
dbg('msg', "deleting old $ref->{msgno}\n");
}
}
# remove them all from the active message list
- @msg = grep { ref($_) && !$_->{deleteme} } @msg;
+ @msg = grep { !$_->{deleteme} } @msg;
+ dbg('msg', "\@msg = " . scalar @msg . " after delete");
$last_clean = $main::systime;
}
# then start sending it - what happens when we get loops is anyone's
# guess, use (to, from, time, subject) tuple?
foreach $dxchan (@nodelist) {
- next if $dxchan->call eq $main::mycall;
- next if grep { $_ eq $dxchan->call } @{$ref->{gotit}};
- next unless $ref->forward_it($dxchan->call); # check the forwarding file
+ my $call = $dxchan->call;
+ next unless $call;
+ next if $call eq $main::mycall;
+ next if ref $ref->{gotit} && grep $_ eq $call, @{$ref->{gotit}};
+ next unless $ref->forward_it($call); # check the forwarding file
# if we are here we have a node that doesn't have this message
- $ref->start_msg($dxchan) if !get_busy($dxchan->call) && $dxchan->state eq 'normal';
+ $ref->start_msg($dxchan) if !get_busy($call) && $dxchan->state eq 'normal';
last;
}
}
# delete any messages to 'badmsg.pl' places
- if (grep $ref->{to} eq $_, @badmsg) {
+ if ($ref->dump_it) {
dbg('msg', "'Bad' TO address $ref->{to}");
Log('msg', "'Bad' TO address $ref->{to}");
$ref->del_msg;
sub dump_it
{
my $ref = shift;
- my $call = shift;
my $i;
for ($i = 0; $i < @badmsg; $i += 3) {