-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[msh3,msquic,vcpkg-ci-msh3] Update, add test port (#42788)
- Loading branch information
Showing
17 changed files
with
337 additions
and
98 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| diff --git a/msh3.h b/msh3.h | ||
| index ebbdc20..c31b1b9 100644 | ||
| --- a/msh3.h | ||
| +++ b/msh3.h | ||
| @@ -374,7 +374,11 @@ typedef struct MSH3_REQUEST_EVENT { | ||
| bool AppCloseInProgress : 1; | ||
| bool ConnectionShutdownByApp : 1; | ||
| bool ConnectionClosedRemotely : 1; | ||
| - bool RESERVED : 5; | ||
| + bool RESERVED : 1; | ||
| + bool RESERVED_2 : 1; | ||
| + bool RESERVED_3 : 1; | ||
| + bool RESERVED_4 : 1; | ||
| + bool RESERVED_5 : 1; | ||
| uint64_t ConnectionErrorCode; | ||
| MSH3_STATUS ConnectionCloseStatus; | ||
| } SHUTDOWN_COMPLETE; | ||
| @@ -487,7 +491,13 @@ typedef struct MSH3_LISTENER_EVENT { | ||
| union { | ||
| struct { | ||
| bool AppCloseInProgress : 1; | ||
| - bool RESERVED : 7; | ||
| + bool RESERVED : 1; | ||
| + bool RESERVED_2 : 1; | ||
| + bool RESERVED_3 : 1; | ||
| + bool RESERVED_4 : 1; | ||
| + bool RESERVED_5 : 1; | ||
| + bool RESERVED_6 : 1; | ||
| + bool RESERVED_7 : 1; | ||
| } SHUTDOWN_COMPLETE; | ||
| struct { | ||
| MSH3_CONNECTION* Connection; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| diff --git a/src/bin/darwin/exports.txt b/src/bin/darwin/exports.txt | ||
| index e90b06e..c221d2c 100644 | ||
| --- a/src/bin/darwin/exports.txt | ||
| +++ b/src/bin/darwin/exports.txt | ||
| @@ -1,2 +1,6 @@ | ||
| _MsQuicOpenVersion | ||
| _MsQuicClose | ||
| +_CxPlatGetSelfSignedCert | ||
| +_CxPlatFreeSelfSignedCert | ||
| +_CxPlatLogAssert | ||
| +_quic_bugcheck | ||
| diff --git a/src/bin/linux/exports.txt b/src/bin/linux/exports.txt | ||
| index e11806a..424c443 100644 | ||
| --- a/src/bin/linux/exports.txt | ||
| +++ b/src/bin/linux/exports.txt | ||
| @@ -1,5 +1,9 @@ | ||
| msquic | ||
| { | ||
| global: MsQuicOpenVersion; MsQuicClose; | ||
| + CxPlatGetSelfSignedCert; | ||
| + CxPlatFreeSelfSignedCert; | ||
| + CxPlatLogAssert; | ||
| + quic_bugcheck; | ||
| local: *; | ||
| }; | ||
| diff --git a/src/bin/linux/init.c b/src/bin/linux/init.c | ||
| index 29bfa14..61bbc48 100644 | ||
| --- a/src/bin/linux/init.c | ||
| +++ b/src/bin/linux/init.c | ||
| @@ -9,8 +9,15 @@ Abstract: | ||
|
|
||
| --*/ | ||
|
|
||
| +#define QUIC_TEST_APIS 1 | ||
| #include "quic_platform.h" | ||
|
|
||
| +void MsQuickChainLoadPlatformSymbolsNoOp() | ||
| +{ | ||
| + QUIC_CREDENTIAL_CONFIG* SelfSignedCertParams = (QUIC_CREDENTIAL_CONFIG*)CxPlatGetSelfSignedCert(CXPLAT_SELF_SIGN_CERT_USER, FALSE, NULL); | ||
| + CxPlatFreeSelfSignedCert(SelfSignedCertParams); | ||
| +} | ||
| + | ||
| void | ||
| MsQuicLibraryLoad( | ||
| void | ||
| diff --git a/src/bin/winuser/msquic.def.in b/src/bin/winuser/msquic.def.in | ||
| index afaed5d..fa7d19a 100644 | ||
| --- a/src/bin/winuser/msquic.def.in | ||
| +++ b/src/bin/winuser/msquic.def.in | ||
| @@ -3,3 +3,6 @@ LIBRARY @QUIC_LIBRARY_NAME@ | ||
| EXPORTS | ||
| MsQuicOpenVersion | ||
| MsQuicClose | ||
| + CxPlatGetSelfSignedCert | ||
| + CxPlatFreeSelfSignedCert | ||
| + CxPlatLogAssert |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,24 @@ | ||
| diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt | ||
| index 2376823..d0592a3 100644 | ||
| index 18048e3..4fcd161 100644 | ||
| --- a/src/bin/CMakeLists.txt | ||
| +++ b/src/bin/CMakeLists.txt | ||
| @@ -253,14 +253,14 @@ endif() | ||
| @@ -11,6 +11,7 @@ endif() | ||
|
|
||
| if(BUILD_SHARED_LIBS) | ||
| target_include_directories(msquic PUBLIC | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc> | ||
| - $<INSTALL_INTERFACE:${include_dest}>) | ||
| + $<INSTALL_INTERFACE:include>) | ||
| else() | ||
| target_include_directories(msquic_static INTERFACE | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc> | ||
| - $<INSTALL_INTERFACE:${include_dest}>) | ||
| + $<INSTALL_INTERFACE:include>) | ||
| target_include_directories(msquic INTERFACE | ||
| $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc> | ||
| - $<INSTALL_INTERFACE:${include_dest}>) | ||
| + $<INSTALL_INTERFACE:include>) | ||
| add_library(msquic SHARED ${SOURCES}) | ||
| + target_include_directories(msquic PUBLIC $<INSTALL_INTERFACE:include>) | ||
| target_link_libraries(msquic PRIVATE core msquic_platform inc warnings logging base_link main_binary_link_args) | ||
| set_target_properties(msquic PROPERTIES OUTPUT_NAME ${QUIC_LIBRARY_NAME}) | ||
| if (NOT WIN32) | ||
| @@ -261,7 +262,10 @@ if(WIN32) | ||
| endif() | ||
|
|
||
| set(PUBLIC_HEADERS | ||
| @@ -269,11 +269,10 @@ set(PUBLIC_HEADERS | ||
| ../inc/msquic_posix.h | ||
| ../inc/quic_sal_stub.h) | ||
|
|
||
| -if(BUILD_SHARED_LIBS) | ||
| - install(TARGETS msquic EXPORT msquic DESTINATION lib) | ||
| -else() | ||
| - install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib) | ||
| -endif() | ||
| +install(TARGETS msquic EXPORT msquic | ||
| if(BUILD_SHARED_LIBS) | ||
| - install(TARGETS msquic msquic_platform inc logging_inc warnings main_binary_link_args ${OTHER_TARGETS} EXPORT msquic DESTINATION lib) | ||
| + install(TARGETS msquic EXPORT msquic | ||
| + RUNTIME DESTINATION bin | ||
| + ARCHIVE DESTINATION lib | ||
| + LIBRARY DESTINATION lib) | ||
| install(FILES ${PUBLIC_HEADERS} DESTINATION include) | ||
|
|
||
| configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake) | ||
| else() | ||
| install(FILES ${QUIC_STATIC_LIBRARY} DESTINATION lib) | ||
| endif() |
Oops, something went wrong.