projects
/
spider.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
929d169
)
put in fix for arcluster bug
author
minima
<minima>
Sat, 14 Jul 2001 20:48:27 +0000
(20:48 +0000)
committer
minima
<minima>
Sat, 14 Jul 2001 20:48:27 +0000
(20:48 +0000)
perl/DXMsg.pm
patch
|
blob
|
history
diff --git
a/perl/DXMsg.pm
b/perl/DXMsg.pm
index 428f87e958523dfd5adaf884aecd2da38b4d2540..1bbe00ec0c8262acddbb285c200c4e81c584e0ec 100644
(file)
--- a/
perl/DXMsg.pm
+++ b/
perl/DXMsg.pm
@@
-152,23
+152,33
@@
sub process
SWITCH: {
if ($pcno == 28) { # incoming message
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
# 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{$f
romnode
}) {
+ my $ref = $busy{$f
romnode
};
my $tonode = $ref->{tonode};
my $tonode = $ref->{tonode};
- dbg('msg', "Busy, stopping msgno: $ref->{msgno} -> $f
[2]
");
+ dbg('msg', "Busy, stopping msgno: $ref->{msgno} -> $f
romnode
");
$ref->stop_msg($self->call);
}
my $t = cltounix($f[5], $f[6]);
$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
# fill in various forwarding state variables
- $ref->{fromnode} = $f
[2]
;
+ $ref->{fromnode} = $f
romnode
;
$ref->{tonode} = $f[1];
$ref->{rrreq} = $f[11];
$ref->{linesreq} = $f[10];
$ref->{tonode} = $f[1];
$ref->{rrreq} = $f[11];
$ref->{linesreq} = $f[10];
@@
-176,9
+186,9
@@
sub process
$ref->{count} = 0; # no of lines between PC31s
dbg('msg', "new message from $f[4] to $f[3] '$f[8]' stream $stream\n");
Log('msg', "Incoming message $f[4] to $f[3] '$f[8]'" );
$ref->{count} = 0; # no of lines between PC31s
dbg('msg', "new message from $f[4] to $f[3] '$f[8]' stream $stream\n");
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{"$f
romnode
$stream"} = $ref; # store in work
+ $busy{$f
romnode
} = $ref; # set interlock
+ $self->send(DXProt::pc30($f
romnode
, $f[1], $stream)); # send ack
$ref->{lastt} = $main::systime;
# look to see whether this is a non private message sent to a known callsign
$ref->{lastt} = $main::systime;
# look to see whether this is a non private message sent to a known callsign