projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do non blocking connects
[spider.git]
/
perl
/
DXProt.pm
diff --git
a/perl/DXProt.pm
b/perl/DXProt.pm
index 6f4b089dd1841835bedd320f8b0b979e0c98a5b6..fd47a28a2860afa87f393bc2bc4e309793076272 100644
(file)
--- a/
perl/DXProt.pm
+++ b/
perl/DXProt.pm
@@
-236,13
+236,10
@@
sub start
# send initialisation string
unless ($self->{outbound}) {
# send initialisation string
unless ($self->{outbound}) {
-# $self->send(pc38()) if DXNode->get_all();
$self->send(pc18());
$self->{lastping} = $main::systime;
} else {
$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);
}
$self->state('init');
$self->pc50_t(time);
@@
-358,6
+355,10
@@
sub normal
# 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
# 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;
if (Spot::dup($field[1], $field[2], $d, $field[5])) {
dbg('chan', "PCPROT: Duplicate Spot ignored\n");
return;
@@
-597,7
+598,7
@@
sub normal
dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
dbg('chan', "PCPROT: $field[2] came in on wrong channel");
return;
}
- if (
($dxchan = DXChannel->get($field[1])) && $dxchan != $self
) {
+ if (
$dxchan = DXChannel->get($field[1])
) {
dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
dbg('chan', "PCPROT: $field[1] connected locally");
return;
}
@@
-1147,7
+1148,6
@@
sub finish
{
my $self = shift;
my $call = $self->call;
{
my $self = shift;
my $call = $self->call;
- my $conn = shift;
my $ref = DXCluster->get_exact($call);
# unbusy and stop and outgoing mail
my $ref = DXCluster->get_exact($call);
# unbusy and stop and outgoing mail