8000 Version 1.8.3 by cherylsy · Pull Request #482 · alibaba/xquic · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Version 1.8.3 #482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 22, 2025
Merged

Version 1.8.3 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14033a6
[=] merge inner include
cherylsy Apr 16, 2025
5eb5e1e
[=] merge src/
cherylsy Apr 16, 2025
540d4db
[=]] merge remained
cherylsy Apr 16, 2025
191077a
[=] fix cmake diff
cherylsy Apr 17, 2025
a531875
[~] fix cmake diff
cherylsy Apr 17, 2025
9f39730
[~] bug fix for case test script on ubuntu
Apr 17, 2025
8e3ea20
[~] fix flowcontrol failure
cherylsy Apr 18, 2025
f526051
[~] fix fec scheme unit test
cherylsy Apr 18, 2025
872413d
[~] fix clog pd
cherylsy Apr 18, 2025
323f351
[=] fix massive header casetest err
cherylsy Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
SSL_TYPE_STR="boringssl"
SSL_PATH_STR="${PWD}/third_party/boringssl"
SSL_INC_PATH_STR="${PWD}/third_party/boringssl/include"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/ssl/libssl.a;${PWD}/third_party/boringssl/build/crypto/libcrypto.a"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/libssl.a;${PWD}/third_party/boringssl/build/libcrypto.a"
mkdir -p build
cd build
cmake -DGCOV=on -DCMAKE_BUILD_TYPE=Debug -DXQC_ENABLE_TESTING=1 -DXQC_PRINT_SECRET=1 -DXQC_SUPPORT_SENDMMSG_BUILD=1 -DXQC_ENABLE_EVENT_LOG=1 -DXQC_ENABLE_BBR2=1 -DXQC_ENABLE_RENO=1 -DSSL_TYPE=${SSL_TYPE_STR} -DSSL_PATH=${SSL_PATH_STR} -DXQC_ENABLE_UNLIMITED=1 -DXQC_ENABLE_COPA=1 -DXQC_COMPAT_DUPLICATE=1 -DXQC_ENABLE_FEC=1 -DXQC_ENABLE_XOR=1 -DXQC_ENABLE_RSC=1 -DXQC_ENABLE_PKM=1 ..
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
SSL_TYPE_STR="boringssl"
SSL_PATH_STR="${PWD}/third_party/boringssl"
SSL_INC_PATH_STR="${PWD}/third_party/boringssl/include"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/ssl/libssl.a;${PWD}/third_party/boringssl/build/crypto/libcrypto.a"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/libssl.a;${PWD}/third_party/boringssl/build/libcrypto.a"
mkdir -p build
cd build
cmake -DPLATFORM=mac -DSSL_TYPE=${SSL_TYPE_STR} -DSSL_PATH=${SSL_PATH_STR} -DSSL_INC_PATH=${SSL_INC_PATH_STR} -DSSL_LIB_PATH=${SSL_LIB_PATH_STR} ..
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
SSL_TYPE_STR="boringssl"
SSL_PATH_STR="${PWD}/third_party/boringssl"
SSL_INC_PATH_STR="${PWD}/third_party/boringssl/include"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/ssl/libssl.a;${PWD}/third_party/boringssl/build/crypto/libcrypto.a"
SSL_LIB_PATH_STR="${PWD}/third_party/boringssl/build/libssl.a;${PWD}/third_party/boringssl/build/libcrypto.a"
mkdir -p build
cd build
cmake -DGCOV=on -DCMAKE_BUILD_TYPE=Debug -DXQC_ENABLE_TESTING=1 -DXQC_PRINT_SECRET=1 -DXQC_SUPPORT_SENDMMSG_BUILD=1 -DXQC_ENABLE_EVENT_LOG=1 -DXQC_ENABLE_BBR2=1 -DXQC_ENABLE_RENO=1 -DSSL_TYPE=${SSL_TYPE_STR} -DSSL_PATH=${SSL_PATH_STR} -DXQC_ENABLE_UNLIMITED=1 -DXQC_ENABLE_COPA=1 -DXQC_COMPAT_DUPLICATE=1 -DXQC_ENABLE_FEC=1 -DXQC_ENABLE_XOR=1 -DXQC_ENABLE_RSC=1 -DXQC_ENABLE_PKM=1 ..
Expand Down
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,14 @@ endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -std=gnu11 -Wall ${CMAKE_C_FLAGS_OPTION} -DNDEBUG_PRINT -DNPRINT_MALLOC ")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g -O0 -std=gnu11 -Wall ${CMAKE_C_FLAGS_OPTION} -DNDEBUG_PRINT -DNPRINT_MALLOC -DXQC_DEBUG ")

