projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some little detail changes for permissions and crashes in large
[spider.git]
/
perl
/
DXMsg.pm
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 63710e4b8f8a622d42fbd6271a802ff02155d711..5fc16bd0ae569c6ed234374ece65e6d73b6d5001 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;
@@
-50,7
+55,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
+78,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} = [];
@@
-196,16
+201,16
@@
sub process
$ref->store($ref->{lines});
add_dir($ref);
my $dxchan = DXChannel->get($ref->{to});
$ref->store($ref->{lines});
add_dir($ref);
my $dxchan = DXChannel->get($ref->{to});
- $dxchan->
send("New mail has arrived for you"
) if $dxchan;
+ $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
+229,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
+333,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
+489,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
@@
-519,6
+529,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
{
@@
-717,9
+742,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";