From 5ff976586b8e6c39ce4d4d0874271893d27e7699 Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Mon, 8 Jul 2019 16:12:38 +0200 Subject: [PATCH] quic: update quicly library Update quicly to latest version that includes our upstreamed patch. Change-Id: I0b26c72e49bce81daf4fb069b5818defd6cf25b9 Type: feature Signed-off-by: Aloys Augustin --- build/external/packages/quicly.mk | 4 ++-- .../patches/quicly_0.0.2-vpp/0002-close-update-now.patch | 12 ------------ .../0001-cmake-install.patch | 0 src/plugins/quic/quic.c | 8 ++++---- 4 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch rename build/external/patches/{quicly_0.0.2-vpp => quicly_0.0.3-vpp}/0001-cmake-install.patch (100%) diff --git a/build/external/packages/quicly.mk b/build/external/packages/quicly.mk index 222039f1a88..e4926a6a277 100644 --- a/build/external/packages/quicly.mk +++ b/build/external/packages/quicly.mk @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -quicly_version := 0.0.2-vpp +quicly_version := 0.0.3-vpp quicly_tarball := quicly_$(quicly_version).tar.gz -quicly_tarball_md5sum := f370bdb69c607c0e863a8abd57adbe75 +quicly_tarball_md5sum := fa4be6d9039967b380bbf14c96e34cdc quicly_tarball_strip_dirs := 1 quicly_url := https://github.com/vpp-quic/quicly/releases/download/v$(quicly_version)/quicly_$(quicly_version).tar.gz diff --git a/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch b/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch deleted file mode 100644 index 27b54a6105b..00000000000 --- a/build/external/patches/quicly_0.0.2-vpp/0002-close-update-now.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/quicly.c b/lib/quicly.c -index fac85f2..80e1bcd 100644 ---- a/lib/quicly.c -+++ b/lib/quicly.c -@@ -3240,6 +3240,7 @@ static int initiate_close(quicly_conn_t *conn, int err, uint64_t frame_type, con - int quicly_close(quicly_conn_t *conn, int err, const char *reason_phrase) - { - assert(err == 0 || QUICLY_ERROR_IS_QUIC_APPLICATION(err)); -+ update_now(conn->super.ctx); - - return initiate_close(conn, err, QUICLY_FRAME_TYPE_PADDING /* used when err == 0 */, reason_phrase); - } diff --git a/build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch similarity index 100% rename from build/external/patches/quicly_0.0.2-vpp/0001-cmake-install.patch rename to build/external/patches/quicly_0.0.3-vpp/0001-cmake-install.patch diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index 1575f2bff5f..29cfaf3e8aa 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -85,8 +85,8 @@ quic_format_err (u8 * s, va_list * args) case QUICLY_TRANSPORT_ERROR_FLOW_CONTROL: s = format (s, "QUICLY_TRANSPORT_ERROR_FLOW_CONTROL"); break; - case QUICLY_TRANSPORT_ERROR_STREAM_ID: - s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_ID"); + case QUICLY_TRANSPORT_ERROR_STREAM_LIMIT: + s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_LIMIT"); break; case QUICLY_TRANSPORT_ERROR_STREAM_STATE: s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_STATE"); @@ -1308,8 +1308,8 @@ allocate_quicly_ctx (application_t * app, u8 is_client) quicly_ctx->event_log.cb = quicly_new_default_event_logger (stderr); quicly_ctx->transport_params.max_data = QUIC_INT_MAX; - quicly_ctx->transport_params.max_streams_uni = QUIC_INT_MAX; - quicly_ctx->transport_params.max_streams_bidi = QUIC_INT_MAX; + quicly_ctx->transport_params.max_streams_uni = (uint64_t) 1 << 60; + quicly_ctx->transport_params.max_streams_bidi = (uint64_t) 1 << 60; quicly_ctx->transport_params.max_stream_data.bidi_local = (QUIC_FIFO_SIZE - 1); /* max_enq is SIZE - 1 */ quicly_ctx->transport_params.max_stream_data.bidi_remote = (QUIC_FIFO_SIZE - 1); /* max_enq is SIZE - 1 */ quicly_ctx->transport_params.max_stream_data.uni = QUIC_INT_MAX; -- 2.16.6