projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed routing talk messages
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index c039659bd96dbfab15373c542cf92578f449e503..b99a352f3f1188d87d8997d6fefb96a7b83c0e23 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-181,7
+181,7
@@
sub normal
my $ref = DXChannel->get($call);
$ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
} else {
my $ref = DXChannel->get($call);
$ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
} else {
- route($field[2], $line); # relay it on its way
+
$self->
route($field[2], $line); # relay it on its way
}
return;
}
}
return;
}
@@
-191,7
+191,7
@@
sub normal
# route 'foreign' pc26s
if ($pcno == 26) {
if ($field[7] ne $main::mycall) {
# route 'foreign' pc26s
if ($pcno == 26) {
if ($field[7] ne $main::mycall) {
- route($field[7], $line);
+
$self->
route($field[7], $line);
return;
}
}
return;
}
}
@@
-295,7
+295,7
@@
sub normal
}
} else {
}
} else {
- route($field[2], $line);
+
$self->
route($field[2], $line);
}
return;
}
return;
@@
-498,7
+498,7
@@
sub normal
# route 'foreign' pc27s
if ($pcno == 27) {
if ($field[8] ne $main::mycall) {
# route 'foreign' pc27s
if ($pcno == 27) {
if ($field[8] ne $main::mycall) {
- route($field[8], $line);
+
$self->
route($field[8], $line);
return;
}
}
return;
}
}
@@
-548,7
+548,7
@@
sub normal
if ($pcno == 25) { # merge request
if ($field[1] ne $main::mycall) {
if ($pcno == 25) { # merge request
if ($field[1] ne $main::mycall) {
- route($field[1], $line);
+
$self->
route($field[1], $line);
return;
}
if ($field[2] eq $main::mycall) {
return;
}
if ($field[2] eq $main::mycall) {
@@
-582,7
+582,7
@@
sub normal
if ($pcno == 49 || $field[1] eq $main::mycall) {
DXMsg::process($self, $line);
} else {
if ($pcno == 49 || $field[1] eq $main::mycall) {
DXMsg::process($self, $line);
} else {
- route($field[1], $line);
+
$self->
route($field[1], $line);
}
return;
}
}
return;
}
@@
-612,7
+612,7
@@
sub normal
$self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
}
} else {
$self->send(pc35($main::mycall, $field[2], "$main::mycall:your attempt is logged, Tut tut tut...!"));
}
} else {
- route($field[1], $line);
+
$self->
route($field[1], $line);
}
return;
}
}
return;
}
@@
-626,7
+626,7
@@
sub normal
delete $rcmds{$field[2]} if !$dxchan;
}
} else {
delete $rcmds{$field[2]} if !$dxchan;
}
} else {
- route($field[1], $line);
+
$self->
route($field[1], $line);
}
return;
}
}
return;
}
@@
-673,7
+673,7
@@
sub normal
if ($field[1] eq $main::mycall) {
;
} else {
if ($field[1] eq $main::mycall) {
;
} else {
- route($field[1], $line);
+
$self->
route($field[1], $line);
}
return;
}
}
return;
}
@@
-707,7
+707,7
@@
sub normal
} else {
# route down an appropriate thingy
} else {
# route down an appropriate thingy
- route($field[1], $line);
+
$self->
route($field[1], $line);
}
return;
}
}
return;
}
@@
-1003,9
+1003,13
@@
sub send_local_config
#
sub route
{
#
sub route
{
- my ($call, $line) = @_;
+ my ($
self, $
call, $line) = @_;
my $cl = DXCluster->get_exact($call);
my $cl = DXCluster->get_exact($call);
- if ($cl) {
+ if ($cl) { # don't route it back down itself
+ if (ref $self && $call eq $self->{call}) {
+ dbg('chan', "Trying to route back to source, dropped");
+ return;
+ }
my $hops;
my $dxchan = $cl->{dxchan};
if ($dxchan) {
my $hops;
my $dxchan = $cl->{dxchan};
if ($dxchan) {
@@
-1212,7
+1216,7
@@
sub addping
my $r = {};
$r->{call} = $from;
$r->{t} = $main::systime;
my $r = {};
$r->{call} = $from;
$r->{t} = $main::systime;
- route($to, pc51($to, $main::mycall, 1));
+ route(
undef,
$to, pc51($to, $main::mycall, 1));
push @$ref, $r;
}
push @$ref, $r;
}
@@
-1224,7
+1228,7
@@
sub addrcmd
$r->{call} = $from;
$r->{t} = $main::systime;
$r->{cmd} = $cmd;
$r->{call} = $from;
$r->{t} = $main::systime;
$r->{cmd} = $cmd;
- route($to, pc34($main::mycall, $to, $cmd));
+ route(
undef,
$to, pc34($main::mycall, $to, $cmd));
$rcmds{$to} = $r;
}
1;
$rcmds{$to} = $r;
}
1;