projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added routing for PC26/27 and also put the correct callsign on the end
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 19859af08d4789b95022e4962500506f8148ecb6..aa848eb72eabca27461d215621a02f46e95db387 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-178,6
+178,14
@@
sub normal
}
if ($pcno == 11 || $pcno == 26) { # dx spot
}
if ($pcno == 11 || $pcno == 26) { # dx spot
+
+ # route 'foreign' pc26s
+ if ($pcno == 26) {
+ if ($field[7] ne $main::mycall) {
+ route($field[7], $line);
+ return;
+ }
+ }
# if this is a 'nodx' node then ignore it
last SWITCH if grep $field[7] =~ /^$_/, @DXProt::nodx_node;
# if this is a 'nodx' node then ignore it
last SWITCH if grep $field[7] =~ /^$_/, @DXProt::nodx_node;
@@
-441,6
+449,15
@@
sub normal
}
if ($pcno == 23 || $pcno == 27) { # WWV info
}
if ($pcno == 23 || $pcno == 27) { # WWV info
+
+ # route 'foreign' pc27s
+ if ($pcno == 27) {
+ if ($field[8] ne $main::mycall) {
+ route($field[8], $line);
+ return;
+ }
+ }
+
# do some de-duping
my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
my $sfi = unpad($field[3]);
# do some de-duping
my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
my $sfi = unpad($field[3]);
@@
-495,7
+512,7
@@
sub normal
my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
my $in;
foreach $in (@in) {
my @in = reverse Spot::search(1, undef, undef, 0, $field[3]-1);
my $in;
foreach $in (@in) {
- $self->send(pc26(@{$in}[0..4], $
in->[7
]));
+ $self->send(pc26(@{$in}[0..4], $
field[2
]));
}
}
}
}
@@
-504,14
+521,18
@@
sub normal
my @in = reverse Geomag::search(0, $field[4], time, 1);
my $in;
foreach $in (@in) {
my @in = reverse Geomag::search(0, $field[4], time, 1);
my $in;
foreach $in (@in) {
- $self->send(pc27(@{$in}));
+ $self->send(pc27(@{$in}
[0..5], $field[2]
));
}
}
return;
}
}
}
return;
}
-
+
if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
if (($pcno >= 28 && $pcno <= 33) || $pcno == 40 || $pcno == 42 || $pcno == 49) { # mail/file handling
- DXMsg::process($self, $line);
+ if ($field[1] eq $main::mycall) {
+ DXMsg::process($self, $line);
+ } else {
+ route($field[1], $line);
+ }
return;
}
return;
}
@@
-559,10
+580,8
@@
sub normal
return;
}
return;
}
- if ($pcno == 37) {
- last SWITCH;
- }
-
+ # for pc 37 see 44 onwards
+
if ($pcno == 38) { # node connected list from neighbour
return;
}
if ($pcno == 38) { # node connected list from neighbour
return;
}
@@
-599,25
+618,21
@@
sub normal
if ($pcno == 43) {
last SWITCH;
}
if ($pcno == 43) {
last SWITCH;
}
- if ($pcno == 44) {
- last SWITCH;
- }
- if ($pcno == 45) {
- last SWITCH;
- }
- if ($pcno == 46) {
- last SWITCH;
- }
- if ($pcno == 47) {
- last SWITCH;
- }
- if ($pcno == 48) {
- last SWITCH;
+ if ($pcno == 37 || $pcno == 44 || $pcno == 45 || $pcno == 46 || $pcno == 47 || $pcno == 49) {
+ if ($field[1] eq $main::mycall) {
+ ;
+ } else {
+ route($field[1], $line);
+ }
+ return;
}
if ($pcno == 50) { # keep alive/user list
}
if ($pcno == 50) { # keep alive/user list
- my $ref = DXCluster->get_exact($field[1]);
- $ref->update_users($field[2]) if $ref;
+ my $node = DXCluster->get_exact($field[1]);
+ if ($node) {
+ return unless $node->dxchan == $self;
+ $node->update_users($field[2]);
+ }
last SWITCH;
}
last SWITCH;
}