diff options
| author |   MathiasRaoul <mathias.raoul@gmail.com> | 2020-01-31 10:48:40 +0000 |
|---|---|---|
| committer | MathiasRaoul <mathias.raoul@gmail.com> | 2020-01-31 10:48:40 +0000 |
| commit | 62b1cea6eda4060968f44b2639fdd756617211f4 (patch) | |
| tree | a6091696e5670f26333f7e95bc887c2ca90abd28 | |
| parent | 93975e699a89c5a99dcfb9d6b987f71d2af9c835 (diff) | |
quic: update quicly to v0.0.10-vpp
Type: feature
Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
Change-Id: I5452f8bbd0ff9e2a57f7bd7d134a8824efa5f30a
| -rw-r--r-- | build/external/packages/quicly.mk | 4 | ||||
| -rw-r--r-- | build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch | 60 | ||||
| -rw-r--r-- | src/plugins/quic/quic.c | 2 |
3 files changed, 63 insertions, 3 deletions
diff --git a/build/external/packages/quicly.mk b/build/external/packages/quicly.mk index b99b314c53c..9d6a4281c5b 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.9-vpp +quicly_version := 0.0.10-vpp quicly_tarball := quicly_$(quicly_version).tar.gz -quicly_tarball_md5sum := 3a9484fe3f840bfa42ebe3f165d675ef +quicly_tarball_md5sum := 771ba05c1724ce0b56deaaaa62eb48f1 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.10-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch new file mode 100644 index 00000000000..0ca7d2986d4 --- /dev/null +++ b/build/external/patches/quicly_0.0.10-vpp/0001-cmake-install.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5478d3..156df4c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,6 +65,8 @@ IF (WITH_DTRACE) + ENDIF () + ENDIF () + ++SET(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + ADD_LIBRARY(quicly ${QUICLY_LIBRARY_FILES}) + + ADD_CUSTOM_COMMAND( +@@ -84,6 +86,16 @@ TARGET_LINK_LIBRARIES(examples-echo quicly ${OPENSSL_LIBRARIES} ${CMAKE_DL_LIBS} + + ADD_EXECUTABLE(udpfw t/udpfw.c) + ++INSTALL ( ++ DIRECTORY ${CMAKE_SOURCE_DIR}/include/ ++ DESTINATION include ++ FILES_MATCHING PATTERN "*.h") ++ ++INSTALL(TARGETS quicly ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ + ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} WITH_DTRACE=${WITH_DTRACE} prove --exec "sh -c" -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS cli test.t) +Submodule deps/picotls contains untracked content +Submodule deps/picotls contains modified content +diff --git a/deps/picotls/CMakeLists.txt b/deps/picotls/CMakeLists.txt +index 874b9be..14411e2 100644 +--- a/deps/picotls/CMakeLists.txt ++++ b/deps/picotls/CMakeLists.txt +@@ -12,6 +12,7 @@ IF (WITH_DTRACE) + MESSAGE(STATUS "Enabling USDT support") + ENDIF () + ++SET(CMAKE_POSITION_INDEPENDENT_CODE ON) + SET(CMAKE_C_FLAGS "-std=c99 -Wall -O2 -g ${CC_WARNING_FLAGS} ${CMAKE_C_FLAGS}") + INCLUDE_DIRECTORIES( + deps/cifra/src/ext +@@ -131,6 +132,15 @@ ELSE () + MESSAGE(WARNING "Disabling OpenSSL support (requires 1.0.1 or newer)") + ENDIF () + ++INSTALL (DIRECTORY ${CMAKE_SOURCE_DIR}/include/ ++ DESTINATION include ++ FILES_MATCHING PATTERN "*.h") ++ ++INSTALL(TARGETS picotls-core picotls-openssl ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ + ADD_CUSTOM_TARGET(check env BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} prove --exec '' -v ${CMAKE_CURRENT_BINARY_DIR}/*.t t/*.t WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${TEST_EXES} cli) + + IF (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index fd848b07331..7780c141e14 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -212,7 +212,7 @@ quic_init_crypto_context (crypto_context_t * crctx, quic_ctx_t * ctx) quicly_ctx->transport_params.max_data = 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.idle_timeout = qm->connection_timeout; + quicly_ctx->transport_params.max_idle_timeout = qm->connection_timeout; app = application_get (ctx->parent_app_id); quicly_ctx->transport_params.max_stream_data.bidi_local = |