diff options
author | Mathias Raoul <mathias.raoul@gmail.com> | 2021-01-19 14:02:34 +0000 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2021-01-22 16:06:48 +0000 |
commit | 2e4523816ca0e366a4f597a0e5fdb93fccc887a5 (patch) | |
tree | 97c0d5b45aa98582d9e92cc9e789214cb963e7ba /build | |
parent | 06f328129a01276858fff1086215478fa106dd8e (diff) |
quic: quicly v0.1.2 update
- update quic plugin with new quicly/picotls API
- remove packet allocator
- remove crypto batching
- update picotls plugin
- add cli for quicly congestion control configuration
Type: feature
Change-Id: If76ef31c43b430eea2f7674539b2112aee0f351e
Signed-off-by: Mathias Raoul <mathias.raoul@gmail.com>
Diffstat (limited to 'build')
-rw-r--r-- | build/external/packages/quicly.mk | 6 | ||||
-rw-r--r-- | build/external/patches/quicly_0.1.2-vpp/0001-cmake-install.patch | 60 |
2 files changed, 63 insertions, 3 deletions
diff --git a/build/external/packages/quicly.mk b/build/external/packages/quicly.mk index 29abad8b56c..d1fffc9650c 100644 --- a/build/external/packages/quicly.mk +++ b/build/external/packages/quicly.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -quicly_version := 0.1.0-vpp +quicly_version := 0.1.2-vpp quicly_tarball := quicly_$(quicly_version).tar.gz -quicly_tarball_md5sum := 223f62c4dda7cbb1d907956cafcfd3f0 +quicly_tarball_md5sum := 5b184b1733ba027843ab6605d931f752 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.1.2-vpp/0001-cmake-install.patch b/build/external/patches/quicly_0.1.2-vpp/0001-cmake-install.patch new file mode 100644 index 00000000000..36148064d39 --- /dev/null +++ b/build/external/patches/quicly_0.1.2-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")
\ No newline at end of file |