iv-org-mirror
/
litespeed-quic
mirror of https://gitea.invidious.io/iv-org/litespeed-quic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Release 2.9.0 

- [API] Drop support for Q039.
- Improve ACK-queuing logic.  Send an ACK once in a while if
  peer keeps on sending non-ack-eliciting packets.
- Improve Alt-Svc string: Q050 and later are not included in
  the old-style "quic" string.
- Send stateless resets if connection could not be promoted.
- Schedule MAX_DATA if needed when DATA_BLOCKED is received.
- Use ls-qpack 0.11.2 -- needed for server push optimization.
- Code cleanup: handle some error cases, improve logging.
This commit is contained in:
Dmitri Tikhonov 2020-01-20 09:41:37 -05:00
parent 10c41073e4
commit fb96f4dd43
33 changed files with 251 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG
View File

@ -1,3 +1,15 @@
2020-01-20
- 2.9.0
- [API] Drop support for Q039.
- Improve ACK-queuing logic. Send an ACK once in a while if
peer keeps on sending non-ack-eliciting packets.
- Improve Alt-Svc string: Q050 and later are not included in
the old-style "quic" string.
- Send stateless resets if connection could not be promoted.
- Schedule MAX_DATA if needed when DATA_BLOCKED is received.
- Use ls-qpack 0.11.2 -- needed for server push optimization.
- Code cleanup: handle some error cases, improve logging.
2020-01-16
- 2.8.9
- [BUGFIX] Use ls-qpack 0.11.1

2
README.md
View File

@ -15,7 +15,7 @@ and OpenLiteSpeed. We think it is free of major problems. Nevertheless, do
not hesitate to report bugs back to us. Even better, send us fixes and
improvements!
Currently supported QUIC versions are Q039, Q043, Q046, Q050, ID-23, and ID-24.
Currently supported QUIC versions are Q043, Q046, Q050, ID-23, and ID-24.
Support for newer versions will be added soon after they are released.
Documentation

12
include/lsquic.h
View File

@ -24,8 +24,8 @@ extern "C" {
#endif
#define LSQUIC_MAJOR_VERSION 2
#define LSQUIC_MINOR_VERSION 8
#define LSQUIC_PATCH_VERSION 9
#define LSQUIC_MINOR_VERSION 9
#define LSQUIC_PATCH_VERSION 0
/**
* Engine flags:
@ -76,7 +76,9 @@ enum lsquic_version
* WINDOW_UPDATE frame every 20 sent packets which do not contain
* retransmittable frames.
*/
LSQVER_039,
/* Support for this version has been removed. The comment remains to
* document the changes.
*/
/*
* Q041. RST_STREAM, ACK and STREAM frames match IETF format.
@ -151,7 +153,7 @@ enum lsquic_version
};
/**
* We currently support versions 39, 43, 46, 50, and IETF Draft-23 and Draft-24
* We currently support versions 43, 46, 50, and IETF Draft-23 and Draft-24
* @see lsquic_version
*/
#define LSQUIC_SUPPORTED_VERSIONS ((1 << N_LSQVER) - 1)
@ -166,7 +168,7 @@ enum lsquic_version
#define LSQUIC_DEPRECATED_VERSIONS 0
#define LSQUIC_GQUIC_HEADER_VERSIONS ((1 << LSQVER_039) | (1 << LSQVER_043))
#define LSQUIC_GQUIC_HEADER_VERSIONS (1 << LSQVER_043)
#define LSQUIC_IETF_VERSIONS ((1 << LSQVER_ID23) | (1 << LSQVER_ID24) \
| (1 << LSQVER_VERNEG))

6
src/liblsquic/gen-verstrs.pl
View File

