[ qw(c c n n) ], # pc25
[ qw(f m d t m c c bc) ], # pc26
[ qw(d n n n n m c c bc) ], # pc27
[ qw(c c n n) ], # pc25
[ qw(f m d t m c c bc) ], # pc26
[ qw(d n n n n m c c bc) ], # pc27
- $self->{spotfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
+ $self->{spotsfilter} = Filter::read_in('spots', $call, 0) || Filter::read_in('spots', 'node_default', 0);
$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
# get the INPUT filters (these only pertain to Clusters)
$self->{wwvfilter} = Filter::read_in('wwv', $call, 0) || Filter::read_in('wwv', 'node_default', 0);
$self->{wcyfilter} = Filter::read_in('wcy', $call, 0) || Filter::read_in('wcy', 'node_default', 0);
$self->{annfilter} = Filter::read_in('ann', $call, 0) || Filter::read_in('ann', 'node_default', 0) ;
# get the INPUT filters (these only pertain to Clusters)
- $self->{inspotfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
+ $self->{inspotsfilter} = Filter::read_in('spots', $call, 1) || Filter::read_in('spots', 'node_default', 1);
$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
$self->{inwwvfilter} = Filter::read_in('wwv', $call, 1) || Filter::read_in('wwv', 'node_default', 1);
$self->{inwcyfilter} = Filter::read_in('wcy', $call, 1) || Filter::read_in('wcy', 'node_default', 1);
$self->{inannfilter} = Filter::read_in('ann', $call, 1) || Filter::read_in('ann', 'node_default', 1);
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[1], 0, 1, 5400);
- broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ dbg('chan', "$field[1] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
if ($node->dxchan != $self) {
dbg('chan', "LOOP: $field[1] came in on wrong channel");
return;
if ($node->dxchan != $self) {
dbg('chan', "LOOP: $field[1] came in on wrong channel");
return;
for ($i = 2; $i < $#field; $i++) {
my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
for ($i = 2; $i < $#field; $i++) {
my ($call, $confmode, $here) = $field[$i] =~ /^(\S+) (\S) (\d)/o;
- next if !$call || length $call < 3 || length $call > 8;
- next if !$confmode;
- $call = uc $call;
- next if DXCluster->get_exact($call); # we already have this (loop?)
+ next unless $call && $confmode && defined $here && is_callsign($call);
+ my $ref = DXCluster->get_exact($call);
+ if ($ref) {
+ if ($ref->isa('DXNode')) {
+ dbg('chan', "LOOP: $call is a node");
+ next;
+ }
+ my $rcall = $ref->call;
+ dbg('chan', "LOOP: already have $call on $rcall");
+ next;
+ }
$confmode = $confmode eq '*';
DXNodeuser->new($self, $node, $call, $confmode, $here);
$confmode = $confmode eq '*';
DXNodeuser->new($self, $node, $call, $confmode, $here);
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
# add it to the node table if it isn't present and it's
# connected locally
$node = DXNode->new($dxchan, $field[2], 0, 1, 5400);
- broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
- return;
+ dbg('chan', "$field[2] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
if ($node->dxchan != $self) {
dbg('chan', "LOOP: $field[2] came in on wrong channel");
return;
if ($node->dxchan != $self) {
dbg('chan', "LOOP: $field[2] came in on wrong channel");
return;
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
my $node = DXCluster->get_exact($call);
if ($node) {
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
my $node = DXCluster->get_exact($call);
if ($node) {
if ($call eq $self->{call}) {
dbg('chan', "LOOP: Trying to disconnect myself with PC21");
return;
if ($call eq $self->{call}) {
dbg('chan', "LOOP: Trying to disconnect myself with PC21");
return;
- if ($dxchan->{spotfilter}) {
- ($filter, $hops) = $dxchan->{spotfilter}->it(@_, $self->{call} );
+ if ($dxchan->{spotsfilter}) {
+ ($filter, $hops) = $dxchan->{spotsfilter}->it(@_, $self->{call} );
if ($dxchan->{annfilter}) {
my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
if ($dxchan->{annfilter}) {
my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);