# check for and dump bad protocol messages
my $n = check($pcno, @field);
if ($n) {
- dbg('chan', "bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
+ dbg('chan', "PCPROT: bad field $n, dumped (" . parray($checklist[$pcno-10]) . ")");
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[3])) {
- dbg('chan', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
return;
}
}
# if this is a 'nodx' node then ignore it
if (grep $field[7] =~ /^$_/, @DXProt::nodx_node) {
- dbg('chan', "Bad DXNode, dropped");
+ dbg('chan', "PCPROT: Bad DXNode, dropped");
return;
}
my $d = cltounix($field[3], $field[4]);
# bang out (and don't pass on) if date is invalid or the spot is too old (or too young)
if (!$d || ($pcno == 11 && ($d < $main::systime - $pc11_max_age || $d > $main::systime + 900))) {
- dbg('chan', "Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
+ dbg('chan', "PCPROT: Spot ignored, invalid date or out of range ($field[3] $field[4])\n");
return;
}
# is it 'baddx'
if (grep $field[2] eq $_, @baddx) {
- dbg('chan', "Bad DX spot, ignored");
+ dbg('chan', "PCPROT: Bad DX spot, ignored");
return;
}
# do some de-duping
$field[5] =~ s/^\s+//; # take any leading blanks off
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
- dbg('chan', "Duplicate Spot ignored\n");
+ dbg('chan', "PCPROT: Duplicate Spot ignored\n");
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[5])) {
- dbg('chan', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
return;
}
}
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
- dbg('chan', "Duplicate Announce ignored");
+ dbg('chan', "PCPROT: Duplicate Announce ignored");
return;
}
if ($censorpc) {
my @bad;
if (@bad = BadWords::check($field[3])) {
- dbg('chan', "Bad words: @bad, dropped" );
+ dbg('chan', "PCPROT: Bad words: @bad, dropped" );
return;
}
}
my ($filter, $hops) = $self->{inannfilter}->it(@field[1..6], $self->{call},
$ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq);
unless ($filter) {
- dbg('chan', "Rejected by filter");
+ dbg('chan', "PCPROT: Rejected by filter");
return;
}
}
# 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', "PCPROT: $field[1] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
}
- return unless $node; # ignore if havn't seen a PC19 for this one yet
- return unless $node->isa('DXNode');
+ if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
+ dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ return;
+ }
+ if ($field[2] eq $main::myalias && DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: trying to connect sysop from outside!");
+ return;
+ }
+ unless ($node) {
+ dbg('chan', "PCPROT: Node $field[1] not in config");
+ return;
+ }
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $field[1] is not a node");
+ return;
+ }
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[1] came in on wrong channel");
+ dbg('chan', "PCPROT: $field[1] came in on wrong channel");
return;
}
if (($dxchan = DXChannel->get($field[1])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[1] connected locally");
+ dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
my $i;
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', "PCPROT: $call is a node");
+ next;
+ }
+ my $rcall = $ref->mynode->call;
+ dbg('chan', "PCPROT: already have $call on $rcall");
+ next;
+ }
$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);
- broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ dbg('chan', "PCPROT: $field[2] no PC19 yet, autovivified as node");
+# broadcast_ak1a(pc19($dxchan, $node), $dxchan, $self) unless $dxchan->{isolate};
+ }
+ if ($field[1] eq $main::mycall || $field[2] eq $main::mycall) {
+ dbg('chan', "PCPROT: trying to alter config on this node from outside!");
+ return;
+ }
+ if ($field[1] eq $main::myalias && DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: trying to disconnect sysop from outside!");
+ return;
+ }
+ unless ($node) {
+ dbg('chan', "PCPROT: Node $field[2] not in config");
+ return;
+ }
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $field[2] is not a node");
return;
}
- return unless $node;
- return unless $node->isa('DXNode');
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $field[2] came in on wrong channel");
+ dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
- dbg('chan', "LOOP: $field[2] connected locally");
+ dbg('chan', "PCPROT: $field[2] connected locally");
return;
}
my $ref = DXCluster->get_exact($field[1]);
- $ref->del() if $ref;
+ if ($ref) {
+ $ref->del;
+ } else {
+ dbg('chan', "PCPROT: $field[1] not known" );
+ return;
+ }
last SWITCH;
}
my $call = uc $field[$i+1];
my $confmode = $field[$i+2];
my $ver = $field[$i+3];
+ next unless defined $here && defined $confmode && is_callsign($call);
$ver = 5400 if !$ver && $allowzero;
if ($node) {
my $dxchan;
if (($dxchan = DXChannel->get($call)) && $dxchan != $self) {
- dbg('chan', "LOOP: $call connected locally");
+ dbg('chan', "PCPROT: $call connected locally");
}
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $call come in on wrong channel");
+ dbg('chan', "PCPROT: $call come in on wrong channel");
next;
}
- dbg('chan', "already have $call");
+ my $rcall = $node->mynode->call;
+ dbg('chan', "PCPROT: already have $call on $rcall");
next;
}
if ($call ne $main::mycall) { # don't allow malicious buggers to disconnect me!
my $node = DXCluster->get_exact($call);
if ($node) {
+ unless ($node->isa('DXNode')) {
+ dbg('chan', "PCPROT: $call is not a node");
+ return;
+ }
if ($call eq $self->{call}) {
- dbg('chan', "LOOP: Trying to disconnect myself with PC21");
+ dbg('chan', "PCPROT: Trying to disconnect myself with PC21");
return;
}
if ($node->dxchan != $self) {
- dbg('chan', "LOOP: $call come in on wrong channel");
+ dbg('chan', "PCPROT: $call come in on wrong channel");
return;
}
my $dxchan;
if ($dxchan = DXChannel->get($call)) {
- dbg('chan', "LOOP: $call connected locally");
+ dbg('chan', "PCPROT: $call connected locally");
return;
}
$node->del();
} else {
- dbg('chan', "$call not in table, dropped");
+ dbg('chan', "PCPROT: $call not in table, dropped");
return;
}
+ } else {
+ dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
+ return;
}
last SWITCH;
}
my ($r) = $field[6] =~ /R=(\d+)/;
$r = 0 unless $r;
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "WWV Date ($field[1] $field[2]) out of range");
+ dbg('chan', "PCPROT: WWV Date ($field[1] $field[2]) out of range");
return;
}
if (Geomag::dup($d,$sfi,$k,$i,$field[6])) {
- dbg('chan', "Dup WWV Spot ignored\n");
+ dbg('chan', "PCPROT: Dup WWV Spot ignored\n");
return;
}
$field[7] =~ s/-\d+$//o; # remove spotter's ssid
return;
}
if ($field[2] eq $main::mycall) {
- dbg('chan', "Trying to merge to myself, ignored");
+ dbg('chan', "PCPROT: Trying to merge to myself, ignored");
return;
}
}
if ($pcno == 39) { # incoming disconnect
- $self->disconnect(1);
+ if ($field[1] eq $self->{call}) {
+ $self->disconnect(1);
+ } else {
+ dbg('chan', "PCPROT: came in on wrong channel");
+ }
return;
}
if ($pcno == 41) { # user info
# add this station to the user database, if required
my $user = DXUser->get_current($field[1]);
- if (!$user) {
- # then try without an SSID
- $field[1] =~ s/-\d+$//o;
- $user = DXUser->get_current($field[1]);
- }
$user = DXUser->new($field[1]) if !$user;
if ($field[2] == 1) {
# do some de-duping
my $d = cltounix($field[1], sprintf("%02d18Z", $field[2]));
if (($pcno == 23 && $d < $main::systime - $pc23_max_age) || $d > $main::systime + 1500 || $field[2] < 0 || $field[2] > 23) {
- dbg('chan', "WCY Date ($field[1] $field[2]) out of range");
+ dbg('chan', "PCPROT: WCY Date ($field[1] $field[2]) out of range");
return;
}
@field = map { unpad($_) } @field;
if (WCY::dup($d,@field[3..7])) {
- dbg('chan', "Dup WCY Spot ignored\n");
+ dbg('chan', "PCPROT: Dup WCY Spot ignored\n");
return;
}
if ($dxchan->{annfilter}) {
my ($ann_dxcc, $ann_itu, $ann_cq, $org_dxcc, $org_itu, $org_cq) = (0..0);
- my @dxcc = Prefix::extract($_[1]);
+ my @dxcc = Prefix::extract($_[0]);
if (@dxcc > 0) {
$ann_dxcc = $dxcc[1]->dxcc;
$ann_itu = $dxcc[1]->itu;
$ann_cq = $dxcc[1]->cq;
}
- @dxcc = Prefix::extract($_[5]);
+ @dxcc = Prefix::extract($_[4]);
if (@dxcc > 0) {
$org_dxcc = $dxcc[1]->dxcc;
$org_itu = $dxcc[1]->itu;
my ($self, $call, $line) = @_;
if (ref $self && $call eq $self->{call}) {
- dbg('chan', "Trying to route back to source, dropped");
+ dbg('chan', "PCPROT: Trying to route back to source, dropped");
return;
}
projects / spider.git / blobdiff