@ -14,8 +14,10 @@ open OUT, ">$outfile"
while (<HEADER>) {
if (/^enum lsquic_version$/ .. /^}/) {
if (/^\s*(LSQVER_0*(\d+)),\s*$/ && $1 ne 'LSQVER_098') {
push @enums, $1;
push @versions, $2;
if ($2 < 50) {
push @enums, $1;
push @versions, $2;
}
push @all_versions, $1;
push @all_alpns, "h3-Q0$2";
}

2
src/liblsquic/ls-qpack

@ -1 +1 @@
Subproject commit 7ab7949a2b63272c6e28c9e86cb97dcbc1f02d0e
Subproject commit c9aec0353776d98a371deff7c3f675a4bea190bd

4
src/liblsquic/lsquic_enc_sess_ietf.c
View File

@ -18,6 +18,8 @@
#include <openssl/rand.h>
#include <openssl/ssl.h>
#include "fiu-local.h"
#include "lsquic_types.h"
#include "lsquic_hkdf.h"
#include "lsquic.h"
@ -681,6 +683,8 @@ iquic_esfi_create_client (const char *hostname,
{
struct enc_sess_iquic *enc_sess;
fiu_return_on("enc_sess_ietf/create_client", NULL);
enc_sess = calloc(1, sizeof(*enc_sess));
if (!enc_sess)
return NULL;

2
src/liblsquic/lsquic_engine.c
View File

@ -2517,9 +2517,9 @@ process_connections (lsquic_engine_t *engine, conn_iter_f next_conn,
STAILQ_INSERT_TAIL(&new_full_conns, new_conn, cn_next_new_full);
new_conn->cn_last_sent = engine->last_sent;
eng_hist_inc(&engine->history, now, sl_new_full_conns);
conn->cn_flags |= LSCONN_PROMOTED;
}
tick_st |= TICK_CLOSE; /* Destroy mini connection */
conn->cn_flags |= LSCONN_PROMOTED;
}
if (tick_st & TICK_SEND)
{

3
src/liblsquic/lsquic_full_conn.c
View File

@ -3327,9 +3327,6 @@ full_conn_ci_tick (lsquic_conn_t *lconn, lsquic_time_t now)
if (have_delayed_packets)
lsquic_send_ctl_reset_packnos(&conn->fc_send_ctl);
/* ACK frame generation fails with an error if it does not fit into
* a single packet (it always should fit).
*/
generate_ack_frame(conn);
CLOSE_IF_NECESSARY();

208
src/liblsquic/lsquic_full_conn_ietf.c
View File

@ -14,6 +14,8 @@
#include <openssl/rand.h>
#include "fiu-local.h"
#include "lsquic.h"
#include "lsquic_types.h"
#include "lsquic_int_types.h"
@ -73,6 +75,7 @@
#include "lsquic_logger.h"
#define MAX_RETR_PACKETS_SINCE_LAST_ACK 2
#define MAX_ANY_PACKETS_SINCE_LAST_ACK 20
#define ACK_TIMEOUT (TP_DEF_MAX_ACK_DELAY * 1000)
#define INITIAL_CHAL_TIMEOUT 25000
@ -327,6 +330,7 @@ struct ietf_full_conn
struct lsquic_packet_in *);
/* Number ackable packets received since last ACK was sent: */
unsigned ifc_n_slack_akbl[N_PNS];
unsigned ifc_n_slack_all; /* App PNS only */
uint64_t ifc_ecn_counts_in[N_PNS][4];
uint64_t ifc_ecn_counts_out[N_PNS][4];
lsquic_stream_id_t ifc_max_req_id;
@ -389,6 +393,7 @@ struct ietf_full_conn
*/
lsquic_time_t ifc_idle_to;
lsquic_time_t ifc_ping_period;
uint64_t ifc_last_max_data_off_sent;
struct ack_info ifc_ack;
};
@ -430,6 +435,8 @@ ietf_full_conn_ci_n_avail_streams (const struct lsquic_conn *);
static const lsquic_cid_t *
ietf_full_conn_ci_get_log_cid (const struct lsquic_conn *);
static void
ietf_full_conn_ci_destroy (struct lsquic_conn *);
static unsigned
highest_bit_set (unsigned sz)
@ -963,7 +970,7 @@ lsquic_ietf_full_conn_client_new (struct lsquic_engine_public *enpub,
conn = calloc(1, sizeof(*conn));
if (!conn)
return NULL;
goto err0;
now = lsquic_time_now();
/* Set the flags early so that correct CID is used for logging */
conn->ifc_conn.cn_flags |= LSCONN_IETF;
@ -971,10 +978,7 @@ lsquic_ietf_full_conn_client_new (struct lsquic_engine_public *enpub,
conn->ifc_conn.cn_n_cces = sizeof(conn->ifc_cces)
/ sizeof(conn->ifc_cces[0]);
if (!ietf_full_conn_add_scid(conn, enpub, CCE_USED, now))
{
free(conn);
return NULL;
}
goto err1;
assert(versions);
versions &= LSQUIC_IETF_VERSIONS;
@ -998,18 +1002,12 @@ lsquic_ietf_full_conn_client_new (struct lsquic_engine_public *enpub,
if (0 != ietf_full_conn_init(conn, enpub, flags,
enpub->enp_settings.es_ecn))
{
free(conn);
return NULL;
}
goto err2;
if (token)
{
if (0 != lsquic_send_ctl_set_token(&conn->ifc_send_ctl, token,
token_sz))
{
free(conn);
return NULL;
}
goto err2;
}
/* Do not infer anything about server limits before processing its
@ -1057,36 +1055,20 @@ lsquic_ietf_full_conn_client_new (struct lsquic_engine_public *enpub,
zero_rtt, zero_rtt_sz, &conn->ifc_alset,
conn->ifc_max_streams_in[SD_UNI]);
if (!conn->ifc_conn.cn_enc_session)
{
/* TODO: free other stuff */
free(conn);
return NULL;
}
goto err2;
conn->ifc_u.cli.crypto_streams[ENC_LEV_CLEAR] = lsquic_stream_new_crypto(
ENC_LEV_CLEAR, &conn->ifc_pub, &lsquic_cry_sm_if,
conn->ifc_conn.cn_enc_session,
SCF_IETF|SCF_DI_AUTOSWITCH|SCF_CALL_ON_NEW|SCF_CRITICAL);
if (!conn->ifc_u.cli.crypto_streams[ENC_LEV_CLEAR])
{
/* TODO: free other stuff */
free(conn);
return NULL;
}
goto err3;
if (!lsquic_stream_get_ctx(conn->ifc_u.cli.crypto_streams[ENC_LEV_CLEAR]))
{
/* TODO: free other stuff */
free(conn);
return NULL;
}
goto err4;
conn->ifc_pub.packet_out_malo =
lsquic_malo_create(sizeof(struct lsquic_packet_out));
if (!conn->ifc_pub.packet_out_malo)
{
lsquic_stream_destroy(conn->ifc_u.cli.crypto_streams[ENC_LEV_CLEAR]);
free(conn);
return NULL;
}
goto err4;
conn->ifc_flags |= IFC_PROC_CRYPTO;
LSQ_DEBUG("negotiating version %s",
@ -1095,6 +1077,19 @@ lsquic_ietf_full_conn_client_new (struct lsquic_engine_public *enpub,
LSQ_DEBUG("logging using %s SCID",
LSQUIC_LOG_CONN_ID == CN_SCID(&conn->ifc_conn) ? "client" : "server");
return &conn->ifc_conn;
err4:
lsquic_stream_destroy(conn->ifc_u.cli.crypto_streams[ENC_LEV_CLEAR]);
err3:
conn->ifc_conn.cn_esf.i->esfi_destroy(conn->ifc_conn.cn_enc_session);
err2:
lsquic_send_ctl_cleanup(&conn->ifc_send_ctl);
if (conn->ifc_pub.all_streams)
lsquic_hash_destroy(conn->ifc_pub.all_streams);
err1:
free(conn);
err0:
return NULL;
}
@ -1111,7 +1106,7 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
struct lsquic_packet_out *packet_out;
struct lsquic_packet_in *packet_in;
struct conn_cid_elem *cce;
int have_errors, have_outgoing_ack;
int have_outgoing_ack;
lsquic_packno_t next_packno;
lsquic_time_t now;
packno_set_t set;
@ -1120,7 +1115,7 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
conn = calloc(1, sizeof(*conn));
if (!conn)
return NULL;
goto err0;
now = lsquic_time_now();
conn->ifc_conn.cn_cces = conn->ifc_cces;
conn->ifc_conn.cn_n_cces = sizeof(conn->ifc_cces)
@ -1151,23 +1146,14 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
if (0 != ietf_full_conn_init(conn, enpub, flags,
lsquic_mini_conn_ietf_ecn_ok(imc)))
{
free(conn);
return NULL;
}
goto err1;
conn->ifc_pub.packet_out_malo =
lsquic_malo_create(sizeof(struct lsquic_packet_out));
if (!conn->ifc_pub.packet_out_malo)
{
/* XXX: deinit conn? */
free(conn);
return NULL;
}
goto err1;
if (imc->imc_flags & IMC_IGNORE_INIT)
conn->ifc_flags |= IFC_IGNORE_INIT;
conn->ifc_conn.cn_flags |= mini_conn->cn_flags &
LSCONN_PEER_GOING_AWAY /* XXX what is this for, again? Was copied */;
conn->ifc_paths[0].cop_path = imc->imc_path;
conn->ifc_paths[0].cop_flags = COP_VALIDATED;
conn->ifc_used_paths = 1 << 0;
@ -1199,13 +1185,13 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
conn->ifc_u.ser.ifser_flags |= IFSER_PUSH_ENABLED;
if (flags & IFC_HTTP)
{
fiu_do_on("full_conn_ietf/promise_hash", goto promise_alloc_failed);
conn->ifc_pub.u.ietf.promises = lsquic_hash_create();
#if FIU_ENABLE
promise_alloc_failed:
#endif
if (!conn->ifc_pub.u.ietf.promises)
{
/* XXX: deinit conn? */
free(conn);
return NULL;
}
goto err2;
}
assert(mini_conn->cn_flags & LSCONN_HANDSHAKE_DONE);
@ -1236,7 +1222,6 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
* been lost. We take ownership of all packets in mc_packets_out; those
* that are not on the list are recorded in fc_send_ctl.sc_senhist.
*/
have_errors = 0;
have_outgoing_ack = 0;
next_packno = ~0ULL;
while ((packet_out = TAILQ_FIRST(&imc->imc_packets_out)))
@ -1254,12 +1239,11 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
LSQ_DEBUG("got sent packet_out %"PRIu64" from mini",
packet_out->po_packno);
if (0 != lsquic_send_ctl_sent_packet(&conn->ifc_send_ctl,
packet_out)
&& !have_errors /* Warn once */)
packet_out))
{
++have_errors;
LSQ_WARN("could not add packet %"PRIu64" to sent set: %s",
packet_out->po_packno, strerror(errno));
goto err2;
}
}
else
@ -1292,16 +1276,14 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
conn->ifc_last_live_update = now;
/* TODO: do something if there are errors */
LSQ_DEBUG("Calling on_new_conn callback");
conn->ifc_conn_ctx = conn->ifc_enpub->enp_stream_if->on_new_conn(
conn->ifc_enpub->enp_stream_if_ctx, &conn->ifc_conn);
/* TODO: do something if there is outgoing ACK */
/* TODO: check return valuee */ (void)
handshake_ok(&conn->ifc_conn);
if (0 != handshake_ok(&conn->ifc_conn))
goto err3;
lsquic_alarmset_set(&conn->ifc_alset, AL_IDLE,
imc->imc_created + conn->ifc_idle_to);
@ -1317,6 +1299,20 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
LSQ_DEBUG("logging using %s SCID",
LSQUIC_LOG_CONN_ID == CN_SCID(&conn->ifc_conn) ? "server" : "client");
return &conn->ifc_conn;
err3:
ietf_full_conn_ci_destroy(&conn->ifc_conn);
return NULL;
err2:
lsquic_malo_destroy(conn->ifc_pub.packet_out_malo);
err1:
lsquic_send_ctl_cleanup(&conn->ifc_send_ctl);
if (conn->ifc_pub.all_streams)
lsquic_hash_destroy(conn->ifc_pub.all_streams);
free(conn);
err0:
return NULL;
}
@ -1409,6 +1405,8 @@ generate_ack_frame_for_pns (struct ietf_full_conn *conn,
}
conn->ifc_n_slack_akbl[pns] = 0;
if (PNS_APP == pns)
conn->ifc_n_slack_all = 0;
conn->ifc_flags &= ~(IFC_ACK_QUED_INIT << pns);
lsquic_alarmset_unset(&conn->ifc_alset, AL_ACK_INIT + pns);
lsquic_send_ctl_sanity_check(&conn->ifc_send_ctl);
@ -1499,6 +1497,7 @@ generate_max_data_frame (struct ietf_full_conn *conn)
lsquic_send_ctl_incr_pack_sz(&conn->ifc_send_ctl, packet_out, w);
packet_out->po_frame_types |= QUIC_FTBIT_MAX_DATA;
conn->ifc_send_flags &= ~SF_SEND_MAX_DATA;
conn->ifc_last_max_data_off_sent = offset;
}
@ -1837,7 +1836,7 @@ generate_max_stream_data_frame (struct ietf_full_conn *conn,
lsquic_send_ctl_incr_pack_sz(&conn->ifc_send_ctl, packet_out, sz);
packet_out->po_frame_types |= 1 << QUIC_FRAME_MAX_STREAM_DATA;
lsquic_stream_max_stream_data_sent(stream);
return 0;
return 1;
}
@ -1867,7 +1866,7 @@ generate_stream_blocked_frame (struct ietf_full_conn *conn,
lsquic_send_ctl_incr_pack_sz(&conn->ifc_send_ctl, packet_out, sz);
packet_out->po_frame_types |= 1 << QUIC_FRAME_STREAM_BLOCKED;
lsquic_stream_blocked_frame_sent(stream);
return 0;
return 1;
}
@ -2704,6 +2703,8 @@ handshake_ok (struct lsquic_conn *lconn)
uint64_t limit;
char buf[0x200];
fiu_return_on("full_conn_ietf/handshake_ok", -1);
/* Need to set this flag even we hit an error in the rest of this funciton.
* This is because this flag is used to calculate packet out header size
*/
@ -3006,7 +3007,8 @@ ietf_full_conn_ci_push_stream (struct lsquic_conn *lconn, void *hset,
enum lsqpack_enc_status enc_st;
enum lsquic_header_status header_st;
unsigned i, name_idx, n_header_sets;
int own_hset;
int own_hset, stx_tab_id;
const unsigned hpack_static_table_size = 61;
unsigned char discard[2];
if (!ietf_full_conn_ci_is_push_enabled(lconn)
@ -3130,9 +3132,13 @@ ietf_full_conn_ci_push_stream (struct lsquic_conn *lconn, void *hset,
header < all_headers[i].headers + all_headers[i].count;
++header)
{
name_idx = 0; /* TODO: lsqpack_enc_get_stx_tab_id(header->name.iov_base,
stx_tab_id = lsqpack_get_stx_tab_id(header->name.iov_base,
header->name.iov_len, header->value.iov_base,
header->value.iov_len); */
header->value.iov_len);
if (stx_tab_id >= 0)
name_idx = hpack_static_table_size + 1 + stx_tab_id;
else
name_idx = 0;
header_st = conn->ifc_enpub->enp_hsi_if->hsi_process_header(hset,
name_idx,
header->name.iov_base, header->name.iov_len,
@ -3827,7 +3833,7 @@ process_ack (struct ietf_full_conn *conn, struct ack_info *acki,
{
pns = acki->pns;
packno = lsquic_send_ctl_largest_ack2ed(&conn->ifc_send_ctl, pns);
/* FIXME TODO zero is a valid packet number */
/* It's OK to skip valid packno 0: the alternative is too expensive */
if (packno)
lsquic_rechist_stop_wait(&conn->ifc_rechist[ pns ], packno + 1);
/* ACK of 1-RTT packet indicates that handshake has been confirmed: */
@ -5056,13 +5062,16 @@ process_stream_blocked_frame (struct ietf_full_conn *conn,
if (parsed_len < 0)
return 0;
EV_LOG_CONN_EVENT(LSQUIC_LOG_CONN_ID, "STREAM_BLOCKED frame in: stream "
"%"PRIu64"; offset %"PRIu64, stream_id, peer_off);
LSQ_DEBUG("received STREAM_BLOCKED frame: stream %"PRIu64
"; offset %"PRIu64, stream_id, peer_off);
if (conn_is_send_only_stream(conn, stream_id))
{
ABORT_QUIETLY(0, TEC_STREAM_STATE_ERROR, "received BLOCKED frame "
"on send-only stream %"PRIu64, stream_id);
ABORT_QUIETLY(0, TEC_STREAM_STATE_ERROR,
"received STREAM_BLOCKED frame on send-only stream %"PRIu64,
stream_id);
return 0;
}
@ -5111,15 +5120,38 @@ static unsigned
process_blocked_frame (struct ietf_full_conn *conn,
struct lsquic_packet_in *packet_in, const unsigned char *p, size_t len)
{
uint64_t off;
uint64_t peer_off, last_off;
int parsed_len;
parsed_len = conn->ifc_conn.cn_pf->pf_parse_blocked_frame(p, len, &off);
parsed_len = conn->ifc_conn.cn_pf->pf_parse_blocked_frame(p, len,
&peer_off);
if (parsed_len < 0)
return 0;
LSQ_DEBUG("received BLOCKED frame: offset %"PRIu64, off);
/* XXX Try to do something? */
EV_LOG_CONN_EVENT(LSQUIC_LOG_CONN_ID, "BLOCKED frame in: offset %"PRIu64,
peer_off);
LSQ_DEBUG("received BLOCKED frame: offset %"PRIu64, peer_off);
if (conn->ifc_last_max_data_off_sent)
last_off = conn->ifc_last_max_data_off_sent;
else
last_off = lsquic_cfcw_get_max_recv_off(&conn->ifc_pub.cfcw);
/* Same logic as in lsquic_stream_peer_blocked() */
if (peer_off > last_off && !(conn->ifc_send_flags & SF_SEND_MAX_DATA))
{
conn->ifc_send_flags |= SF_SEND_MAX_DATA;
LSQ_DEBUG("marked to send MAX_DATA frame");
}
else if (conn->ifc_send_flags & SF_SEND_MAX_DATA)
LSQ_DEBUG("MAX_STREAM_DATA frame is already scheduled");
else if (conn->ifc_last_max_data_off_sent)
LSQ_DEBUG("MAX_DATA(%"PRIu64") has already been either "
"packetized or sent", conn->ifc_last_max_data_off_sent);
else
LSQ_INFO("Peer should have received transport param limit "
"of %"PRIu64"; odd", last_off);
return parsed_len;
}
@ -5327,21 +5359,43 @@ parse_regular_packet (struct ietf_full_conn *conn,
}
/* From [draft-ietf-quic-transport-24] Section 13.2.1:
* " An endpoint MUST NOT send a non-ack-eliciting packet in response
* " to a non-ack-eliciting packet, even if there are packet gaps
* " which precede the received packet.
*
* To ensure that we always send an ack-eliciting packet in this case, we
* check that there are frames that are about to be written.
*/
static int
many_in_and_will_write (struct ietf_full_conn *conn)
{
return conn->ifc_n_slack_all > MAX_ANY_PACKETS_SINCE_LAST_ACK
&& (conn->ifc_send_flags
|| !TAILQ_EMPTY(&conn->ifc_pub.sending_streams)
|| !TAILQ_EMPTY(&conn->ifc_pub.write_streams))
;
}
static void
try_queueing_ack (struct ietf_full_conn *conn, enum packnum_space pns,
int was_missing, lsquic_time_t now)
{
lsquic_time_t srtt, ack_timeout;
if (conn->ifc_n_slack_akbl[pns] >= MAX_RETR_PACKETS_SINCE_LAST_ACK ||
((conn->ifc_flags & IFC_ACK_HAD_MISS) && was_missing))
if (conn->ifc_n_slack_akbl[pns] >= MAX_RETR_PACKETS_SINCE_LAST_ACK
|| ((conn->ifc_flags & IFC_ACK_HAD_MISS)
&& was_missing && conn->ifc_n_slack_akbl[pns] > 0)
|| (PNS_APP == pns && many_in_and_will_write(conn)))
{
lsquic_alarmset_unset(&conn->ifc_alset, AL_ACK_INIT + pns);
lsquic_send_ctl_sanity_check(&conn->ifc_send_ctl);
conn->ifc_flags |= IFC_ACK_QUED_INIT << pns;
LSQ_DEBUG("%s ACK queued: ackable: %u; had_miss: %d; "
LSQ_DEBUG("%s ACK queued: ackable: %u; all: %u; had_miss: %d; "
"was_missing: %d",
lsquic_pns2str[pns], conn->ifc_n_slack_akbl[pns],
conn->ifc_n_slack_all,
!!(conn->ifc_flags & IFC_ACK_HAD_MISS), was_missing);
}
else if (conn->ifc_n_slack_akbl[pns] > 0)
@ -5730,6 +5784,7 @@ process_regular_packet (struct ietf_full_conn *conn,
}
else
was_missing = 0;
conn->ifc_n_slack_all += PNS_APP == pns;
try_queueing_ack(conn, pns, was_missing, packet_in->pi_received);
}
conn->ifc_incoming_ecn <<= 1;
@ -6057,10 +6112,6 @@ ietf_full_conn_ci_tick (struct lsquic_conn *lconn, lsquic_time_t now)
if (have_delayed_packets)
lsquic_send_ctl_reset_packnos(&conn->ifc_send_ctl);
/* ACK frame generation fails with an error if it does not fit into
* a single packet (it always should fit).
* XXX Is this still true?
*/
n = generate_ack_frame(conn, now);
CLOSE_IF_NECESSARY();
@ -6523,7 +6574,6 @@ ietf_full_conn_ci_record_addrs (struct lsquic_conn *lconn, void *peer_ctx,
return first_unused - conn->ifc_paths;
}
/* XXX TODO Revisit this logic! */
if (first_unvalidated || first_other)
{
victim = first_unvalidated ? first_unvalidated : first_other;

6
src/liblsquic/lsquic_parse.h
View File

@ -298,14 +298,14 @@ struct parse_funcs
};
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q039;
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q043;
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q046;
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q050;
extern const struct parse_funcs lsquic_parse_funcs_ietf_v1;
#define select_pf_by_ver(ver) ( \
(1 << (ver)) & ((1 << LSQVER_039)|(1 << LSQVER_043)) ? \
&lsquic_parse_funcs_gquic_Q039 : \
(1 << (ver)) & (1 << LSQVER_043) ? \
&lsquic_parse_funcs_gquic_Q043 : \
(1 << (ver)) & (1 << LSQVER_046) ? \
&lsquic_parse_funcs_gquic_Q046 : \
(1 << (ver)) & ((1 << LSQVER_050)|LSQUIC_EXPERIMENTAL_Q098) ? \

4
src/liblsquic/lsquic_parse_gquic_be.c
View File

@ -1,7 +1,7 @@
/* Copyright (c) 2017 - 2020 LiteSpeed Technologies Inc. See LICENSE. */
/*
* lsquic_parse_gquic_be.c -- Parsing functions specific to big-endian
* (Q039 and higher) GQUIC.
* (now only Q043) GQUIC.
*/
#include <assert.h>
@ -1010,7 +1010,7 @@ gquic_be_packno_info (const struct lsquic_conn *lconn,
}
const struct parse_funcs lsquic_parse_funcs_gquic_Q039 =
const struct parse_funcs lsquic_parse_funcs_gquic_Q043 =
{
.pf_gen_reg_pkt_header = gquic_be_gen_reg_pkt_header,
.pf_parse_packet_in_finish = gquic_be_parse_packet_in_finish,

2
src/liblsquic/lsquic_pr_queue.c
View File

@ -169,7 +169,7 @@ prq_create (unsigned max_elems, unsigned max_conns,
}
const lsquic_cid_t cid = { .len = 8, };
pf = select_pf_by_ver(LSQVER_039);
pf = select_pf_by_ver(LSQVER_043);
len = lsquic_gquic_gen_ver_nego_pkt(prq->prq_verneg_g_buf,
sizeof(prq->prq_verneg_g_buf), &cid,
enpub->enp_settings.es_versions);

5
src/liblsquic/lsquic_stream.c
View File

@ -26,6 +26,8 @@
#include <sys/queue.h>
#include <stddef.h>
#include "fiu-local.h"
#include "lsquic.h"
#include "lsquic_int_types.h"
@ -460,6 +462,8 @@ lsquic_stream_new_crypto (enum enc_level enc_level,
assert(ctor_flags & SCF_CRITICAL);
fiu_return_on("stream/new_crypto", NULL);
stream_id = ~0ULL - enc_level;
stream = stream_new_common(stream_id, conn_pub, stream_if,
stream_if_ctx, ctor_flags);
@ -3940,6 +3944,7 @@ lsquic_stream_set_priority (lsquic_stream_t *stream, unsigned priority)
lsquic_stream_ctx_t *
lsquic_stream_get_ctx (const lsquic_stream_t *stream)
{
fiu_return_on("stream/get_ctx", NULL);
return stream->st_ctx;
}

2
src/liblsquic/lsquic_version.c
View File

@ -8,7 +8,6 @@
static const unsigned char version_tags[N_LSQVER][4] =
{
[LSQVER_039] = { 'Q', '0', '3', '9', },
[LSQVER_043] = { 'Q', '0', '4', '3', },
[LSQVER_046] = { 'Q', '0', '4', '6', },
[LSQVER_050] = { 'Q', '0', '5', '0', },
@ -47,7 +46,6 @@ lsquic_tag2ver (uint32_t ver_tag)
const char *const lsquic_ver2str[N_LSQVER] = {
[LSQVER_039] = "Q039",
[LSQVER_043] = "Q043",
[LSQVER_046] = "Q046",
[LSQVER_050] = "Q050",

2
test/unittests/mini_parse.c
View File

@ -58,7 +58,7 @@ main (int argc, char **argv)
lsquic_packet_in_t packet_in;
unsigned char buf[0x1000];
ssize_t packet_sz;
enum lsquic_version ver = LSQVER_039;
enum lsquic_version ver = LSQVER_043;
memset(&enpub, 0, sizeof(enpub));
lsquic_mm_init(&enpub.enp_mm);

2
test/unittests/test_ackgen_gquic_be.c
View File

@ -17,7 +17,7 @@
#include "lsquic_logger.h"
#include "lsquic.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
static void
test1 (void) /* Inverse of quic_framer_test.cc -- NewAckFrameOneAckBlock */

2
test/unittests/test_ackparse_gquic_be.c
View File

@ -17,7 +17,7 @@
static struct lsquic_conn lconn = LSCONN_INITIALIZER_CIDLEN(lconn, 0);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
static lsquic_packno_t

7
test/unittests/test_alt_svc_ver.c
View File

@ -10,8 +10,9 @@ int
main (void)
{
assert(0 == strcmp("", lsquic_get_alt_svc_versions(0xF000))); /* Invalid bits ignored and no crash */
assert(0 == strcmp("39", lsquic_get_alt_svc_versions(B(LSQVER_039))));
assert(0 == strcmp("39,43", lsquic_get_alt_svc_versions(B(LSQVER_039)|B(LSQVER_043))));
assert(0 == strcmp("39,43", lsquic_get_alt_svc_versions(0xFF0000|B(LSQVER_039)|B(LSQVER_043))));
assert(0 == strcmp("43", lsquic_get_alt_svc_versions(B(LSQVER_043))));
assert(0 == strcmp("43,46", lsquic_get_alt_svc_versions(B(LSQVER_046)|B(LSQVER_043))));
assert(0 == strcmp("43,46", lsquic_get_alt_svc_versions(0xFF0000|B(LSQVER_046)|B(LSQVER_043))));
assert(0 == strcmp("46", lsquic_get_alt_svc_versions(B(LSQVER_046)|B(LSQVER_050))));
return 0;
}

2
test/unittests/test_blocked_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
/* The test is both for generation and parsing: */

2
test/unittests/test_conn_close_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
struct conn_close_parse_test {

2
test/unittests/test_elision.c
View File

@ -26,7 +26,7 @@
#include "lsquic_logger.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
static struct {
unsigned char buf[0x1000];

2
test/unittests/test_goaway_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
struct goaway_parse_test {

2
test/unittests/test_packno_len.c
View File

@ -14,7 +14,7 @@
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
struct packno_bits_test {

46
test/unittests/test_parse_packet_in.c
View File

@ -46,13 +46,13 @@ static const struct parse_packet_in_test tests[] = {
/* Flags: */ PACKET_PUBLIC_FLAGS_VERSION|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 1 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -69,13 +69,13 @@ static const struct parse_packet_in_test tests[] = {
0x10 /* 2-byte packet number */|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73, 0x64,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 2 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -92,13 +92,13 @@ static const struct parse_packet_in_test tests[] = {
0x20 /* 4-byte packet number */|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73, 0x64, 0x55, 0x46,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 4 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -115,13 +115,13 @@ static const struct parse_packet_in_test tests[] = {
0x30 /* 6-byte packet number */|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73, 0x64, 0x55, 0x46, 0x37, 0x28,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 6 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -135,13 +135,13 @@ static const struct parse_packet_in_test tests[] = {
{ .ppit_lineno = __LINE__, /* Same as above minus connection ID */
.ppit_buf = {
/* Flags: */ PACKET_PUBLIC_FLAGS_VERSION,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 0 + 4 + 1 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = 0,
.ppit_conn_id = 0,
@ -160,7 +160,7 @@ static const struct parse_packet_in_test tests[] = {
},
.ppit_bufsz = 1 + 0 + 0 + 1 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = 0,
.ppit_conn_id = 0,
@ -176,13 +176,13 @@ static const struct parse_packet_in_test tests[] = {
/* Flags: */ PACKET_PUBLIC_FLAGS_VERSION|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = -1,
},
@ -201,7 +201,7 @@ static const struct parse_packet_in_test tests[] = {
},
.ppit_bufsz = 1 + 8 + 32+ 2 + 7,
.ppit_is_server = 0,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -226,7 +226,7 @@ static const struct parse_packet_in_test tests[] = {
},
.ppit_bufsz = 1 + 8 + 32+ 1 + 7,
.ppit_is_server = 0,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -244,13 +244,13 @@ static const struct parse_packet_in_test tests[] = {
PACKET_PUBLIC_FLAGS_NONCE| /* Nonce flag is ignored by server */
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73, 0x64, 0x55, 0x46,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 4 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -267,13 +267,13 @@ static const struct parse_packet_in_test tests[] = {
PACKET_PUBLIC_FLAGS_NONCE| /* Nonce flag is ignored by server */
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 1 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -291,13 +291,13 @@ static const struct parse_packet_in_test tests[] = {
PACKET_PUBLIC_FLAGS_NONCE| /* Nonce flag is ignored by server */
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Version: */ 'Q', '0', '3', '9',
/* Version: */ 'Q', '0', '4', '3',
/* Packet #: */ 0x73, 0x64, 0x55, 0x46, 0x37, 0x28,
/* Payload: */ 'P', 'A', 'Y', 'L', 'O', 'A', 'D',
},
.ppit_bufsz = 1 + 8 + 4 + 6 + 7,
.ppit_is_server = 1,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,
@ -314,11 +314,11 @@ static const struct parse_packet_in_test tests[] = {
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
/* CID: */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55,
/* Versions: */ 'Q', '0', '4', '0',
'Q', '0', '3', '9',
'Q', '0', '4', '3',
},
.ppit_bufsz = 1 + 8 + 8,
.ppit_is_server = 0,
.ppit_version = LSQVER_039,
.ppit_version = LSQVER_043,
.ppit_retval = 0,
.ppit_pi_flags = PI_CONN_ID,
.ppit_conn_id = 0x5500000000000000,

2
test/unittests/test_quic_be_floats.c
View File

@ -12,7 +12,7 @@
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
struct float_test {
uint64_t long_time;

24
test/unittests/test_reg_pkt_headergen.c
View File

@ -44,7 +44,7 @@ struct test {
static const struct test tests[] = {
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NULL,
@ -61,7 +61,7 @@ static const struct test tests[] = {
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NULL,
@ -78,13 +78,13 @@ static const struct test tests[] = {
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NULL,
.packno = 0x09,
.bits = GQUIC_PACKNO_LEN_1,
.ver.buf= { 'Q', '0', '3', '9', },
.ver.buf= { 'Q', '0', '4', '3', },
.len = 1 + 8 + 4 + 0 + 1,
.out = { (0 << 2) /* Nonce present */
| 0x01 /* Version present */
@ -92,7 +92,7 @@ static const struct test tests[] = {
| 0x00 /* Packet number length */
,
0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, /* Connection ID */
'Q', '0', '3', '9',
'Q', '0', '4', '3',
0x09, /* Packet number */
},
},
@ -101,7 +101,7 @@ static const struct test tests[] = {
#define NONCENSE_BYTES '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v'
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NONCENSE,
@ -119,7 +119,7 @@ static const struct test tests[] = {
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0, /* Do not set connection ID */
.nonce = NONCENSE,
@ -135,13 +135,13 @@ static const struct test tests[] = {
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NONCENSE,
.packno = 0x00,
.bits = GQUIC_PACKNO_LEN_1,
.ver.buf= { 'Q', '0', '3', '9', },
.ver.buf= { 'Q', '0', '4', '3', },
.len = 1 + 8 + 4 + 32 + 1,
.out = { (1 << 2) /* Nonce present */
| 0x01 /* Version present */
@ -149,14 +149,14 @@ static const struct test tests[] = {
| 0x00 /* Packet number length */
,
0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, /* Connection ID */
'Q', '0', '3', '9',
'Q', '0', '4', '3',
NONCENSE_BYTES,
0x00, /* Packet number */
},
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NONCENSE,
@ -174,7 +174,7 @@ static const struct test tests[] = {
},
{
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.bufsz = GQUIC_MAX_PUBHDR_SZ,
.cid = 0x0102030405060708UL,
.nonce = NONCENSE,

2
test/unittests/test_rst_stream_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
/* The test is both for generation and parsing: */

2
test/unittests/test_stop_waiting_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
struct parse_test {

4
test/unittests/test_stream.c
View File

@ -51,7 +51,7 @@
#include "lsquic_hq.h"
#include "lsquic_data_in_if.h"
static const struct parse_funcs *g_pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *g_pf = select_pf_by_ver(LSQVER_043);
static int g_use_crypto_ctor;
@ -2266,7 +2266,7 @@ test_changing_pack_size (void)
assert(("on_close called", 1 == n_closed));
deinit_test_objs(&tobjs);
}
g_pf = select_pf_by_ver(LSQVER_039);
g_pf = select_pf_by_ver(LSQVER_043);
}

22
test/unittests/test_streamgen.c
View File

@ -46,7 +46,7 @@ static const struct test tests[] = {
* Big-endian:
*/
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 1, },
.offset = 0x0807060504030201UL,
.stream_id = 0x210,
@ -67,7 +67,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0x0807060504030201UL,
.stream_id = 0x210,
@ -88,7 +88,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 1, 0, },
.offset = 0x0807060504030201UL,
.stream_id = 0x210,
@ -109,7 +109,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 1, 0, },
.offset = 0x0807060504030201UL,
.stream_id = 0x21,
@ -130,7 +130,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0x77,
.stream_id = 0x210,
@ -151,7 +151,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0x0,
.stream_id = 0x210,
@ -172,7 +172,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 1, },
.offset = 0x0,
.stream_id = 0x210,
@ -193,7 +193,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0xFFFFFF,
.stream_id = 0x210,
@ -214,7 +214,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0xFFFFFF + 1,
.stream_id = 0x210,
@ -235,7 +235,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 0, 0, },
.offset = 0xFFFFFF + 1,
.stream_id = 0x210,
@ -255,7 +255,7 @@ static const struct test tests[] = {
},
{ .lineno = __LINE__,
.pf = select_pf_by_ver(LSQVER_039),
.pf = select_pf_by_ver(LSQVER_043),
.fin = { 1, 0, },
.offset = 0xB4,
.stream_id = 0x01,

20
test/unittests/test_streamparse.c
View File

@ -37,7 +37,7 @@ static const struct test tests[] = {
*/
{ "Balls to the wall: every possible bit is set",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x40 | 0x20 | 0x1C | 0x3,
@ -57,7 +57,7 @@ static const struct test tests[] = {
{ "Balls to the wall #2: every possible bit is set, except FIN",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x20 | 0x1C | 0x3,
@ -77,7 +77,7 @@ static const struct test tests[] = {
{ "Data length is zero",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x40 | 0x00 | 0x1C | 0x3,
@ -97,7 +97,7 @@ static const struct test tests[] = {
{ "Stream ID length is 1",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x40 | 0x20 | 0x1C | 0x0,
@ -117,7 +117,7 @@ static const struct test tests[] = {
{ "All bits are zero save offset length",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x00 | 0x04 | 0x0,
@ -137,7 +137,7 @@ static const struct test tests[] = {
{ "Sanity check: either FIN must be set or data length is not zero #1",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x00 | 0x04 | 0x0,
@ -159,7 +159,7 @@ static const struct test tests[] = {
{ "Sanity check: either FIN must be set or data length is not zero #2",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x20 | 0x04 | 0x0,
@ -179,7 +179,7 @@ static const struct test tests[] = {
{ "Sanity check: either FIN must be set or data length is not zero #3",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x40 | 0x20 | 0x04 | 0x0,
@ -199,7 +199,7 @@ static const struct test tests[] = {
{ "Check data bounds #1",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x20 | 0x04 | 0x0,
@ -219,7 +219,7 @@ static const struct test tests[] = {
{ "Check data bounds #2",
__LINE__,
select_pf_by_ver(LSQVER_039),
select_pf_by_ver(LSQVER_043),
/* 1 f d ooo ss 1fdoooss */
/* TYPE FIN DLEN OLEN SLEN */
{ 0x80 | 0x00 | 0x20 | 0x04 | 0x0,

28
test/unittests/test_ver_nego.c
View File

@ -40,46 +40,32 @@ static const struct gen_ver_nego_test tests[] = {
{ .gvnt_lineno = __LINE__,
.gvnt_cid = 0x0102030405060708UL,
.gvnt_versions = (1 << LSQVER_039),
.gvnt_gen_ver = LSQVER_039,
.gvnt_bufsz = 13,
.gvnt_len = 13,
.gvnt_buf = {
PACKET_PUBLIC_FLAGS_VERSION|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, /* Connection ID */
'Q', '0', '3', '9',
},
},
{ .gvnt_lineno = __LINE__,
.gvnt_cid = 0x0102030405060708UL,
.gvnt_versions = (1 << LSQVER_039),
.gvnt_gen_ver = LSQVER_039,
.gvnt_versions = (1 << LSQVER_043),
.gvnt_gen_ver = LSQVER_043,
.gvnt_bufsz = 12,
.gvnt_len = -1, /* Buffer size is too small */
},
{ .gvnt_lineno = __LINE__,
.gvnt_cid = 0x0102030405060708UL,
.gvnt_versions = (1 << LSQVER_039) | (1 << N_LSQVER),
.gvnt_gen_ver = LSQVER_039,
.gvnt_versions = (1 << LSQVER_043) | (1 << N_LSQVER),
.gvnt_gen_ver = LSQVER_043,
.gvnt_bufsz = 20,
.gvnt_len = -1, /* Invalid version specified in the bitmask */
},
{ .gvnt_lineno = __LINE__,
.gvnt_cid = 0x0102030405060708UL,
.gvnt_versions = (1 << LSQVER_039) | (1 << LSQVER_043),
.gvnt_gen_ver = LSQVER_039,
.gvnt_versions = (1 << LSQVER_043) | (1 << LSQVER_046),
.gvnt_gen_ver = LSQVER_043,
.gvnt_bufsz = 17,
.gvnt_len = 17,
.gvnt_buf = {
PACKET_PUBLIC_FLAGS_VERSION|
PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID,
0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, /* Connection ID */
'Q', '0', '3', '9',
'Q', '0', '4', '3',
'Q', '0', '4', '6',
},
},

2
test/unittests/test_wuf_gquic_be.c
View File

@ -11,7 +11,7 @@
#include "lsquic_types.h"
#include "lsquic_parse.h"
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_039);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_043);
/* The test is both for generation and parsing: */