projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed A & K to be right way round
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 63710e4b8f8a622d42fbd6271a802ff02155d711..39bd3065ab57e0fd3e4af2550d41107c6877b842 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-5,7
+5,12
@@
# Copyright (c) 1998 Dirk Koopman G1TLH
#
# $Id$
# Copyright (c) 1998 Dirk Koopman G1TLH
#
# $Id$
-#
+#
+#
+# Notes for implementors:-
+#
+# PC28 field 11 is the RR required flag
+# PC28 field 12 is a VIA routing (ie it is a node call)
package DXMsg;
package DXMsg;
@@
-24,7
+29,8
@@
use FileHandle;
use Carp;
use strict;
use Carp;
use strict;
-use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
+use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean
+ @badmsg $badmsgfn $forwardfn @forward);
%work = (); # outstanding jobs
@msg = (); # messages we have
%work = (); # outstanding jobs
@msg = (); # messages we have
@@
-32,6
+38,10
@@
use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
$msgdir = "$main::root/msg"; # directory contain the msgs
$maxage = 30 * 86400; # the maximum age that a message shall live for if not marked
$last_clean = 0; # last time we did a clean
$msgdir = "$main::root/msg"; # directory contain the msgs
$maxage = 30 * 86400; # the maximum age that a message shall live for if not marked
$last_clean = 0; # last time we did a clean
+@forward = (); # msg forward table
+
+$badmsgfn = "$msgdir/badmsg.pl"; # list of TO address we wont store
+$forwardfn = "$msgdir/forward.pl"; # the forwarding table
%valid = (
fromnode => '9,From Node',
%valid = (
fromnode => '9,From Node',
@@
-50,7
+60,7
@@
$last_clean = 0; # last time we did a clean
file => '9,File?,yesno',
gotit => '9,Got it Nodes,parray',
lines => '9,Lines,parray',
file => '9,File?,yesno',
gotit => '9,Got it Nodes,parray',
lines => '9,Lines,parray',
-
read
=> '9,Times read',
+
'read'
=> '9,Times read',
size => '0,Size',
msgno => '0,Msgno',
keep => '0,Keep this?,yesno',
size => '0,Size',
msgno => '0,Msgno',
keep => '0,Keep this?,yesno',
@@
-73,7
+83,7
@@
sub alloc
$self->{private} = shift;
$self->{subject} = shift;
$self->{origin} = shift;
$self->{private} = shift;
$self->{subject} = shift;
$self->{origin} = shift;
- $self->{
read
} = shift;
+ $self->{
'read'
} = shift;
$self->{rrreq} = shift;
$self->{gotit} = [];
$self->{rrreq} = shift;
$self->{gotit} = [];
@@
-96,7
+106,7
@@
sub workclean
sub process
{
my ($self, $line) = @_;
sub process
{
my ($self, $line) = @_;
- my @f = split /
[\^\~]
/, $line;
+ my @f = split /
\^
/, $line;
my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
SWITCH: {
my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
SWITCH: {
@@
-190,22
+200,30
@@
sub process
return;
}
}
return;
}
}
+
+ # look for 'bad' to addresses
+ if (grep $ref->{to} eq $_, @badmsg) {
+ $ref->stop_msg($self);
+ dbg('msg', "'Bad' TO address $ref->{to}");
+ Log('msg', "'Bad' TO address $ref->{to}");
+ return;
+ }
$ref->{msgno} = next_transno("Msgno");
push @{$ref->{gotit}}, $f[2]; # mark this up as being received
$ref->store($ref->{lines});
add_dir($ref);
my $dxchan = DXChannel->get($ref->{to});
$ref->{msgno} = next_transno("Msgno");
push @{$ref->{gotit}}, $f[2]; # mark this up as being received
$ref->store($ref->{lines});
add_dir($ref);
my $dxchan = DXChannel->get($ref->{to});
- $dxchan->send(
"New mail has arrived for you"
) if $dxchan;
+ $dxchan->send(
$dxchan->msg('msgnew')
) if $dxchan;
Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
}
}
$ref->stop_msg($self);
Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
}
}
$ref->stop_msg($self);
- queue_msg();
+ queue_msg(
0
);
} else {
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
} else {
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
- queue_msg();
+ queue_msg(
0
);
last SWITCH;
}
last SWITCH;
}
@@
-224,7
+242,7
@@
sub process
} else {
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
} else {
$self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
}
- queue_msg();
+ queue_msg(
0
);
last SWITCH;
}
last SWITCH;
}
@@
-328,7
+346,7
@@
sub store
if (defined $fh) {
my $rr = $ref->{rrreq} ? '1' : '0';
my $priv = $ref->{private} ? '1': '0';
if (defined $fh) {
my $rr = $ref->{rrreq} ? '1' : '0';
my $priv = $ref->{private} ? '1': '0';
- print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{
read
}^$rr\n";
+ print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{
'read'
}^$rr\n";
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
@@
-484,20
+502,25
@@
sub queue_msg
# bat down the message list looking for one that needs to go off site and whose
# nearest node is not busy.
# 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");
foreach $ref (@msg) {
# firstly, is it private and unread? if so can I find the recipient
# in my cluster node list offsite?
if ($ref->{private}) {
dbg('msg', "queue msg ($sort)\n");
foreach $ref (@msg) {
# firstly, is it private and unread? if so can I find the recipient
# in my cluster node list offsite?
if ($ref->{private}) {
- if ($ref->{
read
} == 0) {
+ if ($ref->{
'read'
} == 0) {
$clref = DXCluster->get_exact($ref->{to});
$clref = DXCluster->get_exact($ref->{to});
+ unless ($clref) { # otherwise look for a homenode
+ my $uref = DXUser->get($ref->{to});
+ my $hnode = $uref->homenode if $uref;
+ $clref = DXCluster->get_exact($hnode) if $hnode;
+ }
if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
$dxchan = $clref->{dxchan};
if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
$dxchan = $clref->{dxchan};
- $ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
+ $ref->start_msg($dxchan) if $
dxchan && $
clref && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
}
}
}
}
- } elsif (
$sort == undef
) {
+ } elsif (
!$sort
) {
# otherwise we are dealing with a bulletin, compare the gotit list with
# the nodelist up above, if there are sites that haven't got it yet
# then start sending it - what happens when we get loops is anyone's
# otherwise we are dealing with a bulletin, compare the gotit list with
# the nodelist up above, if there are sites that haven't got it yet
# then start sending it - what happens when we get loops is anyone's
@@
-507,6
+530,7
@@
sub queue_msg
next if $noderef->call eq $main::mycall;
next if $noderef->isolate; # maybe add code for stuff originated here?
next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
next if $noderef->call eq $main::mycall;
next if $noderef->isolate; # maybe add code for stuff originated here?
next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
+ next if DXUser->get( ${$ref->{gotit}}[0] )->isolate; # is the origin isolated?
# if we are here we have a node that doesn't have this message
$ref->start_msg($noderef) if !get_busy($noderef->call) && $noderef->state eq 'normal';
# if we are here we have a node that doesn't have this message
$ref->start_msg($noderef) if !get_busy($noderef->call) && $noderef->state eq 'normal';
@@
-519,6
+543,21
@@
sub queue_msg
}
}
}
}
+# is there a message for me?
+sub for_me
+{
+ my $call = uc shift;
+ my $ref;
+
+ foreach $ref (@msg) {
+ # is it for me, private and unread?
+ if ($ref->{to} eq $call && $ref->{private}) {
+ return 1 if !$ref->{'read'};
+ }
+ }
+ return 0;
+}
+
# start the message off on its travels with a PC28
sub start_msg
{
# start the message off on its travels with a PC28
sub start_msg
{
@@
-596,22
+635,35
@@
sub init
my $dir = new FileHandle;
my @dir;
my $ref;
my $dir = new FileHandle;
my @dir;
my $ref;
-
+
+ # load various control files
+ my @in = load_badmsg();
+ print "@in\n" if @in;
+ @in = load_forward();
+ print "@in\n" if @in;
+
# read in the directory
opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@dir = readdir($dir);
closedir($dir);
# read in the directory
opendir($dir, $msgdir) or confess "can't open $msgdir $!";
@dir = readdir($dir);
closedir($dir);
-
+
+ @msg = ();
for (sort @dir) {
for (sort @dir) {
- next if /^\./o;
- next if ! /^m\d+/o;
+ next unless /^m\d+$/o;
$ref = read_msg_header("$msgdir/$_");
$ref = read_msg_header("$msgdir/$_");
- next
if !
$ref;
+ next
unless
$ref;
+ # delete any messages to 'badmsg.pl' places
+ if (grep $ref->{to} eq $_, @badmsg) {
+ dbg('msg', "'Bad' TO address $ref->{to}");
+ Log('msg', "'Bad' TO address $ref->{to}");
+ $ref->del_msg;
+ next;
+ }
+
# add the message to the available queue
add_dir($ref);
# add the message to the available queue
add_dir($ref);
-
}
}
}
}
@@
-717,9
+769,9
@@
sub do_send_stuff
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
- $self->state('prompt');
$self->func(undef);
$self->func(undef);
- DXMsg::queue_msg();
+ DXMsg::queue_msg(0);
+ $self->state('prompt');
} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
#push @out, $self->msg('sendabort');
push @out, "aborted";
} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
#push @out, $self->msg('sendabort');
push @out, "aborted";
@@
-746,6
+798,24
@@
sub dir
$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
}
$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
}
+# load the forward table
+sub load_forward
+{
+ my @out;
+ do "$forwardfn" if -e "$forwardfn";
+ push @out, $@ if $@;
+ return @out;
+}
+
+# load the bad message table
+sub load_badmsg
+{
+ my @out;
+ do "$badmsgfn" if -e "$badmsgfn";
+ push @out, $@ if $@;
+ return @out;
+}
+
no strict;
sub AUTOLOAD
{
no strict;
sub AUTOLOAD
{