X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=7f52a461fafc952e0906c07b8ac8bfd873880685;hb=refs%2Fheads%2Fnewpc92timings;hp=bb5f7ad0b91135871b3bcafd5c4def0fc300529d;hpb=61cdf7dc2b72c1898850a4d2aa403d712f22f8ee;p=spider.git diff --git a/cmd/announce.pl b/cmd/announce.pl index bb5f7ad0..7f52a461 100644 --- a/cmd/announce.pl +++ b/cmd/announce.pl @@ -10,48 +10,69 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # # Modified 13Dec98 Iain Phillips G0RDI # my ($self, $line) = @_; +#$DB::single = 1; my @f = split /\s+/, $line; - +return (1, $self->msg('e5')) if $self->remotecmd || $self->inscript; return (1, $self->msg('e9')) if !@f; +return (1, $self->msg('e28')) unless $self->registered; my $sort = uc $f[0]; -my @locals = DXCommandmode->get_all(); -my $to; +my $to = '*'; my $from = $self->call; my $t = ztime(time); my $tonode; +my $toflag = '*'; my $sysopflag; +my $via = 'LOCAL'; if ($sort eq "FULL") { $line =~ s/^$f[0]\s+//; # remove it - $to = "ALL"; + $via = $to = "*"; } elsif ($sort eq "SYSOP") { $line =~ s/^$f[0]\s+//; # remove it - @locals = map { $_->priv >= 5 ? $_ : () } @locals; $to = "SYSOP"; - $sysopflag = '*'; + $via = $sysopflag = '*'; } elsif ($sort eq "LOCAL") { $line =~ s/^$f[0]\s+//; # remove it - $to = "LOCAL"; -} else { - $to = "LOCAL"; } -# change ^ into : for transmission -$line =~ s/\^/:/og; +# if this is a 'bad spotter' user then ignore it +my $nossid = $from; +my $drop = 0; +$nossid =~ s/-\d+$//; +if ($DXProt::badspotter->in($nossid)) { + LogDbg('DXCommand', "bad spotter ($self->{call}) made announcement: $line"); + $drop++; +} -Log('ann', $to, $from, $line); -DXProt::broadcast_list("To $to de $from <$t>: $line", @locals); -if ($to ne "LOCAL") { - $line =~ s/\^//og; # remove ^ characters! - my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0); - DXProt::broadcast_ak1a($pc); +# have they sworn? +my @bad; +if (@bad = BadWords::check($line)) { + $self->badcount(($self->badcount||0) + @bad); + LogDbg('DXCommand', "$self->{call} swore: $line (with words:" . join(',', @bad) . ")"); + $drop++; } +if ($drop) { + Log('ann', $to, $from, "[to $from only] $line"); + $self->send("To $to de $from: $line"); + return (1, ()); +} + +#return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line); +Log('ann', $to, $from, $line); +$main::me->normal(DXProt::pc93($to, $from, $via, $line)); + +#DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals); +#if ($to ne "LOCAL") { +# my $pc = DXProt::pc12($from, $line, $tonode, $sysopflag, 0); +# DXChannel::broadcast_nodes($pc); +#} + return (1, ());