X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fkill.pl;h=de533bdcabad29f3f276dadf89ced44f21bb5ceb;hb=3247ce7494a464650729cc66472de4be4c571b5b;hp=c2062ba4bd69e0327ad98fac206f5e1b66f75279;hpb=3eb722692c2c1e9de84752391d5b6330e062c7e6;p=spider.git diff --git a/cmd/kill.pl b/cmd/kill.pl index c2062ba4..de533bdc 100644 --- a/cmd/kill.pl +++ b/cmd/kill.pl @@ -40,7 +40,7 @@ while (@f) { my $from = $1; my $to = $2; @refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs; - @refs = grep { $_->msgno >= $from && $_->msgno < $to } @refs; + @refs = grep { $_->msgno >= $from && $_->msgno <= $to } @refs; } elsif ($f =~ /^fr/io) { $f = shift @f; if ($f) { @@ -64,8 +64,10 @@ while (@f) { foreach $ref ( @refs) { Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call"); if ($full) { - DXProt::broadcast_ak1a(DXProt::pc49($ref->{from}, $ref->{subject}), $DXProt::me); + DXChannel::broadcast_nodes(DXProt::pc49($ref->{from}, $ref->{subject}), $main::me); } + my $tonode = $ref->tonode; + $ref->stop_msg($tonode) if $tonode; $ref->del_msg; push @out, $self->msg('m12', $ref->msgno); }