X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fannounce.pl;h=99fba14bead5711837800b187655558d83452464;hb=eba7370bb0458ae84b4815f30494a7c389008d0e;hp=a3d3fd61718b10a184591041044c1eb9b6fb817a;hpb=0c1082247c57a0ec2fa35a0a81af54b1e6ac2b89;p=spider.git diff --git a/cmd/announce.pl b/cmd/announce.pl index a3d3fd61..99fba14b 100644 --- a/cmd/announce.pl +++ b/cmd/announce.pl @@ -10,16 +10,19 @@ # # Copyright (c) 1998 Dirk Koopman G1TLH # -# $Id$ +# # # Modified 13Dec98 Iain Phillips G0RDI # my ($self, $line) = @_; +#$DB::single = 1; +my $addr = $self->hostname || '127.0.0.1'; +Log('cmd', "$self->{call}|$addr|announce|$line"); 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; +return (1, $self->msg('e28')) unless $self->isregistered; my $sort = uc $f[0]; my $to = '*'; @@ -64,9 +67,10 @@ if ($drop) { return (1, ()); } -return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line); +#return (1, $self->msg('dup')) if $self->priv < 5 && AnnTalk::dup($from, $toflag, $line); +my $ipaddr = DXCommandmode::alias_localhost($self->hostname || '127.0.0.1'); Log('ann', $to, $from, $line); -$main::me->normal(DXProt::pc93($to, $from, $via, $line)); +$main::me->normal(DXProt::pc93($to, $from, $via, $line, undef, $ipaddr)); #DXChannel::broadcast_list("To $to de $from ($t): $line\a", 'ann', undef, @locals); #if ($to ne "LOCAL") {