%pings = (); # outstanding ping requests outbound
%rcmds = (); # outstanding rcmd requests outbound
%nodehops = (); # node specific hop control
-$censorpc = 0; # Do a BadWords::check on text fields and reject things
+$censorpc = 1; # Do a BadWords::check on text fields and reject things
# loads of 'bad things'
$baddx = new DXHash "baddx";
$badspotter = new DXHash "badspotter";
# send initialisation string
unless ($self->{outbound}) {
-# $self->send(pc38()) if DXNode->get_all();
$self->send(pc18());
$self->{lastping} = $main::systime;
} else {
- # remove from outstanding connects queue
- @main::outstanding_connects = grep {$_->{call} ne $call} @main::outstanding_connects;
- $self->{lastping} = $main::systime + $self->pingint / 2;
+ $self->{lastping} = $main::systime + ($self->pingint / 2);
}
$self->state('init');
$self->pc50_t(time);
}
# if this is a 'bad spotter' user then ignore it
- if ($badspotter->in($field[7])) {
+ if ($badspotter->in($field[6])) {
dbg('chan', "PCPROT: Bad Spotter, dropped");
return;
}
# do some de-duping
$field[5] =~ s/^\s+//; # take any leading blanks off
+ $field[2] = unpad($field[2]); # take off leading and trailing blanks from spotted callsign
+ if ($field[2] =~ /BUST\w*$/) {
+ dbg('chan', "PCPROT: useless 'BUSTED' spot");
+ return;
+ }
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "PCPROT: Duplicate Spot ignored\n");
return;
# queue up any messages (look for privates only)
DXMsg::queue_msg(1) if $self->state eq 'normal';
+# broadcast_route($line, $self, $field[1]);
+# return;
last SWITCH;
}
dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
- if (($dxchan = DXChannel->get($field[2])) && $dxchan != $self) {
- dbg('chan', "PCPROT: $field[2] connected locally");
+ if ($dxchan = DXChannel->get($field[1])) {
+ dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
my $ref = DXCluster->get_exact($field[1]);
if ($ref) {
+ if ($ref->mynode != $node) {
+ dbg('chan', "PCPROT: $field[1] came in from wrong node $field[2]");
+ return;
+ }
$ref->del;
} else {
dbg('chan', "PCPROT: $field[1] not known" );
return;
}
+# broadcast_route($line, $self, $field[2]);
+# return;
last SWITCH;
}
dbg('chan', "PCPROT: I WILL _NOT_ be disconnected!");
return;
}
+# broadcast_route($line, $self, $call);
+# return;
last SWITCH;
}
#
# finish up a pc context
#
-sub finish
+
+#
+# some active measures
+#
+sub send_route
{
my $self = shift;
- my $call = $self->call;
- my $conn = shift;
- my $ref = DXCluster->get_exact($call);
-
- # unbusy and stop and outgoing mail
- my $mref = DXMsg::get_busy($call);
- $mref->stop_msg($call) if $mref;
-
- # broadcast to all other nodes that all the nodes connected to via me are gone
- my @gonenodes = map { $_->dxchan == $self ? $_ : () } DXNode::get_all();
- my $node;
-
- foreach $node (@gonenodes) {
- next if $node->call eq $call;
- broadcast_ak1a(pc21($node->call, 'Gone') , $self) unless $self->{isolate};
- $node->del();
- }
-
- # remove outstanding pings
- delete $pings{$call};
+ my $line = shift;
+ my @dxchan = DXChannel::get_all_nodes();
+ my $dxchan;
- # now broadcast to all other ak1a nodes that I have gone
- broadcast_ak1a(pc21($call, 'Gone.'), $self) unless $self->{isolate};
-
- # I was the last node visited
- $self->user->node($main::mycall);
-
- # send info to all logged in thingies
- $self->tell_login('logoutn');
+ # send it if it isn't the except list and isn't isolated and still has a hop count
+ # taking into account filtering and so on
+ foreach $dxchan (@dxchan) {
+ my $routeit;
+ my ($filter, $hops);
- Log('DXProt', $call . " Disconnected");
- $ref->del() if $ref;
+ if ($dxchan->{routefilter}) {
+ ($filter, $hops) = $dxchan->{routefilter}->it($self->{call}, @_);
+ next unless $filter;
+ }
+ next if $dxchan == $self;
+ if ($hops) {
+ $routeit = $line;
+ $routeit =~ s/\^H\d+\^\~$/\^H$hops\^\~/;
+ } else {
+ $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name
+ next unless $routeit;
+ }
+ if ($filter) {
+ $dxchan->send($routeit) if $routeit;
+ } else {
+ $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate};
+ }
+ }
}
-#
-# some active measures
-#
sub send_dx_spot
{
my $self = shift;
# send it if it isn't the except list and isn't isolated and still has a hop count
foreach $dxchan (@dxchan) {
next if grep $dxchan == $_, @except;
+ next if $dxchan == $me;
+
my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
$dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit;
}
# send it if it isn't the except list and isn't isolated and still has a hop count
foreach $dxchan (@dxchan) {
next if grep $dxchan == $_, @except;
+ next if $dxchan == $me;
+
my $routeit = adjust_hops($dxchan, $s); # adjust its hop count by node name
$dxchan->send($routeit);
}
foreach $dxchan (@_) {
my $filter = 1;
+ next if $dxchan == $me;
if ($sort eq 'dx') {
next unless $dxchan->{dx};
sub disconnect
{
my $self = shift;
- my $nopc39 = shift;
+ my $pc39flag = shift;
+ my $call = $self->call;
- if ($self->{conn} && !$nopc39) {
+ unless ($pc39flag && $pc39flag == 1) {
$self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
}
+ # unbusy and stop and outgoing mail
+ my $mref = DXMsg::get_busy($call);
+ $mref->stop_msg($call) if $mref;
+
+ # create a list of all the nodes that have gone and delete them from the table
+ my @nodes;
+ foreach my $node (grep { $_->dxchancall eq $call } DXNode::get_all) {
+ next if $node->call eq $call;
+ next if $node->call eq $main::mycall;
+ push @nodes, $node->call;
+ $node->del;
+ }
+
+ # broadcast to all other nodes that all the nodes connected to via me are gone
+ unless ($pc39flag && $pc39flag == 2) {
+ unless ($self->{isolate}) {
+ push @nodes, $call;
+ for (@nodes) {
+ broadcast_ak1a(pc21($_, 'Gone.'), $self);
+ }
+ }
+ }
+
+ # remove this node from the tables
+ my $node = DXCluster->get_exact($call);
+ $node->del if $node;
+
+ # remove outstanding pings
+ delete $pings{$call};
+
+ # I was the last node visited
+ $self->user->node($main::mycall);
+
+ # send info to all logged in thingies
+ $self->tell_login('logoutn');
+
+ Log('DXProt', $call . " Disconnected");
+
$self->SUPER::disconnect;
}