# 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;
-@ISA = qw(DXProt DXChannel);
-
use DXUtil;
use DXChannel;
use DXUser;
use DXM;
-use DXCluster;
use DXProtVars;
use DXProtout;
use DXDebug;
use DXLog;
-use FileHandle;
-use Carp;
+use IO::File;
+use Fcntl;
use strict;
-use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean);
+
+use vars qw($VERSION $BRANCH);
+$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
+$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0;
+$main::build += $VERSION;
+$main::branch += $BRANCH;
+
+use vars qw(%work @msg $msgdir %valid %busy $maxage $last_clean $residencetime
+ @badmsg @swop $swopfn $badmsgfn $forwardfn @forward $timeout $waittime
+ $queueinterval $lastq $importfn $minchunk $maxchunk $bulltopriv);
%work = (); # outstanding jobs
@msg = (); # messages we have
$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
+@badmsg = (); # bad message table
+@swop = (); # swop table
+$timeout = 30*60; # forwarding timeout
+$waittime = 30*60; # time an aborted outgoing message waits before trying again
+$queueinterval = 1*60; # run the queue every 1 minute
+$lastq = 0;
+
+$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
+$residencetime = 2*86400; # keep deleted messages for this amount of time
+
+
+$badmsgfn = "$msgdir/badmsg.pl"; # list of TO address we wont store
+$forwardfn = "$msgdir/forward.pl"; # the forwarding table
+$swopfn = "$msgdir/swop.pl"; # the swopping table
+$importfn = "$msgdir/import"; # import directory
+
%valid = (
- fromnode => '9,From Node',
- tonode => '9,To Node',
+ fromnode => '5,From Node',
+ tonode => '5,To Node',
to => '0,To',
from => '0,From',
t => '0,Msg Time,cldatetime',
- private => '9,Private',
+ private => '5,Private,yesno',
subject => '0,Subject',
linesreq => '0,Lines per Gob',
- rrreq => '9,Read Confirm',
+ rrreq => '5,Read Confirm,yesno',
origin => '0,Origin',
lines => '5,Data',
stream => '9,Stream No',
- count => '9,Gob Linecnt',
- file => '9,File?,yesno',
- gotit => '9,Got it Nodes,parray',
- lines => '9,Lines,parray',
- read => '9,Times read',
+ count => '5,Gob Linecnt',
+ file => '5,File?,yesno',
+ gotit => '5,Got it Nodes,parray',
+ lines => '5,Lines,parray',
+ 'read' => '5,Times read',
size => '0,Size',
msgno => '0,Msgno',
keep => '0,Keep this?,yesno',
+ lastt => '5,Last processed,cldatetime',
+ waitt => '5,Wait until,cldatetime',
+ delete => '5,Awaiting Delete,yesno',
+ deletetime => '5,Deletion Time,cldatetime',
);
# allocate a new object
$self->{msgno} = shift;
my $to = shift;
# $to =~ s/-\d+$//o;
- $self->{to} = $to;
+ $self->{to} = ($to eq $main::mycall) ? $main::myalias : $to;
my $from = shift;
$from =~ s/-\d+$//o;
$self->{from} = uc $from;
$self->{private} = shift;
$self->{subject} = shift;
$self->{origin} = shift;
- $self->{read} = shift;
+ $self->{'read'} = shift;
$self->{rrreq} = shift;
+ $self->{delete} = shift;
+ $self->{deletetime} = shift;
$self->{gotit} = [];
+# $self->{lastt} = $main::systime;
+ $self->{lines} = [];
+ $self->{private} = 1 if $bulltopriv && DXUser->get_current($self->{to});
return $self;
}
-sub workclean
-{
- my $ref = shift;
- delete $ref->{lines};
- delete $ref->{linesreq};
- delete $ref->{tonode};
- delete $ref->{fromnode};
- delete $ref->{stream};
- delete $ref->{lines};
- delete $ref->{file};
- delete $ref->{count};
-}
sub process
{
my ($self, $line) = @_;
- my @f = split /[\^\~]/, $line;
+
+ # this is periodic processing
+ if (!$self || !$line) {
+
+ if ($main::systime >= $lastq + $queueinterval) {
+
+ # queue some message if the interval timer has gone off
+ queue_msg(0);
+
+ # import any messages in the import directory
+ import_msgs();
+
+ $lastq = $main::systime;
+ }
+
+ # clean the message queue
+ clean_old() if $main::systime - $last_clean > 3600 ;
+ $last_clean = $main::systime;
+ return;
+ }
+
+ my @f = split /\^/, $line;
my ($pcno) = $f[0] =~ /^PC(\d\d)/; # just get the number
-
+ my ($tonode, $fromnode) = @f[1, 2];
+ my $stream = $f[3] if ($pcno >= 29 && $pcno <= 33) || $pcno == 42;
+
SWITCH: {
if ($pcno == 28) { # incoming message
+
+ # sort out various extant protocol errors that occur
+ my $origin = $f[13];
+ $origin = $self->call unless $origin && $origin gt ' ';
+
+ # first look for any messages in the busy queue
+ # and cancel them this should both resolve timed out incoming messages
+ # and crossing of message between nodes, incoming messages have priority
+
+ my $ref = get_busy($fromnode);
+ if ($ref) {
+ my $otonode = $ref->{tonode} || "unknown";
+ dbg("Busy, stopping msgno: $ref->{msgno} $fromnode->$otonode") if isdbg('msg');
+ $ref->stop_msg($fromnode);
+ }
+
my $t = cltounix($f[5], $f[6]);
- my $stream = next_transno($f[2]);
- my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]);
+ $stream = next_transno($fromnode);
+ $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $origin, '0', $f[11]);
# fill in various forwarding state variables
- $ref->{fromnode} = $f[2];
- $ref->{tonode} = $f[1];
+ $ref->{fromnode} = $fromnode;
+ $ref->{tonode} = $tonode;
$ref->{rrreq} = $f[11];
$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");
- $work{"$f[2]$stream"} = $ref; # store in work
- $busy{$f[2]} = $ref; # set interlock
- $self->send(DXProt::pc30($f[2], $f[1], $stream)); # send ack
+ dbg("new message from $f[4] to $f[3] '$f[8]' stream $fromnode/$stream\n") if isdbg('msg');
+ Log('msg', "Incoming message $f[4] to $f[3] '$f[8]' origin: $origin" );
+ set_fwq($fromnode, $stream, $ref); # store in work
+ set_busy($fromnode, $ref); # set interlock
+ $self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack
+ $ref->{lastt} = $main::systime;
+
+ # look to see whether this is a non private message sent to a known callsign
+ my $uref = DXUser->get_current($ref->{to});
+ if (is_callsign($ref->{to}) && !$ref->{private} && $uref && $uref->homenode) {
+ $ref->{private} = 1;
+ dbg("set bull to $ref->{to} to private") if isdbg('msg');
+ Log('msg', "set bull to $ref->{to} to private");
+ }
last SWITCH;
}
if ($pcno == 29) { # incoming text
- my $ref = $work{"$f[2]$f[3]"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
- push @{$ref->{lines}}, $f[4];
+ $f[4] =~ s/\%5E/^/g;
+ if (@{$ref->{lines}}) {
+ push @{$ref->{lines}}, $f[4];
+ } else {
+ # temporarily store any R: lines so that we end up with
+ # only the first and last ones stored.
+ if ($f[4] =~ m|^R:\d{6}/\d{4}|) {
+ push @{$ref->{tempr}}, $f[4];
+ } else {
+ if (exists $ref->{tempr}) {
+ push @{$ref->{lines}}, shift @{$ref->{tempr}};
+ push @{$ref->{lines}}, pop @{$ref->{tempr}} if @{$ref->{tempr}};
+ delete $ref->{tempr};
+ }
+ push @{$ref->{lines}}, $f[4];
+ }
+ }
$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");
+ $self->send(DXProt::pc31($fromnode, $tonode, $stream));
+ dbg("stream $stream: $ref->{count} lines received\n") if isdbg('msg');
$ref->{count} = 0;
}
+ $ref->{lastt} = $main::systime;
+ } else {
+ dbg("PC29 from unknown stream $stream from $fromnode") if isdbg('msg');
+ $self->send(DXProt::pc42($fromnode, $tonode, $stream)); # unknown stream
}
last SWITCH;
}
if ($pcno == 30) { # this is a incoming subject ack
- my $ref = $work{$f[2]}; # note no stream at this stage
+ my $ref = get_fwq($fromnode); # note no stream at this stage
if ($ref) {
- delete $work{$f[2]};
- $ref->{stream} = $f[3];
+ del_fwq($fromnode);
+ $ref->{stream} = $stream;
$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);
+ set_fwq($fromnode, $stream, $ref); # new ref
+ set_busy($fromnode, $ref); # interlock
+ dbg("incoming subject ack stream $stream\n") if isdbg('msg');
+ $ref->{lines} = [ $ref->read_msg_body ];
$ref->send_tranche($self);
+ $ref->{lastt} = $main::systime;
} else {
- $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
+ dbg("PC30 from unknown stream $stream from $fromnode") if isdbg('msg');
+ $self->send(DXProt::pc42($fromnode, $tonode, $stream)); # unknown stream
}
last SWITCH;
}
if ($pcno == 31) { # acknowledge a tranche of lines
- my $ref = $work{"$f[2]$f[3]"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
- dbg('msg', "tranche ack stream $f[3]\n");
+ dbg("tranche ack stream $stream\n") if isdbg('msg');
$ref->send_tranche($self);
+ $ref->{lastt} = $main::systime;
} else {
- $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
+ dbg("PC31 from unknown stream $stream from $fromnode") if isdbg('msg');
+ $self->send(DXProt::pc42($fromnode, $tonode, $stream)); # unknown stream
}
last SWITCH;
}
if ($pcno == 32) { # incoming EOM
- dbg('msg', "stream $f[3]: EOM received\n");
- my $ref = $work{"$f[2]$f[3]"};
+ dbg("stream $stream: EOM received\n") if isdbg('msg');
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
- $self->send(DXProt::pc33($f[2], $f[1], $f[3])); # acknowledge it
+ $self->send(DXProt::pc33($fromnode, $tonode, $stream)); # acknowledge it
# get the next msg no - note that this has NOTHING to do with the stream number in PC protocol
# store the file or message
# remove extraneous rubbish from the hash
# 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
+ if ($ref->{lines}) {
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);
+ if ($ref->{subject} eq $m->{subject} && $ref->{t} == $m->{t} && $ref->{from} eq $m->{from} && $ref->{to} eq $m->{to}) {
+ $ref->stop_msg($fromnode);
my $msgno = $m->{msgno};
- dbg('msg', "duplicate message to $msgno\n");
- Log('msg', "duplicate message to $msgno");
+ dbg("duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno") if isdbg('msg');
+ Log('msg', "duplicate message from $ref->{from} -> $ref->{to} to msg: $msgno");
return;
}
}
+ # swop addresses
+ $ref->swop_it($self->call);
+
+ # look for 'bad' to addresses
+ if ($ref->dump_it($self->call)) {
+ $ref->stop_msg($fromnode);
+ dbg("'Bad' message $ref->{to}") if isdbg('msg');
+ Log('msg', "'Bad' message $ref->{to}");
+ return;
+ }
+
+ # check the message for bad words
+ my @words;
+ for (@{$ref->{lines}}) {
+ push @words, BadWords::check($_);
+ }
+ push @words, BadWords::check($ref->{subject});
+ if (@words) {
+ dbg("$ref->{from} swore: '@words' -> $ref->{to} '$ref->{subject}' origin: $ref->{origin} via " . $self->call) if isdbg('msg');
+ Log('msg',"$ref->{from} swore: '@words' -> $ref->{to} origin: $ref->{origin} via " . $self->call);
+ Log('msg',"subject: $ref->{subject}");
+ for (@{$ref->{lines}}) {
+ Log('msg', "line: $_");
+ }
+ $ref->stop_msg($fromnode);
+ return;
+ }
+
$ref->{msgno} = next_transno("Msgno");
- push @{$ref->{gotit}}, $f[2]; # mark this up as being received
+ push @{$ref->{gotit}}, $fromnode; # 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}");
+ $dxchan->send($dxchan->msg('m9')) if $dxchan && $dxchan->is_user;
+ Log('msg', "Message $ref->{msgno} from $ref->{from} received from $fromnode for $ref->{to}");
}
}
- $ref->stop_msg($self);
- queue_msg();
+ $ref->stop_msg($fromnode);
} else {
- $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
+ dbg("PC32 from unknown stream $stream from $fromnode") if isdbg('msg');
+ $self->send(DXProt::pc42($fromnode, $tonode, $stream)); # unknown stream
}
- queue_msg();
+ # queue_msg(0);
last SWITCH;
}
if ($pcno == 33) { # acknowledge the end of message
- my $ref = $work{"$f[2]$f[3]"};
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
if ($ref->{private}) { # remove it if it private and gone off site#
- Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $f[2] and deleted");
- $ref->del_msg;
+ Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode and deleted");
+ $ref->mark_delete;
} else {
- Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $f[2]");
- push @{$ref->{gotit}}, $f[2]; # mark this up as being received
+ Log('msg', "Message $ref->{msgno} from $ref->{from} sent to $fromnode");
+ push @{$ref->{gotit}}, $fromnode; # mark this up as being received
$ref->store($ref->{lines}); # re- store the file
}
- $ref->stop_msg($self);
+ $ref->stop_msg($fromnode);
} else {
- $self->send(DXProt::pc42($f[2], $f[1], $f[3])); # unknown stream
+ dbg("PC33 from unknown stream $stream from $fromnode") if isdbg('msg');
+ $self->send(DXProt::pc42($fromnode, $tonode, $stream)); # unknown stream
}
- queue_msg();
+
+ # send next one if present
+ queue_msg(0);
last SWITCH;
}
$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|src|lib|include|sys|msg|connect)/; # prevent access to executables
+ dbg("incoming file $f[3]\n") if isdbg('msg');
+ $f[3] = 'packclus/' . $f[3] unless $f[3] =~ /^packclus\//o;
# create any directories
my @part = split /\//, $f[3];
$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 $stream = next_transno($fromnode);
my $ref = DXMsg->alloc($stream, "$main::root/$f[3]", $self->call, time, !$f[4], $f[3], ' ', '0', '0');
# forwarding variables
- $ref->{fromnode} = $f[1];
- $ref->{tonode} = $f[2];
+ $ref->{fromnode} = $tonode;
+ $ref->{tonode} = $fromnode;
$ref->{linesreq} = $f[5];
$ref->{stream} = $stream;
$ref->{count} = 0; # no of lines between PC31s
$ref->{file} = 1;
- $work{"$f[2]$stream"} = $ref; # store in work
- $self->send(DXProt::pc30($f[2], $f[1], $stream)); # send ack
+ $ref->{lastt} = $main::systime;
+ set_fwq($fromnode, $stream, $ref); # store in work
+ $self->send(DXProt::pc30($fromnode, $tonode, $stream)); # send ack
last SWITCH;
}
if ($pcno == 42) { # abort transfer
- dbg('msg', "stream $f[3]: abort received\n");
- my $ref = $work{"$f[2]$f[3]"};
+ dbg("stream $stream: abort received\n") if isdbg('msg');
+ my $ref = get_fwq($fromnode, $stream);
if ($ref) {
- $ref->stop_msg($self);
+ $ref->stop_msg($fromnode);
$ref = undef;
}
-
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]");
+ if ($_->{from} eq $f[1] && $_->{subject} eq $f[2]) {
+ $_->mark_delete;
+ Log('msg', "Message $_->{msgno} from $_->{from} ($_->{subject}) fully deleted");
+ DXChannel::broadcast_nodes($line, $self);
}
}
}
}
-
- clean_old() if $main::systime - $last_clean > 3600 ; # clean the message queue
}
{
my $ref = shift;
my $lines = shift;
-
- # we only proceed if there are actually any lines in the file
- if (!$lines || @{$lines} == 0) {
- return;
- }
-
+
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 FileHandle "$ref->{to}", "w";
+ my $fh = new IO::File "$ref->{to}", "w";
if (defined $fh) {
my $line;
foreach $line (@{$lines}) {
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 FileHandle "$fn", "w";
+ my $fh = new IO::File "$fn", "w";
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";
+ my $del = $ref->{delete} ? '1' : '0';
+ my $delt = $ref->{deletetime} || '0';
+ print $fh "=== $ref->{msgno}^$ref->{to}^$ref->{from}^$ref->{t}^$priv^$ref->{subject}^$ref->{origin}^$ref->{'read'}^$rr^$del^$delt\n";
print $fh "=== ", join('^', @{$ref->{gotit}}), "\n";
my $line;
$ref->{size} = 0;
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 $!";
sub del_msg
{
my $self = shift;
+ my $dxchan = shift;
- # remove it from the active message list
- @msg = map { $_ != $self ? $_ : () } @msg;
-
- # belt and braces (one day I will ask someone if this is REALLY necessary)
- delete $self->{gotit};
- delete $self->{list};
+ if ($self->{tonode}) {
+ $self->{delete}++;
+ $self->{deletetime} = 0;
+ } else {
+ # remove it from the active message list
+ @msg = grep { $_ != $self } @msg;
+
+ my $call = '';
+ $call = ' by ' . $dxchan->call if $dxchan;
+ Log('msg', "Msgno $self->{msgno} expunged$call");
+
+ # remove the file
+ unlink filename($self->{msgno});
+ }
+}
+
+sub mark_delete
+{
+ my $ref = shift;
+ my $t = shift;
+ $t = $main::systime + $residencetime unless defined $t;
- # remove the file
- unlink filename($self->{msgno});
- dbg('msg', "deleting $self->{msgno}\n");
+ $ref->{delete}++;
+ $ref->{deletetime} = $t;
+ $ref->store( [$ref->read_msg_body] );
}
# clean out old messages from the message queue
# mark old messages for deletion
foreach $ref (@msg) {
- if (!$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");
+ if (ref($ref) && !$ref->{keep} && $ref->{t} < $main::systime - $maxage) {
+
+ # this is for IMMEDIATE destruction
+ $ref->{delete}++;
+ $ref->{deletetime} = 0;
}
}
-
- # remove them all from the active message list
- @msg = map { $_->{deleteme} ? () : $_ } @msg;
- $last_clean = $main::systime;
}
# read in a message header
my @f;
my $size;
- $file = new FileHandle;
- if (!open($file, $fn)) {
- print "Error reading $fn $!\n";
+ $file = new IO::File "$fn";
+ if (!$file) {
+ dbg("Error reading $fn $!");
+ Log('err', "Error reading $fn $!");
return undef;
}
$size = -s $fn;
$line = <$file>; # first line
+ if ($size == 0 || !$line) {
+ dbg("Empty $fn $!");
+ Log('err', "Empty $fn $!");
+ return undef;
+ }
chomp $line;
$size -= length $line;
if (! $line =~ /^===/o) {
- print "corrupt first line in $fn ($line)\n";
+ dbg("corrupt first line in $fn ($line)");
+ Log('err', "corrupt first line in $fn ($line)");
return undef;
}
$line =~ s/^=== //o;
chomp $line;
$size -= length $line;
if (! $line =~ /^===/o) {
- print "corrupt second line in $fn ($line)\n";
+ dbg("corrupt second line in $fn ($line)");
+ Log('err', "corrupt second line in $fn ($line)");
return undef;
}
$line =~ s/^=== //o;
my $fn = filename($msgno);
my @out;
- $file = new FileHandle;
+ $file = new IO::File;
if (!open($file, $fn)) {
- print "Error reading $fn $!\n";
- return undef;
+ dbg("Error reading $fn $!");
+ Log('err' ,"Error reading $fn $!");
+ return ();
}
- chomp (@out = <$file>);
+ @out = map {chomp; $_} <$file>;
close($file);
shift @out if $out[0] =~ /^=== /;
sub queue_msg
{
my $sort = shift;
- my $call = shift;
my $ref;
my $clref;
- my $dxchan;
- my @nodelist = DXProt::get_all_ak1a();
# 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) {
+
+ # ignore 'delayed' messages until their waiting time has expired
+ if (exists $ref->{waitt}) {
+ next if $ref->{waitt} > $main::systime;
+ 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;
+ }
+
+ # is it being sent anywhere currently?
+ next if $ref->{tonode}; # ignore it if it already being processed
+
+ # is it awaiting deletion?
+ if ($ref->{delete} && $main::systime >= $ref->{deletetime}) {
+ $ref->del_msg;
+ next;
+ }
+ next if $ref->{delete};
+
# 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}) {
- if ($ref->{read} == 0) {
- $clref = DXCluster->get_exact($ref->{to});
- 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';
+ next if $ref->{'read'}; # if it is read, it is stuck here
+ $clref = Route::get($ref->{to});
+ if ($clref) {
+ $dxchan = $clref->dxchan;
+ 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');
}
}
- } elsif ($sort == undef) {
- # otherwise we are dealing with a bulletin, compare the gotit list with
+ } else {
+
+ # otherwise we are dealing with a bulletin or forwarded private message
+ # 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
# guess, use (to, from, time, subject) tuple?
- my $noderef;
- foreach $noderef (@nodelist) {
- 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}};
+ foreach $dxchan (@nodelist) {
+ 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
+ next if $ref->{tonode}; # ignore it if it already being processed
# 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';
- last;
+ if (!get_busy($call) && $dxchan->state eq 'normal') {
+ $ref->start_msg($dxchan);
+ last;
+ }
}
}
-
+
# if all the available nodes are busy then stop
last if @nodelist == scalar grep { get_busy($_->call) } @nodelist;
}
}
+# 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
{
my ($self, $dxchan) = @_;
- dbg('msg', "start msg $self->{msgno}\n");
- $self->{linesreq} = 5;
+ confess("trying to start started msg $self->{msgno} nodes: $self->{fromnode} -> $self->{tonode}") if $self->{tonode};
+ dbg("start msg $self->{msgno}\n") if isdbg('msg');
+ $self->{linesreq} = 10;
$self->{count} = 0;
$self->{tonode} = $dxchan->call;
$self->{fromnode} = $main::mycall;
- $busy{$dxchan->call} = $self;
- $work{"$self->{tonode}"} = $self;
- $dxchan->send(DXProt::pc28($self->{tonode}, $self->{fromnode}, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $self->{origin}, $self->{rrreq}));
+ set_busy($self->{tonode}, $self);
+ set_fwq($self->{tonode}, undef, $self);
+ $self->{lastt} = $main::systime;
+ my ($fromnode, $origin);
+ $fromnode = $self->{fromnode};
+ $origin = $self->{origin};
+ $dxchan->send(DXProt::pc28($self->{tonode}, $fromnode, $self->{to}, $self->{from}, $self->{t}, $self->{private}, $self->{subject}, $origin, $self->{rrreq}));
}
# get the ref of a busy node
return $busy{$call};
}
-# get the busy queue
+sub set_busy
+{
+ my $call = shift;
+ return $busy{$call} = shift;
+}
+
+sub del_busy
+{
+ my $call = shift;
+ return delete $busy{$call};
+}
+
+# get the whole busy queue
sub get_all_busy
{
- return values %busy;
+ return keys %busy;
}
-# get the forwarding queue
+# get a forwarding queue entry
sub get_fwq
{
- return values %work;
+ my $call = shift;
+ my $stream = shift || '0';
+ return $work{"$call,$stream"};
+}
+
+# delete a forwarding queue entry
+sub del_fwq
+{
+ my $call = shift;
+ my $stream = shift || '0';
+ return delete $work{"$call,$stream"};
+}
+
+# set a fwq entry
+sub set_fwq
+{
+ my $call = shift;
+ my $stream = shift || '0';
+ return $work{"$call,$stream"} = shift;
+}
+
+# get the whole forwarding queue
+sub get_all_fwq
+{
+ return keys %work;
}
# stop a message from continuing, clean it out, unlock interlocks etc
sub stop_msg
{
- my ($self, $dxchan) = @_;
- my $node = $dxchan->call;
+ my $self = shift;
+ my $node = shift;
+ my $stream = $self->{stream};
- dbg('msg', "stop msg $self->{msgno} stream $self->{stream}\n");
- delete $work{$node};
- delete $work{"$node$self->{stream}"};
+
+ dbg("stop msg $self->{msgno} -> node $node\n") if isdbg('msg');
+ del_fwq($node, $stream);
$self->workclean;
- delete $busy{$node};
+ del_busy($node);
+}
+
+sub workclean
+{
+ my $ref = shift;
+ delete $ref->{lines};
+ delete $ref->{linesreq};
+ delete $ref->{tonode};
+ delete $ref->{fromnode};
+ delete $ref->{stream};
+ delete $ref->{file};
+ delete $ref->{count};
+ delete $ref->{tempr};
+ delete $ref->{lastt};
+ delete $ref->{waitt};
}
# get a new transaction number from the file specified
my $fn = "$msgdir/$name";
my $msgno;
- my $fh = new FileHandle;
+ my $fh = new IO::File;
if (sysopen($fh, $fn, O_RDWR|O_CREAT, 0666)) {
$fh->autoflush(1);
- $msgno = $fh->getline;
+ $msgno = $fh->getline || '0';
chomp $msgno;
$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 $!";
# initialise the message 'system', read in all the message headers
sub init
{
- my $dir = new FileHandle;
+ my $dir = new IO::File;
my @dir;
my $ref;
-
+
+ # load various control files
+ 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 $!";
@dir = readdir($dir);
closedir($dir);
-
+
+ @msg = ();
for (sort @dir) {
- next if /^\./o;
- next if ! /^m\d+/o;
+ next unless /^m\d\d\d\d\d\d$/;
$ref = read_msg_header("$msgdir/$_");
- next if !$ref;
+ unless ($ref) {
+ dbg("Deleting $_");
+ Log('err', "Deleting $_");
+ unlink "$msgdir/$_";
+ next;
+ }
+ # delete any messages to 'badmsg.pl' places
+ if ($ref->dump_it('')) {
+ dbg("'Bad' TO address $ref->{to}") if isdbg('msg');
+ Log('msg', "'Bad' TO address $ref->{to}");
+ $ref->del_msg;
+ next;
+ }
+
# add the message to the available queue
add_dir($ref);
-
}
}
# $DB::single = 1;
confess "local var gone missing" if !ref $self->{loc};
my $loc = $self->{loc};
+ if (my @ans = BadWords::check($line)) {
+ $self->{badcount} += @ans;
+ Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} in msg");
+ $loc->{reject}++;
+ }
$loc->{subject} = $line;
$loc->{lines} = [];
$self->state('sendbody');
#push @out, $self->msg('sendbody');
- push @out, "Enter Message /EX (^Z) to send or /ABORT (^Y) to exit";
+ push @out, $self->msg('m8');
} elsif ($self->state eq 'sendbody') {
confess "local var gone missing" if !ref $self->{loc};
my $loc = $self->{loc};
- if ($line eq "\032" || uc $line eq "/EX") {
+ if ($line eq "\032" || $line eq '%1A' || uc $line eq "/EX") {
my $to;
-
- if (@{$loc->{lines}} > 0) {
+ unless ($loc->{reject}) {
foreach $to (@{$loc->{to}}) {
my $ref;
my $systime = $main::systime;
my $mycall = $main::mycall;
$ref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
uc $to,
- $self->call,
+ exists $loc->{from} ? $loc->{from} : $self->call,
$systime,
$loc->{private},
$loc->{subject},
- $mycall,
+ exists $loc->{origin} ? $loc->{origin} : $mycall,
'0',
$loc->{rrreq});
+ $ref->swop_it($self->call);
$ref->store($loc->{lines});
$ref->add_dir();
- #push @out, $self->msg('sendsent', $to);
- push @out, "msgno $ref->{msgno} sent to $to";
+ push @out, $self->msg('m11', $ref->{msgno}, $to);
+ #push @out, "msgno $ref->{msgno} sent to $to";
my $dxchan = DXChannel->get(uc $to);
if ($dxchan) {
if ($dxchan->is_user()) {
- $dxchan->send("New mail has arrived for you");
+ $dxchan->send($dxchan->msg('m9'));
}
}
}
+ } else {
+ Log('msg', $self->call . " swore to @{$loc->{to}} subject: '$loc->{subject}' in msg, REJECTED");
}
+
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
- $self->state('prompt');
$self->func(undef);
- DXMsg::queue_msg();
+
+ $self->state('prompt');
} elsif ($line eq "\031" || uc $line eq "/ABORT" || uc $line eq "/QUIT") {
#push @out, $self->msg('sendabort');
- push @out, "aborted";
+ push @out, $self->msg('m10');
delete $loc->{lines};
delete $loc->{to};
delete $self->{loc};
$self->func(undef);
$self->state('prompt');
} else {
+ if (my @ans = BadWords::check($line)) {
+ $self->{badcount} += @ans;
+ Log('msg', $self->call . " used badwords: @ans to @{$loc->{to}} subject: '$loc->{subject}' in msg") unless $loc->{reject};
+ Log('msg', "line: $line");
+ $loc->{reject}++;
+ }
# i.e. it ain't and end or abort, therefore store the line
push @{$loc->{lines}}, length($line) > 0 ? $line : " ";
}
}
- return (1, @out);
+ return @out;
}
# return the standard directory line for this ref
sub dir
{
my $ref = shift;
+ my $flag = $ref->read ? '-' : ' ';
+ $flag = 'D' if $ref->delete;
return sprintf "%6d%s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s",
- $ref->msgno, $ref->read ? '-' : ' ', $ref->private ? 'p' : ' ', $ref->size,
+ $ref->msgno, $flag, $ref->private ? 'p' : ' ', $ref->size,
$ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
}
+# load the forward table
+sub load_forward
+{
+ my @out;
+ my $s = readfilestr($forwardfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
+ return @out;
+}
+
+# load the bad message table
+sub load_badmsg
+{
+ my @out;
+ my $s = readfilestr($badmsgfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
+ return @out;
+}
+
+# load the swop message table
+sub load_swop
+{
+ my @out;
+ my $s = readfilestr($swopfn);
+ if ($s) {
+ eval $s;
+ push @out, $@ if $@;
+ }
+ return @out;
+}
+
+#
+# forward that message or not according to the forwarding table
+# returns 1 for forward, 0 - to ignore
+#
+
+sub forward_it
+{
+ my $ref = shift;
+ my $call = shift;
+ my $i;
+
+ for ($i = 0; $i < @forward; $i += 5) {
+ my ($sort, $field, $pattern, $action, $bbs) = @forward[$i..($i+4)];
+ my $tested;
+
+ # are we interested?
+ next if $ref->{private} && $sort ne 'P';
+ next if !$ref->{private} && $sort ne 'B';
+
+ # select field
+ $tested = $ref->{to} if $field eq 'T';
+ $tested = $ref->{from} if $field eq 'F';
+ $tested = $ref->{origin} if $field eq 'O';
+ $tested = $ref->{subject} if $field eq 'S';
+
+ if (!$pattern || $tested =~ m{$pattern}i) {
+ return 0 if $action eq 'I';
+ return 1 if !$bbs || grep $_ eq $call, @{$bbs};
+ }
+ }
+ return 0;
+}
+
+sub dump_it
+{
+ my $ref = shift;
+ my $call = shift;
+ my $i;
+
+ for ($i = 0; $i < @badmsg; $i += 3) {
+ my ($sort, $field, $pattern) = @badmsg[$i..($i+2)];
+ my $tested;
+
+ # are we interested?
+ next if $ref->{private} && $sort ne 'P';
+ next if !$ref->{private} && $sort ne 'B';
+
+ # select field
+ $tested = $ref->{to} if $field eq 'T';
+ $tested = $ref->{from} if $field eq 'F';
+ $tested = $ref->{origin} if $field eq 'O';
+ $tested = $ref->{subject} if $field eq 'S';
+ $tested = $call if $field eq 'I';
+
+ if (!$pattern || $tested =~ m{$pattern}i) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+sub swop_it
+{
+ my $ref = shift;
+ my $call = shift;
+ my $i;
+ my $count = 0;
+
+ for ($i = 0; $i < @swop; $i += 5) {
+ my ($sort, $field, $pattern, $tfield, $topattern) = @swop[$i..($i+4)];
+ my $tested;
+ my $swop;
+ my $old;
+
+ # are we interested?
+ next if $ref->{private} && $sort ne 'P';
+ next if !$ref->{private} && $sort ne 'B';
+
+ # select field
+ $tested = $ref->{to} if $field eq 'T';
+ $tested = $ref->{from} if $field eq 'F';
+ $tested = $ref->{origin} if $field eq 'O';
+ $tested = $ref->{subject} if $field eq 'S';
+
+ # select swop field
+ $old = $swop = $ref->{to} if $tfield eq 'T';
+ $old = $swop = $ref->{from} if $tfield eq 'F';
+ $old = $swop = $ref->{origin} if $tfield eq 'O';
+ $old = $swop = $ref->{subject} if $tfield eq 'S';
+
+ if ($tested =~ m{$pattern}i) {
+ if ($tested eq $swop) {
+ $swop =~ s{$pattern}{$topattern}i;
+ } else {
+ $swop = $topattern;
+ }
+ Log('msg', "Msg $ref->{msgno}: $tfield $old -> $swop");
+ Log('dbg', "Msg $ref->{msgno}: $tfield $old -> $swop");
+ $ref->{to} = $swop if $tfield eq 'T';
+ $ref->{from} = $swop if $tfield eq 'F';
+ $ref->{origin} = $swop if $tfield eq 'O';
+ $ref->{subject} = $swop if $tfield eq 'S';
+ ++$count;
+ }
+ }
+ return $count;
+}
+
+# import any msgs in the import directory
+# the messages are in BBS format (but may have cluster extentions
+# so SB UK < GB7TLH is legal
+sub import_msgs
+{
+ # are there any to do in this directory?
+ return unless -d $importfn;
+ unless (opendir(DIR, $importfn)) {
+ dbg("can\'t open $importfn $!") if isdbg('msg');
+ Log('msg', "can\'t open $importfn $!");
+ return;
+ }
+
+ my @names = readdir(DIR);
+ closedir(DIR);
+ my $name;
+ foreach $name (@names) {
+ next if $name =~ /^\./;
+ my $splitit = $name =~ /^split/;
+ my $fn = "$importfn/$name";
+ next unless -f $fn;
+ unless (open(MSG, $fn)) {
+ dbg("can\'t open import file $fn $!") if isdbg('msg');
+ Log('msg', "can\'t open import file $fn $!");
+ unlink($fn);
+ next;
+ }
+ my @msg = map { chomp; $_ } <MSG>;
+ close(MSG);
+ unlink($fn);
+ my @out = import_one($main::me, \@msg, $splitit);
+ Log('msg', @out);
+ }
+}
+
+# import one message as a list in bbs (as extended) mode
+# takes a reference to an array containing the whole message
+sub import_one
+{
+ my $dxchan = shift;
+ my $ref = shift;
+ my $splitit = shift;
+ my $private = '1';
+ my $rr = '0';
+ my $notincalls = 1;
+ my $from = $dxchan->call;
+ my $origin = $main::mycall;
+ my @to;
+ my @out;
+
+ # first line;
+ my $line = shift @$ref;
+ my @f = split /([\s\@\$])/, $line;
+ @f = map {s/\s+//g; length $_ ? $_ : ()} @f;
+
+ unless (@f && $f[0] =~ /^(:?S|SP|SB|SEND)$/ ) {
+ my $m = "invalid first line in import '$line'";
+ dbg($m) if isdbg('msg');
+ return (1, $m);
+ }
+ while (@f) {
+ my $f = uc shift @f;
+ next if $f eq 'SEND';
+
+ # private / noprivate / rr
+ if ($notincalls && ($f eq 'B' || $f eq 'SB' || $f =~ /^NOP/oi)) {
+ $private = '0';
+ } elsif ($notincalls && ($f eq 'P' || $f eq 'SP' || $f =~ /^PRI/oi)) {
+ ;
+ } elsif ($notincalls && ($f eq 'RR')) {
+ $rr = '1';
+ } elsif (($f =~ /^[\@\.\#\$]$/ || $f eq '.#') && @f) { # this is bbs syntax, for AT
+ shift @f;
+ } elsif ($f eq '<' && @f) { # this is bbs syntax for from call
+ $from = uc shift @f;
+ } elsif ($f =~ /^\$/) { # this is bbs syntax for a bid
+ next;
+ } elsif ($f =~ /^<(\S+)/) { # this is bbs syntax for from call
+ $from = $1;
+ } elsif ($f =~ /^\$\S+/) { # this is bbs syntax for bid
+ ;
+ } else {
+
+ # callsign ?
+ $notincalls = 0;
+
+ # is this callsign a distro?
+ my $fn = "$msgdir/distro/$f.pl";
+ if (-e $fn) {
+ my $fh = new IO::File $fn;
+ if ($fh) {
+ local $/ = undef;
+ my $s = <$fh>;
+ $fh->close;
+ my @call;
+ @call = eval $s;
+ return (1, "Error in Distro $f.pl:", $@) if $@;
+ if (@call > 0) {
+ push @f, @call;
+ next;
+ }
+ }
+ }
+
+ if (grep $_ eq $f, @DXMsg::badmsg) {
+ push @out, $dxchan->msg('m3', $f);
+ } else {
+ push @to, $f;
+ }
+ }
+ }
+
+ # subject is the next line
+ my $subject = shift @$ref;
+
+ # strip off trailing lines
+ pop @$ref while (@$ref && $$ref[-1] =~ /^\s*$/);
+
+ # strip off /EX or /ABORT
+ return ("aborted") if @$ref && $$ref[-1] =~ m{^/ABORT$}i;
+ pop @$ref if (@$ref && $$ref[-1] =~ m{^/EX$}i);
+
+ # sort out any splitting that needs to be done
+ my @chunk;
+ if ($splitit) {
+ my $lth = 0;
+ my $lines = [];
+ for (@$ref) {
+ if ($lth >= $maxchunk || ($lth > $minchunk && /^\s*$/)) {
+ push @chunk, $lines;
+ $lines = [];
+ $lth = 0;
+ }
+ push @$lines, $_;
+ $lth += length;
+ }
+ push @chunk, $lines if @$lines;
+ } else {
+ push @chunk, $ref;
+ }
+
+ # write all the messages away
+ my $i;
+ for ( $i = 0; $i < @chunk; $i++) {
+ my $chunk = $chunk[$i];
+ my $ch_subject;
+ if (@chunk > 1) {
+ my $num = " [" . ($i+1) . "/" . scalar @chunk . "]";
+ $ch_subject = substr($subject, 0, 27 - length $num) . $num;
+ } else {
+ $ch_subject = $subject;
+ }
+ my $to;
+ foreach $to (@to) {
+ my $systime = $main::systime;
+ my $mycall = $main::mycall;
+ my $mref = DXMsg->alloc(DXMsg::next_transno('Msgno'),
+ $to,
+ $from,
+ $systime,
+ $private,
+ $ch_subject,
+ $origin,
+ '0',
+ $rr);
+ $mref->swop_it($main::mycall);
+ $mref->store($chunk);
+ $mref->add_dir();
+ push @out, $dxchan->msg('m11', $mref->{msgno}, $to);
+ #push @out, "msgno $ref->{msgno} sent to $to";
+ my $todxchan = DXChannel->get(uc $to);
+ if ($todxchan) {
+ if ($todxchan->is_user()) {
+ $todxchan->send($todxchan->msg('m9'));
+ }
+ }
+ }
+ }
+ return @out;
+}
+
no strict;
sub AUTOLOAD
{
$name =~ s/.*:://o;
confess "Non-existant field '$AUTOLOAD'" if !$valid{$name};
+ # this clever line of code creates a subroutine which takes over from autoload
+ # from OO Perl - Conway
+ *{$AUTOLOAD} = sub {@_ > 1 ? $_[0]->{$name} = $_[1] : $_[0]->{$name}} ;
@_ ? $self->{$name} = shift : $self->{$name} ;
}
projects / spider.git / blobdiff