$self->{msgno} = shift;
my $to = shift;
# $to =~ s/-\d+$//o;
- $self->{to} = uc $to;
+ $self->{to} = $to;
my $from = shift;
$from =~ s/-\d+$//o;
$self->{from} = uc $from;
if ($pcno == 28) { # incoming message
my $t = cltounix($f[5], $f[6]);
my $stream = next_transno($f[2]);
- my $ref = DXMsg->alloc($stream, $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
+ my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
# fill in various forwarding state variables
$ref->{fromnode} = $f[2];
$ref->{count}++;
if ($ref->{count} >= $ref->{linesreq}) {
$self->send(DXProt::pc31($f[2], $f[1], $f[3]));
- dbg('msg', "stream $f[3]: $ref->{linereq} lines received\n");
+ dbg('msg', "stream $f[3]: $ref->{count} lines received\n");
$ref->{count} = 0;
}
}
if ($pcno == 30) { # this is a incoming subject ack
my $ref = $work{$f[2]}; # note no stream at this stage
- delete $work{$f[2]};
- $ref->{stream} = $f[3];
- $ref->{count} = 0;
- $ref->{linesreq} = 5;
- $work{"$f[2]$f[3]"} = $ref; # new ref
- dbg('msg', "incoming subject ack stream $f[3]\n");
- $busy{$f[2]} = $ref; # interlock
- $ref->{lines} = [];
- push @{$ref->{lines}}, ($ref->read_msg_body);
- $ref->send_tranche($self);
+ if ($ref) {
+ delete $work{$f[2]};
+ $ref->{stream} = $f[3];
+ $ref->{count} = 0;
+ $ref->{linesreq} = 5;
+ $work{"$f[2]$f[3]"} = $ref; # new ref
+ dbg('msg', "incoming subject ack stream $f[3]\n");
+ $busy{$f[2]} = $ref; # interlock
+ $ref->{lines} = [];
+ push @{$ref->{lines}}, ($ref->read_msg_body);
+ $ref->send_tranche($self);
+ } else {
+ $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
+ }
last SWITCH;
}
# remove it from the work in progress vector
# stuff it on the msg queue
if ($ref->{lines} && @{$ref->{lines}} > 0) { # ignore messages with 0 lines
- $ref->{msgno} = next_transno("Msgno") if !$ref->{file};
- 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;
- Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
+ if ($ref->{file}) {
+ $ref->store($ref->{lines});
+ } else {
+
+ # does an identical message already exist?
+ my $m;
+ for $m (@msg) {
+ if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from}) {
+ $ref->stop_msg($self);
+ my $msgno = $m->{msgno};
+ dbg('msg', "duplicate message to $msgno\n");
+ Log('msg', "duplicate message to $msgno");
+ 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});
+ $dxchan->send("New mail has arrived for you") if $dxchan;
+ Log('msg', "Message $ref->{msgno} from $ref->{from} received from $f[2] for $ref->{to}");
+ }
}
$ref->stop_msg($self);
queue_msg();
if ($pcno == 40) { # this is a file request
$f[3] =~ s/\\/\//og; # change the slashes
$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");
- last SWITCH if $f[3] =~ /^\/(perl|cmd|local_cmd|src|lib|include|sys|msg)\//; # prevent access to executables
+ last SWITCH if $f[3] =~ /^(perl|cmd|local|src|lib|include|sys|msg|connect)/; # prevent access to executables
# create any directories
my @part = split /\//, $f[3];
last SWITCH;
}
+
+ if ($pcno == 49) { # global delete on subject
+ for (@msg) {
+ if ($_->{subject} eq $f[2]) {
+ $_->del_msg();
+ Log('msg', "Message $_->{msgno} fully deleted by $f[1]");
+ }
+ }
+ }
}
-
- clean_old() if $main::systime - $last_clean > 3600 ; # clean the message queue
+
+ clean_old() if $main::systime - $last_clean > 3600 ; # clean the message queue
}
} else {
confess "can't open file $ref->{to} $!";
}
- # push @{$ref->{gotit}}, $ref->{fromnode} if $ref->{fromnode};
} else { # a normal message
-
+
# attempt to open the message file
my $fn = filename($ref->{msgno});
my $to = $self->{tonode};
my $from = $self->{fromnode};
my $stream = $self->{stream};
- my $i;
+ my $lines = $self->{lines};
+ my ($c, $i);
- for ($i = 0; $i < $self->{linesreq} && $self->{count} < @{$self->{lines}}; $i++, $self->{count}++) {
- push @out, DXProt::pc29($to, $from, $stream, ${$self->{lines}}[$self->{count}]);
-}
-push @out, DXProt::pc32($to, $from, $stream) if $i < $self->{linesreq};
-$dxchan->send(@out);
+ for ($i = 0, $c = $self->{count}; $i < $self->{linesreq} && $c < @$lines; $i++, $c++) {
+ push @out, DXProt::pc29($to, $from, $stream, $lines->[$c]);
+ }
+ $self->{count} = $c;
+
+ push @out, DXProt::pc32($to, $from, $stream) if $i < $self->{linesreq};
+ $dxchan->send(@out);
}
- # find a message to send out and start the ball rolling
- sub queue_msg
+# find a message to send out and start the ball rolling
+sub queue_msg
{
my $sort = shift;
+ my $call = shift;
my @nodelist = DXProt::get_all_ak1a();
my $ref;
my $clref;
$clref = DXCluster->get($ref->{to});
if ($clref && !grep { $clref->{dxchan} == $_ } DXCommandmode::get_all) {
$dxchan = $clref->{dxchan};
- $ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call);
+ $ref->start_msg($dxchan) if $clref && !get_busy($dxchan->call) && $dxchan->state eq 'normal';
}
}
} elsif ($sort == undef) {
next if grep { $_ eq $noderef->call } @{$ref->{gotit}};
# if we are here we have a node that doesn't have this message
- $ref->start_msg($noderef) if !get_busy($noderef->call);
+ $ref->start_msg($noderef) if !get_busy($noderef->call) && $noderef->state eq 'normal';
last;
- }
+ }
}
# if all the available nodes are busy then stop
} else {
# i.e. it ain't and end or abort, therefore store the line
- push @{$loc->{lines}}, $line;
+ push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
}
}
return (1, @out);
projects / spider.git / blobdiff