package DXMsg;
-@ISA = qw(DXProt DXChannel);
-
use DXUtil;
use DXChannel;
use DXUser;
use DXM;
-use DXCluster;
use DXProtVars;
use DXProtout;
use DXDebug;
use strict;
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
@badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
- $queueinterval $lastq $importfn $minchunk $maxchunk);
+ $queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
%work = (); # outstanding jobs
@msg = (); # messages we have
$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
+
$badmsgfn = "$msgdir/badmsg.pl"; # list of TO address we wont store
$forwardfn = "$msgdir/forward.pl"; # the forwarding table
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
$self->{'read'} = shift;
$self->{rrreq} = shift;
$self->{gotit} = [];
- $self->{lastt} = $main::systime;
+# $self->{lastt} = $main::systime;
$self->{lines} = [];
+ $self->{private} = 1 if $bulltopriv && DXUser->get_current($self->{to});
return $self;
}
if ($main::systime >= $lastq + $queueinterval) {
- # wander down the work queue stopping any messages that have timed out
- for (keys %busy) {
- my $node = $_;
- my $ref = $busy{$_};
- if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
- dbg('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
- Log('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
- $ref->stop_msg($node);
-
- # delay any outgoing messages that fail
- $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
- }
- }
-
# queue some message if the interval timer has gone off
queue_msg(0);
if (exists $busy{$f[2]}) {
my $ref = $busy{$f[2]};
my $tonode = $ref->{tonode};
- dbg('msg', "Busy, stopping msgno: $ref->{msgno} -> $f[2]");
+ dbg("Busy, stopping msgno: $ref->{msgno} -> $f[2]") if isdbg('msg');
$ref->stop_msg($self->call);
}
$ref->{linesreq} = $f[10];
$ref->{stream} = $stream;
$ref->{count} = 0; # no of lines between PC31s
- dbg('msg', "new message from $f[4] to $f[3] '$f[8]' stream $stream\n");
+ dbg("new message from $f[4] to $f[3] '$f[8]' stream $stream\n") if isdbg('msg');
Log('msg', "Incoming message $f[4] to $f[3] '$f[8]'" );
$work{"$f[2]$stream"} = $ref; # store in work
$busy{$f[2]} = $ref; # set interlock
my $uref = DXUser->get_current($ref->{to});
if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
$ref->{private} = 1;
- dbg('msg', "set bull to $ref->{to} to private");
+ dbg("set bull to $ref->{to} to private") if isdbg('msg');
}
last SWITCH;
}
$ref->{count}++;
if ($ref->{count} >= $ref->{linesreq}) {
$self->send(DXProt::pc31($f[2], $f[1], $f[3]));
- dbg('msg', "stream $f[3]: $ref->{count} lines received\n");
+ dbg("stream $f[3]: $ref->{count} lines received\n") if isdbg('msg');
$ref->{count} = 0;
}
$ref->{lastt} = $main::systime;
} else {
- dbg('msg', "PC29 from unknown stream $f[3] from $f[2]" );
+ dbg("PC29 from unknown stream $f[3] from $f[2]") if isdbg('msg');
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
last SWITCH;
$ref->{count} = 0;
$ref->{linesreq} = 5;
$work{"$f[2]$f[3]"} = $ref; # new ref
- dbg('msg', "incoming subject ack stream $f[3]\n");
+ dbg("incoming subject ack stream $f[3]\n") if isdbg('msg');
$busy{$f[2]} = $ref; # interlock
push @{$ref->{lines}}, ($ref->read_msg_body);
$ref->send_tranche($self);
$ref->{lastt} = $main::systime;
} else {
- dbg('msg', "PC30 from unknown stream $f[3] from $f[2]" );
+ dbg("PC30 from unknown stream $f[3] from $f[2]") if isdbg('msg');
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
last SWITCH;
if ($pcno == 31) { # acknowledge a tranche of lines
my $ref = $work{"$f[2]$f[3]"};
if ($ref) {
- dbg('msg', "tranche ack stream $f[3]\n");
+ dbg("tranche ack stream $f[3]\n") if isdbg('msg');
$ref->send_tranche($self);
$ref->{lastt} = $main::systime;
} else {
- dbg('msg', "PC31 from unknown stream $f[3] from $f[2]" );
+ dbg("PC31 from unknown stream $f[3] from $f[2]") if isdbg('msg');
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
last SWITCH;
}
if ($pcno == 32) { # incoming EOM
- dbg('msg', "stream $f[3]: EOM received\n");
+ dbg("stream $f[3]: EOM received\n") if isdbg('msg');
my $ref = $work{"$f[2]$f[3]"};
if ($ref) {
$self->send(DXProt::pc33($f[2], $f[1], $f[3])); # acknowledge it
if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
$ref->stop_msg($self->call);
my $msgno = $m->{msgno};
- dbg('msg', "duplicate message from $ref->{from} -> $ref->{to} to $msgno");
+ dbg("duplicate message from $ref->{from} -> $ref->{to} to $msgno") if isdbg('msg');
Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to $msgno");
return;
}
$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}");
+ dbg("'Bad' message $ref->{to}") if isdbg('msg');
Log('msg', "'Bad' message $ref->{to}");
return;
}
}
$ref->stop_msg($self->call);
} else {
- dbg('msg', "PC32 from unknown stream $f[3] from $f[2]" );
+ dbg("PC32 from unknown stream $f[3] from $f[2]") if isdbg('msg');
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
# queue_msg(0);
}
$ref->stop_msg($self->call);
} else {
- dbg('msg', "PC33 from unknown stream $f[3] from $f[2]" );
+ dbg("PC33 from unknown stream $f[3] from $f[2]") if isdbg('msg');
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
$f[3] =~ s/\.//og; # remove dots
$f[3] =~ s/^\///o; # remove the leading /
$f[3] = lc $f[3]; # to lower case;
- dbg('msg', "incoming file $f[3]\n");
+ dbg("incoming file $f[3]\n") if isdbg('msg');
$f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
# create any directories
$fn .= "/$part";
next if -e $fn;
last SWITCH if !mkdir $fn, 0777;
- dbg('msg', "created directory $fn\n");
+ dbg("created directory $fn\n") if isdbg('msg');
}
my $stream = next_transno($f[2]);
my $ref = DXMsg->alloc($stream, "$main::root/$f[3]", $self->call, time, !$f[4], $f[3], ' ', '0', '0');
}
if ($pcno == 42) { # abort transfer
- dbg('msg', "stream $f[3]: abort received\n");
+ dbg("stream $f[3]: abort received\n") if isdbg('msg');
my $ref = $work{"$f[2]$f[3]"};
if ($ref) {
$ref->stop_msg($self->call);
my $lines = shift;
if ($ref->{file}) { # a file
- dbg('msg', "To be stored in $ref->{to}\n");
+ dbg("To be stored in $ref->{to}\n") if isdbg('msg');
my $fh = new IO::File "$ref->{to}", "w";
if (defined $fh) {
print $fh "$line\n";
}
$fh->close;
- dbg('msg', "file $ref->{to} stored\n");
+ dbg("file $ref->{to} stored\n") if isdbg('msg');
Log('msg', "file $ref->{to} from $ref->{from} stored" );
} else {
confess "can't open file $ref->{to} $!";
# attempt to open the message file
my $fn = filename($ref->{msgno});
- dbg('msg', "To be stored in $fn\n");
+ dbg("To be stored in $fn\n") if isdbg('msg');
# now save the file, overwriting what's there, YES I KNOW OK! (I will change it if it's a problem)
my $fh = new IO::File "$fn", "w";
print $fh "$line\n";
}
$fh->close;
- dbg('msg', "msg $ref->{msgno} stored\n");
+ dbg("msg $ref->{msgno} stored\n") if isdbg('msg');
Log('msg', "msg $ref->{msgno} from $ref->{from} to $ref->{to} stored" );
} else {
confess "can't open msg file $fn $!";
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 = " . scalar @msg . " before delete") if isdbg('msg');
+ @msg = grep { $_ != $self } @msg;
# remove the file
unlink filename($self->{msgno});
- dbg('msg', "deleting $self->{msgno}\n");
+ dbg("deleting $self->{msgno}\n") if isdbg('msg');
+ dbg("\@msg = " . scalar @msg . " after delete") if isdbg('msg');
}
# 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;
- delete $ref->{gotit};
- delete $ref->{list};
unlink filename($ref->{msgno});
- dbg('msg', "deleting old $ref->{msgno}\n");
+ dbg("deleting old $ref->{msgno}\n") if isdbg('msg');
}
}
# remove them all from the active message list
- @msg = grep { ref($_) && !$_->{deleteme} } @msg;
+ @msg = grep { !$_->{deleteme} } @msg;
+ dbg("\@msg = " . scalar @msg . " after delete") if isdbg('msg');
$last_clean = $main::systime;
}
$file = new IO::File "$fn";
if (!$file) {
- dbg('err', "Error reading $fn $!");
+ dbg("Error reading $fn $!");
Log('err', "Error reading $fn $!");
return undef;
}
$size = -s $fn;
$line = <$file>; # first line
if ($size == 0 || !$line) {
- dbg('err', "Empty $fn $!");
+ dbg("Empty $fn $!");
Log('err', "Empty $fn $!");
return undef;
}
chomp $line;
$size -= length $line;
if (! $line =~ /^===/o) {
- dbg('err', "corrupt first line in $fn ($line)");
+ dbg("corrupt first line in $fn ($line)");
Log('err', "corrupt first line in $fn ($line)");
return undef;
}
chomp $line;
$size -= length $line;
if (! $line =~ /^===/o) {
- dbg('err', "corrupt second line in $fn ($line)");
+ dbg("corrupt second line in $fn ($line)");
Log('err', "corrupt second line in $fn ($line)");
return undef;
}
$file = new IO::File;
if (!open($file, $fn)) {
- dbg('err' ,"Error reading $fn $!");
+ dbg("Error reading $fn $!");
Log('err' ,"Error reading $fn $!");
return undef;
}
# bat down the message list looking for one that needs to go off site and whose
# nearest node is not busy.
- dbg('msg', "queue msg ($sort)\n");
+ dbg("queue msg ($sort)\n") if isdbg('msg');
my @nodelist = DXChannel::get_all_nodes;
foreach $ref (@msg) {
- # firstly, is it private and unread? if so can I find the recipient
- # in my cluster node list offsite?
# ignore 'delayed' messages until their waiting time has expired
if (exists $ref->{waitt}) {
delete $ref->{waitt};
}
+ # any time outs?
+ if (exists $ref->{lastt} && $main::systime >= $ref->{lastt} + $timeout) {
+ my $node = $ref->{tonode};
+ dbg("Timeout, stopping msgno: $ref->{msgno} -> $node") if isdbg('msg');
+ Log('msg', "Timeout, stopping msgno: $ref->{msgno} -> $node");
+ $ref->stop_msg($node);
+
+ # delay any outgoing messages that fail
+ $ref->{waitt} = $main::systime + $waittime + rand(120) if $node ne $main::mycall;
+ delete $ref->{lastt};
+ next;
+ }
+
+ # firstly, is it private and unread? if so can I find the recipient
+ # in my cluster node list offsite?
+
# deal with routed private messages
my $dxchan;
if ($ref->{private}) {
next if $ref->{'read'}; # if it is read, it is stuck here
- $clref = DXCluster->get_exact($ref->{to});
- unless ($clref) { # otherwise look for a homenode
- my $uref = DXUser->get_current($ref->{to});
- my $hnode = $uref->homenode if $uref;
- $clref = DXCluster->get_exact($hnode) if $hnode;
- }
- if ($clref && !grep { $clref->dxchan == $_ } DXCommandmode::get_all()) {
- next if $clref->call eq $main::mycall; # i.e. it lives here
+ $clref = Route::get($ref->{to});
+# unless ($clref) { # otherwise look for a homenode
+# my $uref = DXUser->get_current($ref->{to});
+# my $hnode = $uref->homenode if $uref;
+# $clref = Route::Node::get($hnode) if $hnode;
+# }
+ if ($clref) {
$dxchan = $clref->dxchan;
- $ref->start_msg($dxchan) if $dxchan && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
+ if ($dxchan) {
+ if ($dxchan->is_node) {
+ next if $clref->call eq $main::mycall; # i.e. it lives here
+ $ref->start_msg($dxchan) if !get_busy($dxchan->call) && $dxchan->state eq 'normal';
+ }
+ } else {
+ dbg("Route: No dxchan for $ref->{to} " . ref($clref) ) if isdbg('msg');
+ }
}
}
# 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;
}
{
my ($self, $dxchan) = @_;
- dbg('msg', "start msg $self->{msgno}\n");
+ dbg("start msg $self->{msgno}\n") if isdbg('msg');
$self->{linesreq} = 10;
$self->{count} = 0;
$self->{tonode} = $dxchan->call;
my $stream = $self->{stream} if exists $self->{stream};
- dbg('msg', "stop msg $self->{msgno} -> node $node\n");
+ dbg("stop msg $self->{msgno} -> node $node\n") if isdbg('msg');
delete $work{$node};
delete $work{"$node$stream"} if $stream;
$self->workclean;
$msgno++;
seek $fh, 0, 0;
$fh->print("$msgno\n");
- dbg('msg', "msgno $msgno allocated for $name\n");
+ dbg("msgno $msgno allocated for $name\n") if isdbg('msg');
$fh->close;
} else {
confess "can't open $fn $!";
my $ref;
# load various control files
- dbg('err', "load badmsg: " . (load_badmsg() or "Ok"));
- dbg('err', "load forward: " . (load_forward() or "Ok"));
- dbg('err', "load swop: " . (load_swop() or "Ok"));
+ dbg("load badmsg: " . (load_badmsg() or "Ok"));
+ dbg("load forward: " . (load_forward() or "Ok"));
+ dbg("load swop: " . (load_swop() or "Ok"));
# read in the directory
opendir($dir, $msgdir) or confess "can't open $msgdir $!";
$ref = read_msg_header("$msgdir/$_");
unless ($ref) {
- dbg('err', "Deleting $_");
+ dbg("Deleting $_");
Log('err', "Deleting $_");
unlink "$msgdir/$_";
next;
}
# delete any messages to 'badmsg.pl' places
- if (grep $ref->{to} eq $_, @badmsg) {
- dbg('msg', "'Bad' TO address $ref->{to}");
+ if ($ref->dump_it) {
+ dbg("'Bad' TO address $ref->{to}") if isdbg('msg');
Log('msg', "'Bad' TO address $ref->{to}");
$ref->del_msg;
next;
sub dump_it
{
my $ref = shift;
- my $call = shift;
my $i;
for ($i = 0; $i < @badmsg; $i += 3) {
# are there any to do in this directory?
return unless -d $importfn;
unless (opendir(DIR, $importfn)) {
- dbg('msg', "can\'t open $importfn $!");
+ dbg("can\'t open $importfn $!") if isdbg('msg');
Log('msg', "can\'t open $importfn $!");
return;
}
my $fn = "$importfn/$name";
next unless -f $fn;
unless (open(MSG, $fn)) {
- dbg('msg', "can\'t open import file $fn $!");
+ dbg("can\'t open import file $fn $!") if isdbg('msg');
Log('msg', "can\'t open import file $fn $!");
unlink($fn);
next;
my @f = split /\s+/, $line;
unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
my $m = "invalid first line in import '$line'";
- dbg('MSG', $m );
+ dbg($m) if isdbg('msg');
return (1, $m);
}
while (@f) {
projects / spider.git / blobdiff