quic: update quicly to v0.0.8-vpp

Type: feature

Signed-off-by: MathiasRaoul <mathias.raoul@gmail.com>
Change-Id: I7470d79d1e39716ff83ba2d2b320813d79e2554c
This commit is contained in:
MathiasRaoul
2019-12-10 10:56:20 +00:00
committed by Dave Wallace
parent 3fd9904743
commit ecb9d18c59
4 changed files with 70 additions and 8 deletions

View File

@ -11,9 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
quicly_version := 0.0.7-vpp
quicly_version := 0.0.8-vpp
quicly_tarball := quicly_$(quicly_version).tar.gz
quicly_tarball_md5sum := 2608aef70e3dc89406d3d20b71d02a4c
quicly_tarball_md5sum := 31053a9a1a015903bd1b7beb62a376c1
quicly_tarball_strip_dirs := 1
quicly_url := https://github.com/vpp-quic/quicly/releases/download/v$(quicly_version)/quicly_$(quicly_version).tar.gz

View File

@ -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")

View File

@ -16,6 +16,7 @@
#include <quic/quic.h>
#include <quicly.h>
#include <quicly/constants.h>
u8 *
quic_format_err (u8 * s, va_list * args)
@ -73,8 +74,8 @@ quic_format_err (u8 * s, va_list * args)
case QUICLY_TRANSPORT_ERROR_STREAM_STATE:
s = format (s, "QUICLY_TRANSPORT_ERROR_STREAM_STATE");
break;
case QUICLY_TRANSPORT_ERROR_FINAL_OFFSET:
s = format (s, "QUICLY_TRANSPORT_ERROR_FINAL_OFFSET");
case QUICLY_TRANSPORT_ERROR_FINAL_SIZE:
s = format (s, "QUICLY_TRANSPORT_ERROR_FINAL_SIZE");
break;
case QUICLY_TRANSPORT_ERROR_FRAME_ENCODING:
s = format (s, "QUICLY_TRANSPORT_ERROR_FRAME_ENCODING");
@ -82,14 +83,14 @@ quic_format_err (u8 * s, va_list * args)
case QUICLY_TRANSPORT_ERROR_TRANSPORT_PARAMETER:
s = format (s, "QUICLY_TRANSPORT_ERROR_TRANSPORT_PARAMETER");
break;
case QUICLY_TRANSPORT_ERROR_VERSION_NEGOTIATION:
s = format (s, "QUICLY_TRANSPORT_ERROR_VERSION_NEGOTIATION");
case QUICLY_ERROR_NO_COMPATIBLE_VERSION:
s = format (s, "QUICLY_ERROR_NO_COMPATIBLE_VERSION");
break;
case QUICLY_TRANSPORT_ERROR_PROTOCOL_VIOLATION:
s = format (s, "QUICLY_TRANSPORT_ERROR_PROTOCOL_VIOLATION");
break;
case QUICLY_TRANSPORT_ERROR_INVALID_MIGRATION:
s = format (s, "QUICLY_TRANSPORT_ERROR_INVALID_MIGRATION");
case QUICLY_TRANSPORT_ERROR_CRYPTO_BUFFER_EXCEEDED:
s = format (s, "QUICLY_TRANSPORT_ERROR_CRYPTO_BUFFER_EXCEEDED");
break;
/* picotls errors */
case QUICLY_TRANSPORT_ERROR_TLS_ALERT_BASE + PTLS_ERROR_TO_ALERT (PTLS_ALERT_CLOSE_NOTIFY):

View File

@ -28,6 +28,7 @@
#include <quic/error.h>
#include <quic/quic_crypto.h>
#include <quicly/constants.h>
#include <quicly/defaults.h>
static char *quic_error_strings[] = {