# remember type of connection
$self->{consort} = $line;
$self->{outbound} = $sort eq 'O';
- $self->{priv} = $user->priv;
- $self->{lang} = $user->lang;
+ $self->{priv} = $user->priv || 1; # other clusters can always be 'normal' users
+ $self->{lang} = $user->lang || 'en';
$self->{isolate} = $user->{isolate};
$self->{consort} = $line; # save the connection type
$self->{here} = 1;
return unless $pcno;
return if $pcno < 10 || $pcno > 99;
- # dump bad protocol messages unless it is a PC29
- if ($line =~ /\%[0-9A-F][0-9A-F]/o && $pcno != 29) {
+ # dump bad protocol messages
+ if ($line =~ /\%[01][0-9A-F]/) {
dbg('chan', "CORRUPT protocol message - dumped");
return;
}
SWITCH: {
if ($pcno == 10) { # incoming talk
+ unless (is_callsign($field[1]) && is_callsign($field[2]) && is_callsign($field[6])) {
+ dbg('chan', "Corrupt talk, rejected");
+ return;
+ }
# is it for me or one of mine?
- my $call = ($field[5] gt ' ') ? $field[5] : $field[2];
- if ($call eq $main::mycall || grep $_ eq $call, DXChannel::get_all_user_calls()) {
-
- # yes, it is
- my $text = unpad($field[3]);
- Log('talk', $call, $field[1], $field[6], $text);
- $call = $main::myalias if $call eq $main::mycall;
- my $ref = DXChannel->get($call);
- $ref->send("$call de $field[1]: $text") if $ref && $ref->{talk};
+ my ($to, $via, $call, $dxchan);
+ if ($field[5] gt ' ') {
+ $call = $via = $field[2];
+ $to = $field[5];
+ unless (is_callsign($to)) {
+ dbg('chan', "Corrupt talk, rejected");
+ return;
+ }
+ } else {
+ $call = $to = $field[2];
+ }
+ if ($dxchan = DXChannel->get($call)) {
+ $dxchan->talk($field[1], $to, $via, $field[3]);
} else {
$self->route($field[2], $line); # relay it on its way
}
if ($pcno == 11 || $pcno == 26) { # dx spot
+ # are any of the callsign fields invalid?
+ unless ($field[2] !~ m/[^A-Z0-9\-\/]/ && is_callsign($field[6]) && is_callsign($field[7])) {
+ dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
+ return;
+ }
+ if ($field[1] =~ m/[^0-9\.]/) {
+ dbg('chan', "Spot frequency not numeric, rejected");
+ return;
+ }
+
# route 'foreign' pc26s
if ($pcno == 26) {
if ($field[7] ne $main::mycall) {
dbg('chan', "Bad DX spot, ignored");
return;
}
-
- # are any of the crucial fields invalid?
- if ($field[2] =~ /(?:^\s*$|[a-z])/ || $field[6] =~ /(?:^\s*$|[a-z])/ || $field[7] =~ /(?:^\s*$|[a-z])/) {
- dbg('chan', "Spot contains lower case callsigns or blanks, rejected");
- return;
- }
# do some de-duping
$field[5] =~ s/^\s+//; # take any leading blanks off
}
if ($pcno == 12) { # announces
+ unless (is_callsign($field[1]) && is_callsign($field[2]) && is_callsign($field[5])) {
+ dbg('chan', "Corrupt announce, rejected");
+ return;
+ }
+
# announce duplicate checking
$field[3] =~ s/^\s+//; # remove leading blanks
if (AnnTalk::dup($field[1], $field[2], $field[3])) {
my $ref = DXUser->get_current($field[2]);
my $cref = DXCluster->get($field[2]);
Log('rcmd', 'in', $ref->{priv}, $field[2], $field[3]);
- unless ($field[3] =~ /rcmd/i || !$cref || !$ref || $cref->mynode->call ne $ref->homenode) { # not allowed to relay RCMDS!
+ unless (!$cref || !$ref || $cref->mynode->call ne $ref->homenode) { # not allowed to relay RCMDS!
if ($ref->{priv}) { # you have to have SOME privilege, the commands have further filtering
$self->{remotecmd} = 1; # for the benefit of any command that needs to know
my $oldpriv = $self->{priv};
my $dxchan = DXChannel->get($s->{call});
$dxchan->send($field[3]) if $dxchan;
delete $rcmds{$field[2]} if !$dxchan;
+ } else {
+ # send unsolicited ones to the sysop
+ my $dxchan = DXChannel->get($main::myalias);
+ $dxchan->send($field[3]) if $dxchan;
}
} else {
my $ref = DXUser->get_current($field[1]);
my ($lat, $long) = DXBearing::stoll($field[3]);
$user->lat($lat);
$user->long($long);
- my $qra = $user->qra || DXBearing::lltoqra($lat, $long);
- $qra = DXBearing::lltoqra($lat, $long) unless $qra && DXBearing::is_qra($qra);
- $user->qra($qra) if $qra ne $user->qra;
+ $user->qra(DXBearing::lltoqra($lat, $long)) unless $user->qra && DXBearing::is_qra($user->qra);
} elsif ($field[2] == 4) {
$user->homenode($field[3]);
}
$dxchan = DXChannel->get($s->{call});
$dxchan->send($field[4]) if $dxchan;
delete $rcmds{$field[2]} if !$dxchan;
+ } else {
+ # send unsolicited ones to the sysop
+ my $dxchan = DXChannel->get($main::myalias);
+ $dxchan->send($field[4]) if $dxchan;
}
}
} else {
} elsif ($dxchan->is_user && $dxchan->{dx}) {
my $buf = Spot::formatb($dxchan->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
} elsif ($dxchan->is_user && $dxchan->{wwv}) {
my $buf = "WWV de $_[6] <$_[1]>: SFI=$_[2], A=$_[3], K=$_[4], $_[5]";
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
} elsif ($dxchan->is_user && $dxchan->{wcy}) {
my $buf = "WCY de $_[10] <$_[1]> : K=$_[4] expK=$_[5] A=$_[3] R=$_[6] SFI=$_[2] SA=$_[7] GMF=$_[8] Au=$_[9]";
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
next if $target eq 'SYSOP' && $dxchan->{priv} < 5;
my $buf = "$to$target de $_[0]: $text";
$buf .= "\a\a" if $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($buf);
} else {
$dxchan->delay($buf);
$s =~ s/\a//og unless $dxchan->{beep};
- if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'convers') {
+ if ($dxchan->{state} eq 'prompt' || $dxchan->{state} eq 'talk') {
$dxchan->send($s);
} else {
$dxchan->delay($s);
$self->SUPER::disconnect;
}
+
+# check that a field only has callsign characters in it
+sub is_callsign
+{
+ return $_[0] !~ /[^A-Z0-9\-]/
+}
+
+#
+# send a talk message to this thingy
+#
+sub talk
+{
+ my ($self, $from, $to, $via, $line) = @_;
+
+ $line =~ s/\^/\\5E/g; # remove any ^ characters
+ $self->send(DXProt::pc10($from, $to, $via, $line));
+ Log('talk', $self->call, $from, $via?$via:$main::mycall, $line);
+}
1;
__END__
projects / spider.git / blobdiff