From: minima Date: Wed, 27 Jun 2001 08:49:07 +0000 (+0000) Subject: add an ARC Mail hack X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=b326a39e5cf429a4c8fe52026f937f7b011cbca2;p=spider.git add an ARC Mail hack --- diff --git a/Changes b/Changes index 48528492..fe4156cd 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,7 @@ +27Jun01======================================================================= +1. try adding an ARC mail hack +25Jun01======================================================================= +1. added automatic 'not here' message 21Jun01======================================================================= 1. fix (some) problems with 'init' 2. fix stat/msg a bit more diff --git a/perl/DXMsg.pm b/perl/DXMsg.pm index 0d57ca7d..f4e79936 100644 --- a/perl/DXMsg.pm +++ b/perl/DXMsg.pm @@ -151,33 +151,44 @@ sub process SWITCH: { if ($pcno == 28) { # incoming message + # sort out various extant protocol errors that occur + my ($fromnode, $origin); + if ($self->is_arcluster && $f[13] eq $self->call) { + $fromnode = $f[13]; + $origin = $f[2]; + } else { + $fromnode = $f[2]; + $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 - if (exists $busy{$f[2]}) { - my $ref = $busy{$f[2]}; + + if (exists $busy{$fromnode}) { + my $ref = $busy{$fromnode}; my $tonode = $ref->{tonode}; - dbg("Busy, stopping msgno: $ref->{msgno} -> $f[2]") if isdbg('msg'); + dbg("Busy, stopping msgno: $ref->{msgno} -> $fromnode") if isdbg('msg'); $ref->stop_msg($self->call); } my $t = cltounix($f[5], $f[6]); - my $stream = next_transno($f[2]); - $f[13] = $self->call unless $f[13] && $f[13] gt ' '; - my $ref = DXMsg->alloc($stream, uc $f[3], $f[4], $t, $f[7], $f[8], $f[13], '0', $f[11]); + my $stream = next_transno($fromnode); + my $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->{fromnode} = $fromnode; $ref->{tonode} = $f[1]; $ref->{rrreq} = $f[11]; $ref->{linesreq} = $f[10]; $ref->{stream} = $stream; $ref->{count} = 0; # no of lines between PC31s - dbg("new message from $f[4] to $f[3] '$f[8]' stream $stream\n") if isdbg('msg'); + 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]'" ); - $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 + $work{"$fromnode$stream"} = $ref; # store in work + $busy{$fromnode} = $ref; # set interlock + $self->send(DXProt::pc30($fromnode, $f[1], $stream)); # send ack $ref->{lastt} = $main::systime; # look to see whether this is a non private message sent to a known callsign