if(ASAN)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
endif()


if(CMAKE_SYSTEM_NAME MATCHES "Windows")
add_definitions(-DXQC_SYS_WINDOWS=1)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Zi")
set(CMAKE_C_FLAGS_OPTION " ")
endif()


Expand All @@ -131,7 +135,7 @@ include_directories(include
${CMAKE_SOURCE_DIR}
)

option (XQC_PRINT_SECRET "enable TLS secret printing" OFF)


# print tls traffic secret in keylog
if(XQC_PRINT_SECRET)
Expand Down Expand Up @@ -222,6 +226,7 @@ set(
"src/transport/xqc_quic_lb.c"
"src/transport/xqc_timer.c"
"src/transport/xqc_reinjection.c"
"src/transport/xqc_recv_timestamps_info.c"
"src/transport/reinjection_control/xqc_reinj_default.c"
"src/transport/reinjection_control/xqc_reinj_deadline.c"
"src/transport/reinjection_control/xqc_reinj_dgram.c"
Expand Down
5 changes: 5 additions & 0 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ include(CMakeOptions.txt)

if (XQC_BUILD_OPENSSL)
if(${SSL_TYPE} MATCHES "boringssl")
if (XQC_OPENSSL_SMALL)
set(OPENSSL_SMALL "1")
endif()

add_subdirectory(${SSL_PATH})
include_directories(${SSL_PATH}/include)

Expand Down 10000 Expand Up @@ -192,6 +196,7 @@ set(
"src/transport/xqc_quic_lb.c"
"src/transport/xqc_timer.c"
"src/transport/xqc_reinjection.c"
"src/transport/xqc_recv_timestamps_info.c"
"src/transport/reinjection_control/xqc_reinj_default.c"
"src/transport/reinjection_control/xqc_reinj_deadline.c"
"src/transport/reinjection_control/xqc_reinj_dgram.c"
Expand Down
4 changes: 2 additions & 2 deletions cmake/FindSSL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ endif()
# find ssl static library
find_library(SSL_LIBRARY_STATIC NAMES ${SSL_LIBRARY_STATIC_NAME}
PATHS ${SSL_DIR}
PATH_SUFFIXES lib64 lib build/ssl build/ssl/${CMAKE_BUILD_TYPE}
PATH_SUFFIXES lib64 lib build build/${CMAKE_BUILD_TYPE}
NO_DEFAULT_PATH)

# find crypto static library
find_library(CRYPTO_LIBRARY_STATIC NAMES ${CRYPTO_LIBRARY_STATIC_NAME}
PATHS ${SSL_DIR}
PATH_SUFFIXES lib64 lib build/crypto build/crypto/${CMAKE_BUILD_TYPE}
PATH_SUFFIXES lib64 lib build build/${CMAKE_BUILD_TYPE}
NO_DEFAULT_PATH)

include (FindPackageHandleStandardArgs)
Expand Down
6 changes: 0 additions & 6 deletions demo/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,16 @@ set(
"xqc_hq_conn.c"
"xqc_hq_request.c"
)
set(
TEST_PLATFORM_SOURCES
"../tests/platform.c"
)

set(
DEMO_CLIENT_SOURCES
${HQ_SOURCES}
${TEST_PLATFORM_SOURCES}
"demo_client.c"
)

set(
DEMO_SERVER_SOURCES
${HQ_SOURCES}
${TEST_PLATFORM_SOURCES}
"demo_server.c"
)

Expand Down
Loading
Loading
0