Skip to content

Commit

Permalink
Release 2.23.1
Browse files Browse the repository at this point in the history
- [BUGFIX] Regression introduced in 2.22.0: use correct number of
  PNSs for IETF mini conn during promotion.
  • Loading branch information
Dmitri Tikhonov committed Oct 13, 2020
1 parent a3e1f0d commit f198a02
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 9 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
2020-10-13
- 2.23.0
- 2.23.1
- [FEATURE] IETF Client 0-RTT support.
- [BUGFIX] Do not schedule MTU probe on first tick.
- [BUGFIX] Parsing DATAGRAM frame.
- [BUGFIX] If push promise fails, do not invoke hset destructor.
- [BUGFIX] Client: When connections are IDed by port number, check DCID.
Fixes issue #176.
- [BUGFIX] Regression introduced in 2.22.0: use correct number of
PNSs for IETF mini conn during promotion.
- Revert the 2.22.1 lsquic_is_valid_hs_packet change. All that was
necessary is a change to the way we call it in lsquic_engine. No
change to the function itself is required.
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# The short X.Y version
version = u'2.23'
# The full version, including alpha/beta/rc tags
release = u'2.23.0'
release = u'2.23.1'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion include/lsquic.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern "C" {

#define LSQUIC_MAJOR_VERSION 2
#define LSQUIC_MINOR_VERSION 23
#define LSQUIC_PATCH_VERSION 0
#define LSQUIC_PATCH_VERSION 1

/**
* Engine flags:
Expand Down
4 changes: 4 additions & 0 deletions src/liblsquic/lsquic_conn.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
#include <ws2ipdef.h>
#endif

#ifndef LSQUIC_TEST
#define LSQUIC_TEST 0
#endif

struct lsquic_conn;
struct lsquic_engine_public;
struct lsquic_packet_out;
Expand Down
15 changes: 9 additions & 6 deletions src/liblsquic/lsquic_full_conn_ietf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1561,12 +1561,15 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
for (pns = 0; pns < IMICO_N_PNS; ++pns)
{
lsquic_imico_rechist_init(&mini_rechist, imc, pns);
if (0 != lsquic_rechist_copy_ranges(&conn->ifc_rechist[pns],
&mini_rechist, lsquic_imico_rechist_first,
lsquic_imico_rechist_next))
goto err2;
conn->ifc_rechist[pns].rh_largest_acked_received
if (pns < IMICO_N_PNS)
{
if (0 != lsquic_rechist_copy_ranges(&conn->ifc_rechist[pns],
&mini_rechist, lsquic_imico_rechist_first,
lsquic_imico_rechist_next))
goto err2;
conn->ifc_rechist[pns].rh_largest_acked_received
= imc->imc_largest_recvd[pns];
}
}

/* Mini connection sends out packets 0, 1, 2... and so on. It deletes
Expand Down Expand Up @@ -1620,7 +1623,7 @@ lsquic_ietf_full_conn_server_new (struct lsquic_engine_public *enpub,
* to add packet renumbering logic to the mini conn.
*/

for (pns = 0; pns < N_PNS; ++pns)
for (pns = 0; pns < IMICO_N_PNS; ++pns)
for (i = 0; i < 4; ++i)
{
conn->ifc_ecn_counts_in[pns][i] = imc->imc_ecn_counts_in[pns][i];
Expand Down
4 changes: 4 additions & 0 deletions src/liblsquic/lsquic_hpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
#ifndef LSQUIC_HPI
#define LSQUIC_HPI 1

#ifndef LSQUIC_TEST
#define LSQUIC_TEST 0
#endif

struct lsquic_conn_public;

/* We add 1 to the urgency when we place them on hpi_streams. Critical
Expand Down
1 change: 1 addition & 0 deletions src/liblsquic/lsquic_mini_conn_ietf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1616,6 +1616,7 @@ void
lsquic_imico_rechist_init (struct ietf_mini_rechist *rechist,
const struct ietf_mini_conn *conn, enum packnum_space pns)
{
assert(pns < IMICO_N_PNS);
rechist->conn = conn;
rechist->pns = pns;
if (conn->imc_flags & IMC_TRECHIST)
Expand Down
3 changes: 3 additions & 0 deletions src/liblsquic/lsquic_rechist.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#ifndef LSQUIC_RECHIST_H
#define LSQUIC_RECHIST_H 1

#ifndef LSQUIC_TEST
#define LSQUIC_TEST 0
#endif

/* Structure is exposed to facilitate some manipulations in unit tests. */
struct rechist_elem {
Expand Down

0 comments on commit f198a02

Please sign in to comment.