r225 => "225 Headers follow (multi-line)\r\n",
r430 => '430 No article with that message-id',
};
-use PublicInbox::Syscall qw(EPOLLIN EPOLLONESHOT);
use Errno qw(EAGAIN);
my $ONE_MSGID = qr/\A$MID_EXTRACT\z/;
my @OVERVIEW = qw(Subject From Date Message-ID References);
OVER\r
COMPRESS DEFLATE\r
-sub greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) };
-
-sub new ($$$) {
- my ($class, $sock, $nntpd) = @_;
- my $self = bless { nntpd => $nntpd }, $class;
- my $ev = EPOLLIN;
- my $wbuf;
- if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
- return CORE::close($sock) if $! != EAGAIN;
- $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
- $wbuf = [ \&PublicInbox::DS::accept_tls_step, \&greet ];
- }
- $self->SUPER::new($sock, $ev | EPOLLONESHOT);
- if ($wbuf) {
- $self->{wbuf} = $wbuf;
- } else {
- greet($self);
- }
- $self;
+sub do_greet ($) { $_[0]->write($_[0]->{nntpd}->{greet}) };
+
+sub new {
+ my ($cls, $sock, $nntpd) = @_;
+ (bless { nntpd => $nntpd }, $cls)->greet($sock)
}
sub args_ok ($$) {
sub cmd_xgtitle ($;$) {
my ($self, $wildmat) = @_;
- more($self, '282 list of groups and descriptions follows');
+ $self->msg_more("282 list of groups and descriptions follows\r\n");
list_newsgroups($self, $wildmat);
}
for my $ngname (@window) {
my $ibx = $groups->{$ngname} or next;
my $c = eval { $ibx->uidvalidity } // time;
- more($self, "$ngname $c <$ibx->{-primary_address}>");
+ $self->msg_more("$ngname $c <$ibx->{-primary_address}>\r\n");
}
scalar(@$groupnames); # continue if there's more
}
my $ibx;
for my $ngname (@window) {
$ibx = $groups->{$ngname} and
- more($self, "$ngname ".$ibx->description);
+ $self->msg_more("$ngname ".$ibx->description."\r\n");
}
scalar(@$groupnames); # continue if there's more
}
$arg = "list_$arg";
$arg = $self->can($arg);
return r501 unless $arg && args_ok($arg, scalar @args);
- more($self, '215 information follows');
+ $self->msg_more("215 information follows\r\n");
$arg->($self, @args);
} else {
- more($self, '215 list of newsgroups follows');
+ $self->msg_more("215 list of newsgroups follows\r\n");
long_response($self, \&list_active_i, [ # copy array
@{$self->{nntpd}->{groupnames}} ]);
}
my ($self, $beg, $end) = @_;
my $r = $self->{ibx}->mm(1)->msg_range($beg, $end, 'num');
scalar(@$r) or return;
- $self->msg_more(join('', map { "$_->[0]\r\n" } @$r));
+ $self->msg_more(join("\r\n", @$r, ''));
1;
}
my ($self, $num) = @_;
my $ary = $self->{ibx}->over(1)->ids_after($num);
scalar(@$ary) or return;
- more($self, join("\r\n", @$ary));
+ $self->msg_more(join("\r\n", @$ary, ''));
1;
}
if (defined $group) {
my $res = cmd_group($self, $group);
return $res if ($res !~ /\A211 /);
- more($self, $res);
+ $self->msg_more($res .= "\r\n");
}
$self->{ibx} or return '412 no newsgroup selected';
if (defined $range) {
sub group_line ($$) {
my ($self, $ibx) = @_;
my ($min, $max) = $ibx->mm(1)->minmax;
- more($self, "$ibx->{newsgroup} $max $min n");
+ $self->msg_more("$ibx->{newsgroup} $max $min n\r\n");
}
sub newgroups_i {
return r501 if $@;
# TODO dists
- more($self, '231 list of new newsgroups follows');
+ $self->msg_more("231 list of new newsgroups follows\r\n");
long_response($self, \&newgroups_i, $ts, \(my $i = 0),
$self->{nntpd}->{groupnames});
}
my ($self, $newsgroups, $date, $time, $gmt, $dists) = @_;
my $ts = eval { parse_time($date, $time, $gmt) };
return r501 if $@;
- more($self, '230 list of new articles by message-id follows');
+ $self->msg_more("230 list of new articles by message-id follows\r\n");
my ($keep, $skip) = split(/!/, $newsgroups, 2);
ngpat2re($keep);
ngpat2re($skip);
my $r = "$code $smsg->{num} <$smsg->{mid}> article retrieved - ";
my $eml = PublicInbox::Eml->new($bref);
if ($code == 220) {
- more($self, $r .= 'head and body follow');
+ $self->msg_more($r .= "head and body follow\r\n");
msg_hdr_write($eml, $smsg);
$self->msg_more("\r\n");
msg_body_write($self, $bref);
} elsif ($code == 221) {
- more($self, $r .= 'head follows');
+ $self->msg_more($r .= "head follows\r\n");
msg_hdr_write($eml, $smsg);
} elsif ($code == 222) {
- more($self, $r .= 'body follows');
+ $self->msg_more($r .= "body follows\r\n");
msg_body_write($self, $bref);
} else {
$self->close;
sub cmd_help ($) {
my ($self) = @_;
- more($self, '100 help text follows');
+ $self->msg_more("100 help text follows\r\n");
'.'
}
out($self, " deferred[$fd] aborted - %0.6f", $elapsed);
$self->close;
} elsif ($more) { # $self->{wbuf}:
- # COMPRESS users all share the same DEFLATE context.
- # Flush it here to ensure clients don't see
- # each other's data
- $self->zflush;
-
- # no recursion, schedule another call ASAP, but only after
- # all pending writes are done. autovivify wbuf:
- my $new_size = push(@{$self->{wbuf}}, \&long_step);
-
- # wbuf may be populated by $cb, no need to rearm if so:
- $self->requeue if $new_size == 1;
+ # control passed to ibx_async_cat if $more == \undef
+ $self->requeue_once if !ref($more);
} else { # all done!
delete $self->{long_cb};
$self->write(\".\r\n");
sub xrover_i {
my ($self, $beg, $end) = @_;
my $h = over_header_for($self->{ibx}, $$beg, 'references');
- more($self, "$$beg $h") if defined($h);
+ $self->msg_more("$$beg $h\r\n") if defined($h);
$$beg++ < $end;
}
$range = $self->{article} unless defined $range;
my $r = get_range($self, $range);
return $r unless ref $r;
- more($self, '224 Overview information follows');
+ $self->msg_more("224 Overview information follows\r\n");
long_response($self, \&xrover_i, @$r);
}
my ($ibx, $n) = mid_lookup($self, $1);
defined $n or return r430;
my $smsg = $ibx->over(1)->get_art($n) or return r430;
- more($self, '224 Overview information follows (multi-line)');
+ $self->msg_more(
+ "224 Overview information follows (multi-line)\r\n");
# Only set article number column if it's the current group
# (RFC 3977 8.3.2)
my $r = get_range($self, $range);
return $r unless ref $r;
my ($beg, $end) = @$r;
- more($self, "224 Overview information follows for $$beg to $end");
+ $self->msg_more(
+ "224 Overview information follows for $$beg to $end\r\n");
long_response($self, \&xover_i, @$r);
}
undef
}
-sub zflush {} # overridden by NNTPdeflate
-
sub cmd_xpath ($$) {
my ($self, $mid) = @_;
return r501 unless $mid =~ $ONE_MSGID;
sub res ($$) { do_write($_[0], $_[1] . "\r\n") }
-sub more ($$) { $_[0]->msg_more($_[1] . "\r\n") }
-
sub do_write ($$) {
my $self = $_[0];
my $done = $self->write(\($_[1]));