X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=d1ac6cf8218cb54ac39330935141eeaf5b1fe512;hb=e21257f7fb3b92795787575094e69a7cd804ce55;hp=2feeda2d3d19282e1bb7ca5fa0d49b078fd6fe84;hpb=15424b325766c68bc04207c71dbaf86f06ca5ffa;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 2feeda2d..d1ac6cf8 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -203,7 +203,14 @@ sub normal return; } - my $spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]); + my @spot = Spot::add($freq, $field[2], $d, $text, $spotter, $field[7]); + + # + # @spot at this point contains:- + # freq, spotted call, time, text, spotter, spotted cc, spotters cc, + # orig node, spotted itu, spotted cq, spotters itu, spotters cq + # you should be able to route on any of these + # # local processing my $r; @@ -214,9 +221,9 @@ sub normal return if $r; # send orf to the users - if ($spot && $pcno == 11) { + if (@spot && $pcno == 11) { my $buf = Spot::formatb($field[1], $field[2], $d, $text, $spotter); - broadcast_users("$buf\a\a", 'dx', $spot); + broadcast_users("$buf\a\a", 'dx', $spot[0]); } # DON'T be silly and send on PC26s! @@ -685,8 +692,10 @@ sub send_local_config @nodes = (DXCluster->get_exact($main::mycall)); } else { # create a list of all the nodes that are not connected to this connection - @nodes = DXNode::get_all(); - @nodes = grep { $_->dxchan != $self } @nodes; + # and are not themselves isolated, this to make sure that isolated nodes + # don't appear outside of this node + @nodes = DXNode::get_all(); + @nodes = grep { $_->dxchan != $self && !$_->dxchan->{isolate} } @nodes; } my @s = $me->pc19(@nodes);