diff --git a/quic/api/test/CMakeLists.txt b/quic/api/test/CMakeLists.txt index 855749f85..a0a210cf7 100644 --- a/quic/api/test/CMakeLists.txt +++ b/quic/api/test/CMakeLists.txt @@ -50,7 +50,7 @@ quic_add_test(TARGET QuicPacketSchedulerTest QuicPacketSchedulerTest.cpp DEPENDS Folly::folly - mvfst_client + mvfst_fizz_client mvfst_codec_pktbuilder mvfst_transport mvfst_test_utils @@ -62,7 +62,7 @@ quic_add_test(TARGET IoBufQuicBatchTest IoBufQuicBatchTest.cpp DEPENDS Folly::folly - mvfst_client + mvfst_fizz_client mvfst_transport mvfst_state_machine ) diff --git a/quic/api/test/IoBufQuicBatchTest.cpp b/quic/api/test/IoBufQuicBatchTest.cpp index 66e041d56..983e896fb 100644 --- a/quic/api/test/IoBufQuicBatchTest.cpp +++ b/quic/api/test/IoBufQuicBatchTest.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include constexpr const auto kNumLoops = 64; diff --git a/quic/api/test/QuicPacketSchedulerTest.cpp b/quic/api/test/QuicPacketSchedulerTest.cpp index e450a06b4..d2f166f85 100644 --- a/quic/api/test/QuicPacketSchedulerTest.cpp +++ b/quic/api/test/QuicPacketSchedulerTest.cpp @@ -11,11 +11,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/quic/client/CMakeLists.txt b/quic/client/CMakeLists.txt index df4047b94..a9e1c33b6 100644 --- a/quic/client/CMakeLists.txt +++ b/quic/client/CMakeLists.txt @@ -7,8 +7,6 @@ add_library( mvfst_client STATIC QuicClientTransport.cpp handshake/ClientHandshake.cpp - handshake/FizzClientQuicHandshakeContext.cpp - handshake/FizzClientHandshake.cpp state/ClientStateMachine.cpp ) @@ -28,7 +26,6 @@ add_dependencies( mvfst_client mvfst_bufutil mvfst_flowcontrol - mvfst_fizz_handshake mvfst_happyeyeballs mvfst_loss mvfst_qlogger @@ -42,7 +39,6 @@ target_link_libraries( mvfst_client PUBLIC Folly::folly mvfst_flowcontrol - mvfst_fizz_handshake mvfst_happyeyeballs mvfst_loss mvfst_qlogger @@ -68,6 +64,3 @@ install( EXPORT mvfst-exports DESTINATION lib ) - -add_subdirectory(test) -add_subdirectory(handshake/test) diff --git a/quic/client/QuicClientTransport.h b/quic/client/QuicClientTransport.h index 7a23f4434..e5c94a774 100644 --- a/quic/client/QuicClientTransport.h +++ b/quic/client/QuicClientTransport.h @@ -14,7 +14,6 @@ #include #include #include -#include #include #include diff --git a/quic/client/handshake/ClientHandshake.cpp b/quic/client/handshake/ClientHandshake.cpp index d3addb2d2..6686e068e 100644 --- a/quic/client/handshake/ClientHandshake.cpp +++ b/quic/client/handshake/ClientHandshake.cpp @@ -9,8 +9,8 @@ #include #include -#include #include +#include #include namespace quic { diff --git a/quic/common/test/CMakeLists.txt b/quic/common/test/CMakeLists.txt index 506f51698..80fc7a2c3 100644 --- a/quic/common/test/CMakeLists.txt +++ b/quic/common/test/CMakeLists.txt @@ -17,7 +17,6 @@ add_library( target_include_directories( mvfst_test_utils PUBLIC $ - $ ${LIBGMOCK_INCLUDE_DIR} ${LIBGTEST_INCLUDE_DIR} ) @@ -30,10 +29,9 @@ target_compile_options( add_dependencies( mvfst_test_utils - mvfst_client + mvfst_fizz_client mvfst_codec_pktbuilder mvfst_codec_types - mvfst_fizz_handshake mvfst_server mvfst_state_machine mvfst_transport @@ -42,13 +40,11 @@ add_dependencies( target_link_libraries( mvfst_test_utils PUBLIC Folly::folly - ${LIBFIZZ_LIBRARY} ${LIBGMOCK_LIBRARIES} ${LIBGTEST_LIBRARIES} - mvfst_client + mvfst_fizz_client mvfst_codec_pktbuilder mvfst_codec_types - mvfst_fizz_handshake mvfst_server mvfst_state_machine mvfst_transport @@ -64,12 +60,10 @@ quic_add_test(TARGET QuicCommonUtilTest SOURCES BufUtilTest.cpp DEPENDS Folly::folly - ${LIBFIZZ_LIBRARY} mvfst_bufutil - mvfst_client + mvfst_fizz_client mvfst_codec_pktbuilder mvfst_codec_types - mvfst_fizz_handshake mvfst_looper mvfst_transport mvfst_server diff --git a/quic/common/test/TestUtils.h b/quic/common/test/TestUtils.h index 183940b0a..27e729e07 100644 --- a/quic/common/test/TestUtils.h +++ b/quic/common/test/TestUtils.h @@ -8,10 +8,10 @@ #pragma once -#include #include #include #include +#include #include #include #include diff --git a/quic/fizz/CMakeLists.txt b/quic/fizz/CMakeLists.txt index 48003e16f..1a52c6d89 100644 --- a/quic/fizz/CMakeLists.txt +++ b/quic/fizz/CMakeLists.txt @@ -3,4 +3,5 @@ # This source code is licensed under the MIT license found in the # LICENSE file in the root directory of this source tree. +add_subdirectory(client) add_subdirectory(handshake) diff --git a/quic/fizz/client/CMakeLists.txt b/quic/fizz/client/CMakeLists.txt new file mode 100644 index 000000000..6bd7ab52e --- /dev/null +++ b/quic/fizz/client/CMakeLists.txt @@ -0,0 +1,56 @@ +# Copyright (c) Facebook, Inc. and its affiliates. +# +# This source code is licensed under the MIT license found in the +# LICENSE file in the root directory of this source tree. + +add_library( + mvfst_fizz_client STATIC + handshake/FizzClientQuicHandshakeContext.cpp + handshake/FizzClientHandshake.cpp +) + +target_include_directories( + mvfst_fizz_client PUBLIC + $ + $ +) + +target_compile_options( + mvfst_fizz_client + PRIVATE + ${_QUIC_COMMON_COMPILE_OPTIONS} +) + +add_dependencies( + mvfst_fizz_client + mvfst_client + mvfst_fizz_handshake + mvfst_codec_packet_number_cipher +) + +target_link_libraries( + mvfst_fizz_client PUBLIC + mvfst_client + mvfst_fizz_handshake + mvfst_codec_packet_number_cipher +) + +file( + GLOB_RECURSE QUIC_API_HEADERS_TOINSTALL + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + *.h +) +list(FILTER QUIC_API_HEADERS_TOINSTALL EXCLUDE REGEX test/) +foreach(header ${QUIC_API_HEADERS_TOINSTALL}) + get_filename_component(header_dir ${header} DIRECTORY) + install(FILES ${header} DESTINATION include/quic/fizz/client/${header_dir}) +endforeach() + +install( + TARGETS mvfst_fizz_client + EXPORT mvfst-exports + DESTINATION lib +) + +add_subdirectory(test) +add_subdirectory(handshake/test) diff --git a/quic/client/handshake/FizzClientExtensions.h b/quic/fizz/client/handshake/FizzClientExtensions.h similarity index 100% rename from quic/client/handshake/FizzClientExtensions.h rename to quic/fizz/client/handshake/FizzClientExtensions.h diff --git a/quic/client/handshake/FizzClientHandshake.cpp b/quic/fizz/client/handshake/FizzClientHandshake.cpp similarity index 97% rename from quic/client/handshake/FizzClientHandshake.cpp rename to quic/fizz/client/handshake/FizzClientHandshake.cpp index 7744d5dd5..efeaf4847 100644 --- a/quic/client/handshake/FizzClientHandshake.cpp +++ b/quic/fizz/client/handshake/FizzClientHandshake.cpp @@ -6,12 +6,12 @@ * */ -#include +#include -#include -#include -#include #include +#include +#include +#include #include #include diff --git a/quic/client/handshake/FizzClientHandshake.h b/quic/fizz/client/handshake/FizzClientHandshake.h similarity index 100% rename from quic/client/handshake/FizzClientHandshake.h rename to quic/fizz/client/handshake/FizzClientHandshake.h diff --git a/quic/client/handshake/FizzClientQuicHandshakeContext.cpp b/quic/fizz/client/handshake/FizzClientQuicHandshakeContext.cpp similarity index 93% rename from quic/client/handshake/FizzClientQuicHandshakeContext.cpp rename to quic/fizz/client/handshake/FizzClientQuicHandshakeContext.cpp index 974b4c3b4..5e080e581 100644 --- a/quic/client/handshake/FizzClientQuicHandshakeContext.cpp +++ b/quic/fizz/client/handshake/FizzClientQuicHandshakeContext.cpp @@ -6,9 +6,9 @@ * */ -#include +#include -#include +#include namespace quic { diff --git a/quic/client/handshake/FizzClientQuicHandshakeContext.h b/quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h similarity index 98% rename from quic/client/handshake/FizzClientQuicHandshakeContext.h rename to quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h index 6c59c59be..211cd7679 100644 --- a/quic/client/handshake/FizzClientQuicHandshakeContext.h +++ b/quic/fizz/client/handshake/FizzClientQuicHandshakeContext.h @@ -10,7 +10,7 @@ #include -#include +#include #include #include diff --git a/quic/client/handshake/QuicPskCache.h b/quic/fizz/client/handshake/QuicPskCache.h similarity index 100% rename from quic/client/handshake/QuicPskCache.h rename to quic/fizz/client/handshake/QuicPskCache.h diff --git a/quic/client/handshake/test/CMakeLists.txt b/quic/fizz/client/handshake/test/CMakeLists.txt similarity index 75% rename from quic/client/handshake/test/CMakeLists.txt rename to quic/fizz/client/handshake/test/CMakeLists.txt index aeaf8d9f3..be072323f 100644 --- a/quic/client/handshake/test/CMakeLists.txt +++ b/quic/fizz/client/handshake/test/CMakeLists.txt @@ -9,16 +9,12 @@ endif() quic_add_test(TARGET ClientHandshakeTest SOURCES - ClientHandshakeTest.cpp + FizzClientHandshakeTest.cpp FizzClientExtensionsTest.cpp DEPENDS - Folly::folly - ${LIBFIZZ_LIBRARY} - mvfst_client + mvfst_fizz_client mvfst_codec_types mvfst_constants - mvfst_fizz_handshake mvfst_server - mvfst_state_machine mvfst_test_utils ) diff --git a/quic/client/handshake/test/FizzClientExtensionsTest.cpp b/quic/fizz/client/handshake/test/FizzClientExtensionsTest.cpp similarity index 98% rename from quic/client/handshake/test/FizzClientExtensionsTest.cpp rename to quic/fizz/client/handshake/test/FizzClientExtensionsTest.cpp index 74faed7ca..8dedf6ac4 100644 --- a/quic/client/handshake/test/FizzClientExtensionsTest.cpp +++ b/quic/fizz/client/handshake/test/FizzClientExtensionsTest.cpp @@ -8,8 +8,8 @@ #include -#include #include +#include #include diff --git a/quic/client/handshake/test/ClientHandshakeTest.cpp b/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp similarity index 98% rename from quic/client/handshake/test/ClientHandshakeTest.cpp rename to quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp index a5d8bb444..4d8c7b646 100644 --- a/quic/client/handshake/test/ClientHandshakeTest.cpp +++ b/quic/fizz/client/handshake/test/FizzClientHandshakeTest.cpp @@ -24,11 +24,11 @@ #include #include -#include -#include -#include #include #include +#include +#include +#include #include #include #include diff --git a/quic/client/handshake/test/MockQuicPskCache.h b/quic/fizz/client/handshake/test/MockQuicPskCache.h similarity index 91% rename from quic/client/handshake/test/MockQuicPskCache.h rename to quic/fizz/client/handshake/test/MockQuicPskCache.h index 26d8d8aef..937b4c47a 100644 --- a/quic/client/handshake/test/MockQuicPskCache.h +++ b/quic/fizz/client/handshake/test/MockQuicPskCache.h @@ -8,7 +8,7 @@ #pragma once -#include +#include #include #include diff --git a/quic/client/test/CMakeLists.txt b/quic/fizz/client/test/CMakeLists.txt similarity index 85% rename from quic/client/test/CMakeLists.txt rename to quic/fizz/client/test/CMakeLists.txt index 093642342..942ae9cdf 100644 --- a/quic/client/test/CMakeLists.txt +++ b/quic/fizz/client/test/CMakeLists.txt @@ -13,11 +13,8 @@ quic_add_test(TARGET QuicClientTransportTest DEPENDS Folly::folly ${LIBGMOCK_LIBRARIES} - mvfst_bufutil - mvfst_client + mvfst_fizz_client mvfst_codec_types - mvfst_fizz_handshake mvfst_server mvfst_test_utils - mvfst_transport ) diff --git a/quic/client/test/QuicClientTransportTest.cpp b/quic/fizz/client/test/QuicClientTransportTest.cpp similarity index 99% rename from quic/client/test/QuicClientTransportTest.cpp rename to quic/fizz/client/test/QuicClientTransportTest.cpp index c0507e51d..9872f2ddf 100644 --- a/quic/client/test/QuicClientTransportTest.cpp +++ b/quic/fizz/client/test/QuicClientTransportTest.cpp @@ -20,12 +20,12 @@ #include #include #include -#include -#include -#include #include #include #include +#include +#include +#include #include #include #include diff --git a/quic/loss/test/QuicLossFunctionsTest.cpp b/quic/loss/test/QuicLossFunctionsTest.cpp index 848b470d6..8c8a3f900 100644 --- a/quic/loss/test/QuicLossFunctionsTest.cpp +++ b/quic/loss/test/QuicLossFunctionsTest.cpp @@ -12,10 +12,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/quic/samples/echo/EchoClient.h b/quic/samples/echo/EchoClient.h index a292f0e59..d34dfbecb 100644 --- a/quic/samples/echo/EchoClient.h +++ b/quic/samples/echo/EchoClient.h @@ -18,9 +18,9 @@ #include #include -#include #include #include +#include namespace quic { namespace samples { diff --git a/quic/server/handshake/test/ServerHandshakeTest.cpp b/quic/server/handshake/test/ServerHandshakeTest.cpp index 65f1d84ad..07969786b 100644 --- a/quic/server/handshake/test/ServerHandshakeTest.cpp +++ b/quic/server/handshake/test/ServerHandshakeTest.cpp @@ -24,8 +24,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/quic/state/test/QuicStreamFunctionsTest.cpp b/quic/state/test/QuicStreamFunctionsTest.cpp index bc8580c2f..a0eeddbe2 100644 --- a/quic/state/test/QuicStreamFunctionsTest.cpp +++ b/quic/state/test/QuicStreamFunctionsTest.cpp @@ -12,9 +12,9 @@ #include #include -#include #include #include +#include #include using namespace folly; diff --git a/quic/tools/tperf/tperf.cpp b/quic/tools/tperf/tperf.cpp index eaacbf433..15387372f 100644 --- a/quic/tools/tperf/tperf.cpp +++ b/quic/tools/tperf/tperf.cpp @@ -15,9 +15,9 @@ #include #include -#include #include #include +#include #include #include #include