$FETCH_ATT{$att} = \%h;
}
+my $valid_range = '[0-9]+|[0-9]+:[0-9]+|[0-9]+:\*';
+$valid_range = qr/\A(?:$valid_range)(?:,(?:$valid_range))*\z/;
+
sub greet ($) {
my ($self) = @_;
my $capa = capa($self);
sub uid_fetch_cb { # called by git->cat_async via git_async_msg
my ($bref, $oid, $type, $size, $fetch_m_arg) = @_;
- my ($self, undef, $ibx, undef, undef, $msgs, $want) = @$fetch_m_arg;
+ my ($self, undef, $ibx, $msgs, undef, $want) = @$fetch_m_arg;
my $smsg = shift @$msgs or die 'BUG: no smsg';
if (!defined($oid)) {
# it's possible to have TOCTOU if an admin runs
requeue_once($self);
}
+sub range_step ($$) {
+ my ($ibx, $range_csv) = @_;
+ my ($beg, $end, $range);
+ if ($$range_csv =~ s/\A([^,]+),//) {
+ $range = $1;
+ } else {
+ $range = $$range_csv;
+ $$range_csv = undef;
+ }
+ if ($range =~ /\A([0-9]+):([0-9]+)\z/) {
+ ($beg, $end) = ($1, $2);
+ } elsif ($range =~ /\A([0-9]+):\*\z/) {
+ ($beg, $end) = ($1, $ibx->mm->max // 0);
+ } elsif ($range =~ /\A[0-9]+\z/) {
+ $beg = $end = $range;
+ } else {
+ return 'BAD fetch range';
+ }
+ [ $beg, $end, $$range_csv ];
+}
+
+sub refill_range ($$$) {
+ my ($ibx, $msgs, $range_info) = @_;
+ my ($beg, $end, $range_csv) = @$range_info;
+ if (scalar(@$msgs = @{$ibx->over->query_xover($beg, $end)})) {
+ $range_info->[0] = $msgs->[-1]->{num} + 1;
+ return;
+ }
+ return 'OK Fetch done' if !$range_csv;
+ my $next_range = range_step($ibx, \$range_csv);
+ return $next_range if !ref($next_range); # error
+ @$range_info = @$next_range;
+ undef; # keep looping
+}
+
sub uid_fetch_m { # long_response
- my ($self, $tag, $ibx, $beg, $end, $msgs, $want) = @_;
- if (!@$msgs) { # refill
- @$msgs = @{$ibx->over->query_xover($$beg, $end)};
- if (!@$msgs) {
- $self->write(\"$tag OK Fetch done\r\n");
+ my ($self, $tag, $ibx, $msgs, $range_info, $want) = @_;
+ while (!@$msgs) { # rare
+ if (my $end = refill_range($ibx, $msgs, $range_info)) {
+ $self->write(\"$tag $end\r\n");
return;
}
- $$beg = $msgs->[-1]->{num} + 1;
}
git_async_msg($ibx, $msgs->[0], \&uid_fetch_cb, \@_);
}
}
sub fetch_common ($$$$) {
- my ($self, $tag, $range, $want) = @_;
+ my ($self, $tag, $range_csv, $want) = @_;
my $ibx = $self->{ibx} or return "$tag BAD No mailbox selected\r\n";
if ($want->[0] =~ s/\A\(//s) {
$want->[-1] =~ s/\)\z//s or return "$tag BAD no rparen\r\n";
[ $_, @{$partial{$_}} ]
} sort keys %partial ];
}
-
- my ($beg, $end);
- my $msgs = [];
- if ($range =~ /\A([0-9]+):([0-9]+)\z/s) {
- ($beg, $end) = ($1, $2);
- } elsif ($range =~ /\A([0-9]+):\*\z/s) {
- ($beg, $end) = ($1, $ibx->mm->max // 0);
- } elsif ($range =~ /\A[0-9]+\z/) {
- my $smsg = $ibx->over->get_art($range) or
- return "$tag OK Fetch done\r\n"; # really OK(!)
- push @$msgs, $smsg;
- ($beg, $end) = ($range, 0);
- } else {
- return "$tag BAD fetch range\r\n";
- }
- [ $tag, $ibx, \$beg, $end, $msgs, \%want ];
+ $range_csv = 'bad' if $range_csv !~ $valid_range;
+ my $range_info = range_step($ibx, \$range_csv);
+ return "$tag $range_info\r\n" if !ref($range_info);
+ [ $tag, $ibx, [], $range_info, \%want ];
}
sub cmd_uid_fetch ($$$;@) {
- my ($self, $tag, $range, @want) = @_;
- my $args = fetch_common($self, $tag, $range, \@want);
+ my ($self, $tag, $range_csv, @want) = @_;
+ my $args = fetch_common($self, $tag, $range_csv, \@want);
ref($args) eq 'ARRAY' ?
long_response($self, \&uid_fetch_m, @$args) :
$args; # error
}
sub seq_fetch_m { # long_response
- my ($self, $tag, $ibx, $beg, $end, $msgs, $want) = @_;
- if (!@$msgs) { # refill
- @$msgs = @{$ibx->over->query_xover($$beg, $end)};
- if (!@$msgs) {
- $self->write(\"$tag OK Fetch done\r\n");
+ my ($self, $tag, $ibx, $msgs, $range_info, $want) = @_;
+ while (!@$msgs) { # rare
+ if (my $end = refill_range($ibx, $msgs, $range_info)) {
+ $self->write(\"$tag $end\r\n");
return;
}
- $$beg = $msgs->[-1]->{num} + 1;
}
my $seq = $want->{-seqno}++;
my $cur_num = $msgs->[0]->{num};
}
sub cmd_fetch ($$$;@) {
- my ($self, $tag, $range, @want) = @_;
- my $args = fetch_common($self, $tag, $range, \@want);
+ my ($self, $tag, $range_csv, @want) = @_;
+ my $args = fetch_common($self, $tag, $range_csv, \@want);
ref($args) eq 'ARRAY' ? do {
my $want = $args->[-1];
- $want->{-seqno} = ${$args->[2]}; # $$beg
+ $want->{-seqno} = $args->[3]->[0]; # $beg == $range_info->[0];
long_response($self, \&seq_fetch_m, @$args)
} : $args; # error
}
sub event_step {
my ($self) = @_;
- return unless $self->flush_write && $self->{sock};
+ return unless $self->flush_write && $self->{sock} && !$self->{long_cb};
$self->update_idle_time;
# only read more requests if we've drained the write buffer,
# otherwise we can be buffering infinitely w/o backpressure
- my $rbuf = $self->{rbuf} // (\(my $x = ''));
- my $r = 1;
-
- if (index($$rbuf, "\n") < 0) {
- my $off = length($$rbuf);
- $r = $self->do_read($rbuf, LINE_MAX, $off) or return;
- }
- while ($r > 0 && $$rbuf =~ s/\A[ \t]*([^\n]*?)\r?\n//) {
- my $line = $1;
- return $self->close if $line =~ /[[:cntrl:]]/s;
- my $t0 = now();
- my $fd = fileno($self->{sock});
- $r = eval { process_line($self, $line) };
- my $pending = $self->{wbuf} ? ' pending' : '';
- out($self, "[$fd] %s - %0.6f$pending", $line, now() - $t0);
- }
+ my $rbuf = $self->{rbuf} // \(my $x = '');
+ my $line = index($$rbuf, "\n");
+ while ($line < 0) {
+ return $self->close if length($$rbuf) >= LINE_MAX;
+ $self->do_read($rbuf, LINE_MAX, length($$rbuf)) or return;
+ $line = index($$rbuf, "\n");
+ }
+ $line = substr($$rbuf, 0, $line + 1, '');
+ $line =~ s/\r?\n\z//s;
+ return $self->close if $line =~ /[[:cntrl:]]/s;
+ my $t0 = now();
+ my $fd = fileno($self->{sock});
+ my $r = eval { process_line($self, $line) };
+ my $pending = $self->{wbuf} ? ' pending' : '';
+ out($self, "[$fd] %s - %0.6f$pending - $r", $line, now() - $t0);
return $self->close if $r < 0;
- my $len = length($$rbuf);
- return $self->close if ($len >= LINE_MAX);
$self->rbuf_idle($rbuf);
$self->update_idle_time;
# maybe there's more pipelined data, or we'll have
# to register it for socket-readiness notifications
- $self->requeue unless $self->{wbuf};
+ $self->requeue unless $pending;
}
sub compressed { undef }