mirror of
https://gitea.invidious.io/iv-org/litespeed-quic.git
synced 2024-08-15 00:53:43 +00:00
c51ce3387f
- [API Change] Sendfile-like functionality is gone. The stream no
longer opens files and deals with file descriptors. (Among other
things, this makes the code more portable.) Three writing functions
are provided:
lsquic_stream_write
lsquic_stream_writev
lsquic_stream_writef (NEW)
lsquic_stream_writef() is given an abstract reader that has function
pointers for size() and read() functions which the user can implement.
This is the most flexible way. lsquic_stream_write() and
lsquic_stream_writev() are now both implemented as wrappers around
lsquic_stream_writef().
- [OPTIMIZATION] When writing to stream, be it within or without the
on_write() callback, place data directly into packet buffer,
bypassing auxiliary data structures. This reduces amount of memory
required, for the amount of data that can be written is limited
by the congestion window.
To support writes outside the on_write() callback, we keep N
outgoing packet buffers per connection which can be written to
by any stream. One half of these are reserved for the highest
priority stream(s), the other half for all other streams. This way,
low-priority streams cannot write instead of high-priority streams
and, on the other hand, low-priority streams get a chance to send
their packets out.
The algorithm is as follows:
- When user writes to stream outside of the callback:
- If this is the highest priority stream, place it onto the
reserved N/2 queue or fail.
(The actual size of this queue is dynamic -- MAX(N/2, CWND) --
rather than N/2, allowing high-priority streams to write as
much as can be sent.)
- If the stream is not the highest priority, try to place the
data onto the reserved N/2 queue or fail.
- When tick occurs *and* more packets can be scheduled:
- Transfer packets from the high N/2 queue to the scheduled
queue.
- If more scheduling is allowed:
- Call on_write callbacks for highest-priority streams,
placing resulting packets directly onto the scheduled queue.
- If more scheduling is allowed:
- Transfer packets from the low N/2 queue to the scheduled
queue.
- If more scheduling is allowed:
- Call on_write callbacks for non-highest-priority streams,
placing resulting packets directly onto the scheduled queue
The number N is currently 20, but it could be varied based on
resource usage.
- If stream is created due to incoming headers, make headers readable
from on_new.
- Outgoing packets are no longer marked non-writeable to prevent placing
more than one STREAM frame from the same stream into a single packet.
This property is maintained via code flow and an explicit check.
Packets for stream data are allocated using a special function.
- STREAM frame elision is cheaper, as we only perform it if a reset
stream has outgoing packets referencing it.
- lsquic_packet_out_t is smaller, as stream_rec elements are now
inside a union.
456 lines
14 KiB
C
456 lines
14 KiB
C
/* Copyright (c) 2017 LiteSpeed Technologies Inc. See LICENSE. */
|
|
#include <assert.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/time.h>
|
|
|
|
#include "lsquic_types.h"
|
|
#include "lsquic_parse.h"
|
|
#include "lsquic_rechist.h"
|
|
#include "lsquic_util.h"
|
|
#include "lsquic.h"
|
|
|
|
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_037);
|
|
|
|
static lsquic_packno_t
|
|
n_acked (const ack_info_t *acki)
|
|
{
|
|
lsquic_packno_t n = 0;
|
|
unsigned i;
|
|
for (i = 0; i < acki->n_ranges; ++i)
|
|
n += acki->ranges[i].high - acki->ranges[i].low + 1;
|
|
return n;
|
|
}
|
|
|
|
|
|
static void
|
|
test1 (void)
|
|
{
|
|
/* Test taken from quic_framer_test.cc -- NewAckFrameOneAckBlock */
|
|
unsigned char ack_buf[] = {
|
|
0x45,
|
|
0x34, 0x12, /* Largest acked */
|
|
0x00, 0x00, /* Delta time */
|
|
0x34, 0x12, /* Block length */
|
|
0x00, /* Number of timestamps */
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct (8)", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 1", acki.n_ranges == 1));
|
|
assert(("Largest acked is 0x1234", acki.ranges[0].high == 0x1234));
|
|
assert(("Lowest acked is 1", acki.ranges[0].low == 1));
|
|
assert(("Number of timestamps is 0", acki.n_timestamps == 0));
|
|
unsigned n = n_acked(&acki);
|
|
assert(("Number of acked packets is 0x1234", n == 0x1234));
|
|
lsquic_packno_t ack_high = pf->pf_parse_ack_high(ack_buf, sizeof(ack_buf));
|
|
assert(0x1234 == ack_high);
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
test2 (void)
|
|
{
|
|
/* Test taken from quic_framer_test.cc -- NewAckFrameOneAckBlock */
|
|
unsigned char ack_buf[] = {
|
|
0x65,
|
|
0x34, 0x12, /* Largest acked */
|
|
0x00, 0x00, /* Zero delta time. */
|
|
0x04, /* Num ack blocks ranges. */
|
|
0x01, 0x00, /* First ack block length. */
|
|
0x01, /* Gap to next block. */
|
|
0xaf, 0x0e, /* Ack block length. */
|
|
0xff, /* Gap to next block. */
|
|
0x00, 0x00, /* Ack block length. */
|
|
0x91, /* Gap to next block. */
|
|
0xea, 0x01, /* Ack block length. */
|
|
0x05, /* Gap to next block. */
|
|
0x04, 0x00, /* Ack block length. */
|
|
0x02, /* Number of timestamps. */
|
|
0x01, /* Delta from largest observed. */
|
|
0x10, 0x32, 0x54, 0x76, /* Delta time. */
|
|
0x02, /* Delta from largest observed. */
|
|
0x10, 0x32, /* Delta time. */
|
|
};
|
|
|
|
/* We should get the following array of ranges:
|
|
* high low
|
|
* 0x1234 0x1234
|
|
* 0x1232 0x384
|
|
* 0x1F3 0xA
|
|
* 0x4 0x1
|
|
*/
|
|
static const struct { unsigned high, low; } ranges[] = {
|
|
{ 0x1234, 0x1234 },
|
|
{ 0x1232, 0x384 },
|
|
{ 0x1F3, 0xA },
|
|
{ 0x4, 0x1 },
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct (29)", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 4", acki.n_ranges == 4));
|
|
assert(("Largest acked is 0x1234", acki.ranges[0].high == 0x1234));
|
|
assert(("Number of timestamps is 2", acki.n_timestamps == 2));
|
|
unsigned n = n_acked(&acki);
|
|
assert(("Number of acked packets is 4254", n == 4254));
|
|
lsquic_packno_t ack_high = pf->pf_parse_ack_high(ack_buf, sizeof(ack_buf));
|
|
assert(0x1234 == ack_high);
|
|
|
|
for (n = 0; n < 4; ++n)
|
|
assert(("Range checks out", ranges[n].high == acki.ranges[n].high
|
|
&& ranges[n].low == acki.ranges[n].low));
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
test3 (void)
|
|
{
|
|
/* Generated by our own code, but failed to parse... */
|
|
unsigned char ack_buf[] = {
|
|
0x60, /* More than one ack block, 1 byte largest observed, 1 byte block length */
|
|
0x06, /* Largest ACKed */
|
|
0x00, 0x00, /* Delta time */
|
|
0x01, /* Num ACK block ranges */
|
|
0x01, /* First ACK block length */
|
|
0x02, /* Gap to next block */
|
|
0x03, /* Ack block length */
|
|
0x00 /* Number of timestamps */
|
|
};
|
|
|
|
/* We should get the following array of ranges:
|
|
* high low
|
|
* 6 6
|
|
* 3 1
|
|
*/
|
|
static const struct { unsigned high, low; } ranges[] = {
|
|
{ 6, 6, },
|
|
{ 3, 1, },
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct (9)", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 2", acki.n_ranges == 2));
|
|
assert(("Largest acked is 6", acki.ranges[0].high == 6));
|
|
assert(("Number of timestamps is 0", acki.n_timestamps == 0));
|
|
unsigned n = n_acked(&acki);
|
|
assert(("Number of acked packets is 4", n == 4));
|
|
lsquic_packno_t ack_high = pf->pf_parse_ack_high(ack_buf, sizeof(ack_buf));
|
|
assert(6 == ack_high);
|
|
|
|
for (n = 0; n < 2; ++n)
|
|
assert(("Range checks out", ranges[n].high == acki.ranges[n].high
|
|
&& ranges[n].low == acki.ranges[n].low));
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
test4 (void)
|
|
{
|
|
unsigned char ack_buf[] = {
|
|
0x60, /* More than one ack block, 1 byte largest observed, 1 byte block length */
|
|
0x03, /* Largest ACKed */
|
|
0x23, 0x00, /* Delta time */
|
|
0x01, /* Num ACK block ranges */
|
|
0x01, /* First ack block length */
|
|
0x01, /* Gap */
|
|
0x01, /* Ack block length */
|
|
0x00, /* Number of timestamps */
|
|
};
|
|
|
|
/* We should get the following array of ranges:
|
|
* high low
|
|
* 6 6
|
|
* 3 1
|
|
*/
|
|
static const struct { unsigned high, low; } ranges[] = {
|
|
{ 3, 3, },
|
|
{ 1, 1, },
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct (9)", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 2", acki.n_ranges == 2));
|
|
assert(("Largest acked is 3", acki.ranges[0].high == 3));
|
|
assert(("Number of timestamps is 0", acki.n_timestamps == 0));
|
|
unsigned n = n_acked(&acki);
|
|
assert(("Number of acked packets is 2", n == 2));
|
|
lsquic_packno_t ack_high = pf->pf_parse_ack_high(ack_buf, sizeof(ack_buf));
|
|
assert(3 == ack_high);
|
|
|
|
for (n = 0; n < 2; ++n)
|
|
assert(("Range checks out", ranges[n].high == acki.ranges[n].high
|
|
&& ranges[n].low == acki.ranges[n].low));
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* Four-byte packet numbers */
|
|
static void
|
|
test5 (void)
|
|
{
|
|
unsigned char ack_buf[] = {
|
|
0x60
|
|
| (2 << 2) /* Four-byte largest acked */
|
|
| (2 << 0) /* Four-byte ACK block length */
|
|
,
|
|
0x89, 0x67, 0x45, 0x23,
|
|
0x00, 0x00, /* Zero delta time. */
|
|
0x01, /* Num ack blocks ranges. */
|
|
0x01, 0x00, 0x00, 0x00, /* First ack block length. */
|
|
33 - 1, /* Gap to next block. */
|
|
0x68, 0x67, 0x45, 0x23, /* Ack block length. */
|
|
0x00, /* Number of timestamps. */
|
|
};
|
|
|
|
/* We should get the following array of ranges:
|
|
* high low
|
|
* 6 6
|
|
* 3 1
|
|
*/
|
|
static const struct { unsigned high, low; } ranges[] = {
|
|
{ 0x23456789, 0x23456789, },
|
|
{ 0x23456768, 1, },
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct (9)", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 2", acki.n_ranges == 2));
|
|
assert(("Largest acked is 0x23456789", acki.ranges[0].high == 0x23456789));
|
|
assert(("Number of timestamps is 0", acki.n_timestamps == 0));
|
|
lsquic_packno_t n = n_acked(&acki);
|
|
assert(("Number of acked packets is correct", n == 0x23456768 + 1));
|
|
|
|
for (n = 0; n < 2; ++n)
|
|
assert(("Range checks out", ranges[n].high == acki.ranges[n].high
|
|
&& ranges[n].low == acki.ranges[n].low));
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
/* Six-byte packet numbers */
|
|
static void
|
|
test6 (void)
|
|
{
|
|
unsigned char ack_buf[] = {
|
|
0x60
|
|
| (3 << 2) /* Six-byte largest acked */
|
|
| (3 << 0) /* Six-byte ACK block length */
|
|
,
|
|
0x89, 0x67, 0x45, 0x23, 0xCD, 0xAB,
|
|
0x00, 0x00, /* Zero delta time. */
|
|
0x01, /* Num ack blocks ranges. */
|
|
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* First ack block length. */
|
|
33 - 1, /* Gap to next block. */
|
|
0x68, 0x67, 0x45, 0x23, 0xCD, 0xAB, /* Ack block length. */
|
|
0x00, /* Number of timestamps. */
|
|
};
|
|
|
|
static const struct { lsquic_packno_t high, low; } ranges[] = {
|
|
{ 0xABCD23456789, 0xABCD23456789, },
|
|
{ 0xABCD23456768, 1, },
|
|
};
|
|
|
|
ack_info_t acki;
|
|
memset(&acki, 0xF1, sizeof(acki));
|
|
|
|
int len = pf->pf_parse_ack_frame(ack_buf, sizeof(ack_buf), &acki);
|
|
assert(("Parsed length is correct", len == sizeof(ack_buf)));
|
|
assert(("Number of ranges is 2", acki.n_ranges == 2));
|
|
assert(("Largest acked is 0xABCD23456789", acki.ranges[0].high == 0xABCD23456789));
|
|
assert(("Number of timestamps is 0", acki.n_timestamps == 0));
|
|
lsquic_packno_t n = n_acked(&acki);
|
|
assert(("Number of acked packets is correct", n == 0xABCD23456768 + 1));
|
|
|
|
for (n = 0; n < 2; ++n)
|
|
assert(("Range checks out", ranges[n].high == acki.ranges[n].high
|
|
&& ranges[n].low == acki.ranges[n].low));
|
|
|
|
{
|
|
size_t sz;
|
|
for (sz = 1; sz < sizeof(ack_buf); ++sz)
|
|
{
|
|
len = pf->pf_parse_ack_frame(ack_buf, sz, &acki);
|
|
assert(("Parsing truncated frame failed", len < 0));
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
test_max_ack (void)
|
|
{
|
|
lsquic_rechist_t rechist;
|
|
lsquic_time_t now;
|
|
unsigned i;
|
|
int has_missing, sz[2];
|
|
const struct lsquic_packno_range *range;
|
|
unsigned char buf[1500];
|
|
struct ack_info acki;
|
|
|
|
lsquic_rechist_init(&rechist, 12345);
|
|
now = lsquic_time_now();
|
|
|
|
for (i = 1; i <= 300; ++i)
|
|
{
|
|
lsquic_rechist_received(&rechist, i * 10, now);
|
|
now += i * 1000;
|
|
}
|
|
|
|
memset(buf, 0xAA, sizeof(buf));
|
|
|
|
sz[0] = pf->pf_gen_ack_frame(buf, sizeof(buf),
|
|
(gaf_rechist_first_f) lsquic_rechist_first,
|
|
(gaf_rechist_next_f) lsquic_rechist_next,
|
|
(gaf_rechist_largest_recv_f) lsquic_rechist_largest_recv,
|
|
&rechist, now, &has_missing);
|
|
assert(sz[0] > 0);
|
|
assert(sz[0] <= (int) sizeof(buf));
|
|
assert(has_missing);
|
|
|
|
assert(0 == buf[ sz[0] - 1 ]); /* Number of timestamps */
|
|
assert(0xAA == buf[ sz[0] ]);
|
|
|
|
sz[1] = pf->pf_parse_ack_frame(buf, sizeof(buf), &acki);
|
|
assert(sz[1] == sz[0]);
|
|
assert(256 == acki.n_ranges);
|
|
|
|
for (range = lsquic_rechist_first(&rechist), i = 0;
|
|
range && i < acki.n_ranges;
|
|
range = lsquic_rechist_next(&rechist), ++i)
|
|
{
|
|
assert(range->high == acki.ranges[i].high);
|
|
assert(range->low == acki.ranges[i].low);
|
|
}
|
|
assert(i == 256);
|
|
|
|
lsquic_rechist_cleanup(&rechist);
|
|
}
|
|
|
|
|
|
static void
|
|
test_ack_truncation (void)
|
|
{
|
|
lsquic_rechist_t rechist;
|
|
lsquic_time_t now;
|
|
unsigned i;
|
|
int has_missing, sz[2];
|
|
const struct lsquic_packno_range *range;
|
|
unsigned char buf[1500];
|
|
struct ack_info acki;
|
|
size_t bufsz;
|
|
|
|
lsquic_rechist_init(&rechist, 12345);
|
|
now = lsquic_time_now();
|
|
|
|
for (i = 1; i <= 300; ++i)
|
|
{
|
|
lsquic_rechist_received(&rechist, i * 10, now);
|
|
now += i * 1000;
|
|
}
|
|
|
|
for (bufsz = 200; bufsz < 210; ++bufsz)
|
|
{
|
|
memset(buf, 0xAA, sizeof(buf));
|
|
sz[0] = pf->pf_gen_ack_frame(buf, bufsz,
|
|
(gaf_rechist_first_f) lsquic_rechist_first,
|
|
(gaf_rechist_next_f) lsquic_rechist_next,
|
|
(gaf_rechist_largest_recv_f) lsquic_rechist_largest_recv,
|
|
&rechist, now, &has_missing);
|
|
assert(sz[0] > 0);
|
|
assert(sz[0] <= (int) bufsz);
|
|
assert(has_missing);
|
|
|
|
assert(0 == buf[ sz[0] - 1 ]); /* Number of timestamps */
|
|
assert(0xAA == buf[ sz[0] ]);
|
|
|
|
sz[1] = pf->pf_parse_ack_frame(buf, sizeof(buf), &acki);
|
|
assert(sz[1] == sz[0]);
|
|
assert(acki.n_ranges < 256);
|
|
|
|
for (range = lsquic_rechist_first(&rechist), i = 0;
|
|
range && i < acki.n_ranges;
|
|
range = lsquic_rechist_next(&rechist), ++i)
|
|
{
|
|
assert(range->high == acki.ranges[i].high);
|
|
assert(range->low == acki.ranges[i].low);
|
|
}
|
|
}
|
|
|
|
lsquic_rechist_cleanup(&rechist);
|
|
}
|
|
|
|
|
|
int
|
|
main (void)
|
|
{
|
|
lsquic_global_init(LSQUIC_GLOBAL_SERVER);
|
|
test1();
|
|
test2();
|
|
test3();
|
|
test4();
|
|
test5();
|
|
test6();
|
|
test_max_ack();
|
|
test_ack_truncation();
|
|
return 0;
|
|
}
|