Moves Source Code into 'src' Directory (#86)

dotnet · Feb 3, 2020 · 798fe56 · 798fe56
1 parent a93fad3
commit 798fe56
Show file tree

Hide file tree

Showing 193 changed files with 51 additions and 25 deletions.
diff --git a/.azure/test_windows.cmd b/.azure/test_windows.cmd
@@ -1,6 +1,6 @@
 
 :: Import our ETW manifest.
-wevtutil im manifest\MsQuicEtw.man ^
+wevtutil im src\manifest\MsQuicEtw.man ^
     /rf:%cd%\artifacts\windows\bin\debug\msquic.dll ^
     /mf:%cd%\artifacts\windows\bin\debug\msquic.dll
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,7 +51,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     add_custom_command(
         OUTPUT ${QUIC_BUILD_DIR}/inc/MsQuicEtw.h
         OUTPUT ${QUIC_BUILD_DIR}/inc/MsQuicEtw.rc
-        COMMAND mc.exe -um -h ${QUIC_BUILD_DIR}/inc -r ${QUIC_BUILD_DIR}/inc ${CMAKE_SOURCE_DIR}/manifest/MsQuicEtw.man)
+        COMMAND mc.exe -um -h ${QUIC_BUILD_DIR}/inc -r ${QUIC_BUILD_DIR}/inc ${CMAKE_SOURCE_DIR}/src/manifest/MsQuicEtw.man)
     add_custom_target(MsQuicEtw
         DEPENDS ${QUIC_BUILD_DIR}/inc/MsQuicEtw.h
         DEPENDS ${QUIC_BUILD_DIR}/inc/MsQuicEtw.rc)
@@ -118,7 +118,7 @@ else()
     set(QUIC_CXX_FLAGS "${QUIC_COMMON_FLAGS} --std=c++17 -g -Wno-reorder -Wno-sign-compare -Wno-format")
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/inc)
+include_directories(${CMAKE_SOURCE_DIR}/src/inc)
 
 if(QUIC_TLS STREQUAL "openssl")
     # Configure and build OpenSSL.
@@ -145,22 +145,22 @@ if (QUIC_TLS STREQUAL "mitls")
 endif()
 
 # Product code
-add_subdirectory(core)
-add_subdirectory(platform)
-add_subdirectory(bin)
+add_subdirectory(src/core)
+add_subdirectory(src/platform)
+add_subdirectory(src/bin)
 
 # Tool code
 if(QUIC_BUILD_TOOLS)
-    add_subdirectory(tools/attack)
-    add_subdirectory(tools/interop)
-    add_subdirectory(tools/ping)
-    add_subdirectory(tools/reach)
-    add_subdirectory(tools/sample)
-    add_subdirectory(tools/spin)
-    add_subdirectory(tools/void)
+    add_subdirectory(src/tools/attack)
+    add_subdirectory(src/tools/interop)
+    add_subdirectory(src/tools/ping)
+    add_subdirectory(src/tools/reach)
+    add_subdirectory(src/tools/sample)
+    add_subdirectory(src/tools/spin)
+    add_subdirectory(src/tools/void)
     if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        add_subdirectory(tools/etwlib)
-        add_subdirectory(tools/etw)
+        add_subdirectory(src/tools/etwlib)
+        add_subdirectory(src/tools/etw)
     endif()
 endif()
 
@@ -174,6 +174,6 @@ if(QUIC_BUILD_TEST)
     endif()
     add_subdirectory(submodules/googletest)
 
-    add_subdirectory(test/lib)
-    add_subdirectory(test/bin)
+    add_subdirectory(src/test/lib)
+    add_subdirectory(src/test/bin)
 endif()
diff --git a/build.ps1 b/build.ps1
@@ -30,6 +30,9 @@ This script provides helpers for building msquic.
 .PARAMETER Clean
     Deletes all previous build and configuration.
 
+.PARAMETER InstallOutput
+    Installs the build output to the current machine.
+
 .EXAMPLE
     build.ps1 -InstallDependencies
 
@@ -69,7 +72,10 @@ param (
     [switch]$DisableTest = $false,
 
     [Parameter(Mandatory = $false)]
-    [switch]$Clean = $false
+    [switch]$Clean = $false,
+
+    [Parameter(Mandatory = $false)]
+    [switch]$InstallOutput = $false
 )
 
 Set-StrictMode -Version 'Latest'
@@ -78,6 +84,7 @@ $PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
 # Important directory paths.
 $BaseArtifactsDir = Join-Path $PSScriptRoot "artifacts"
 $BaseBuildDir = Join-Path $PSScriptRoot "bld"
+$SrcDir = Join-Path $PSScriptRoot "src"
 $ArtifactsDir = $null
 $BuildDir = $null
 if ($IsWindows) {
@@ -205,6 +212,20 @@ function CMake-Build {
     CMake-Execute $Arguments
 }
 
+# Installs all the build output.
+function Install-Output {
+    if ($IsWindows) {
+        # Import the ETW manifest.
+        $ManifestDir = Join-Path $SrcDir "manifest"
+        $ManifestPath = Join-Path $ManifestDir "MsQuicEtw.man"
+        $MsQuicDllPath = Join-Path $ArtifactsDir "bin" $Config "msquic.dll"
+        Log "Installing ETW manifest..."
+        wevtutil.exe im $ManifestPath /rf:$MsQuicDllPath /mf:$MsQuicDllPath
+    } else {
+        # TODO - Anything?
+    }
+}
+
 ##############################################################
 #                     Main Execution                         #
 ##############################################################
@@ -225,4 +246,9 @@ CMake-Generate
 Log "Building..."
 CMake-Build
 
+if ($InstallOutput) {
+    # Install the build output.
+    Install-Output
+}
+
 Log "Done."
diff --git a/log.ps1 b/log.ps1
@@ -63,7 +63,7 @@ Set-StrictMode -Version 'Latest'
 $PSDefaultParameterValues['*:ErrorAction'] = 'Stop'
 
 # Path for the WPR profile.
-$WprpFile = $PSScriptRoot + "\manifest\msquic.wprp"
+$WprpFile = $PSScriptRoot + "\src\manifest\msquic.wprp"
 
 # Path for quicetw.
 $QuicEtw = $null
@@ -83,7 +83,7 @@ function Log-Start {
         wpr.exe -start "$($WprpFile)!$($LogProfile)" -filemode -instancename $InstanceName
     } else {
         # TODO
-        Write-Warning "Not supported yet!"
+        Write-Warning "Logging not supported yet!"
     }
 }
 
@@ -93,7 +93,7 @@ function Log-Cancel {
         wpr.exe -cancel -instancename $InstanceName
     } else {
         # TODO
-        Write-Warning "Not supported yet!"
+        Write-Warning "Logging not supported yet!"
     }
 }
 
@@ -108,7 +108,7 @@ function Log-Stop {
         }
     } else {
         # TODO
-        Write-Warning "Not supported yet!"
+        Write-Warning "Logging not supported yet!"
     }
 }
 

diff --git a/bin/CMakeLists.txt → src/bin/CMakeLists.txt b/bin/CMakeLists.txt → src/bin/CMakeLists.txt
diff --git a/bin/linux/init.c → src/bin/linux/init.c b/bin/linux/init.c → src/bin/linux/init.c
diff --git a/bin/winuser/dllmain.c → src/bin/winuser/dllmain.c b/bin/winuser/dllmain.c → src/bin/winuser/dllmain.c
diff --git a/bin/winuser/msquic.def → src/bin/winuser/msquic.def b/bin/winuser/msquic.def → src/bin/winuser/msquic.def
diff --git a/bin/winuser/msquic.rc → src/bin/winuser/msquic.rc b/bin/winuser/msquic.rc → src/bin/winuser/msquic.rc
diff --git a/core/CMakeLists.txt → src/core/CMakeLists.txt b/core/CMakeLists.txt → src/core/CMakeLists.txt
diff --git a/core/ack_tracker.c → src/core/ack_tracker.c b/core/ack_tracker.c → src/core/ack_tracker.c
diff --git a/core/ack_tracker.h → src/core/ack_tracker.h b/core/ack_tracker.h → src/core/ack_tracker.h
diff --git a/core/api.c → src/core/api.c b/core/api.c → src/core/api.c
diff --git a/core/api.h → src/core/api.h b/core/api.h → src/core/api.h
diff --git a/core/binding.c → src/core/binding.c b/core/binding.c → src/core/binding.c
diff --git a/core/binding.h → src/core/binding.h b/core/binding.h → src/core/binding.h
diff --git a/core/cid.h → src/core/cid.h b/core/cid.h → src/core/cid.h
diff --git a/core/congestion_control.c → src/core/congestion_control.c b/core/congestion_control.c → src/core/congestion_control.c
diff --git a/core/congestion_control.h → src/core/congestion_control.h b/core/congestion_control.h → src/core/congestion_control.h
diff --git a/core/connection.c → src/core/connection.c b/core/connection.c → src/core/connection.c
diff --git a/core/connection.h → src/core/connection.h b/core/connection.h → src/core/connection.h
diff --git a/core/crypto.c → src/core/crypto.c b/core/crypto.c → src/core/crypto.c
diff --git a/core/crypto.h → src/core/crypto.h b/core/crypto.h → src/core/crypto.h
diff --git a/core/crypto_tls.c → src/core/crypto_tls.c b/core/crypto_tls.c → src/core/crypto_tls.c
diff --git a/core/frame.c → src/core/frame.c b/core/frame.c → src/core/frame.c
diff --git a/core/frame.h → src/core/frame.h b/core/frame.h → src/core/frame.h
diff --git a/core/injection.c → src/core/injection.c b/core/injection.c → src/core/injection.c
diff --git a/core/inline.c → src/core/inline.c b/core/inline.c → src/core/inline.c
diff --git a/core/library.c → src/core/library.c b/core/library.c → src/core/library.c
diff --git a/core/library.h → src/core/library.h b/core/library.h → src/core/library.h
diff --git a/core/listener.c → src/core/listener.c b/core/listener.c → src/core/listener.c
diff --git a/core/listener.h → src/core/listener.h b/core/listener.h → src/core/listener.h
diff --git a/core/lookup.c → src/core/lookup.c b/core/lookup.c → src/core/lookup.c
diff --git a/core/lookup.h → src/core/lookup.h b/core/lookup.h → src/core/lookup.h
diff --git a/core/loss_detection.c → src/core/loss_detection.c b/core/loss_detection.c → src/core/loss_detection.c
diff --git a/core/loss_detection.h → src/core/loss_detection.h b/core/loss_detection.h → src/core/loss_detection.h
diff --git a/core/operation.c → src/core/operation.c b/core/operation.c → src/core/operation.c
diff --git a/core/operation.h → src/core/operation.h b/core/operation.h → src/core/operation.h
diff --git a/core/packet.c → src/core/packet.c b/core/packet.c → src/core/packet.c
diff --git a/core/packet.h → src/core/packet.h b/core/packet.h → src/core/packet.h
diff --git a/core/packet_builder.c → src/core/packet_builder.c b/core/packet_builder.c → src/core/packet_builder.c
diff --git a/core/packet_builder.h → src/core/packet_builder.h b/core/packet_builder.h → src/core/packet_builder.h
diff --git a/core/packet_space.c → src/core/packet_space.c b/core/packet_space.c → src/core/packet_space.c
diff --git a/core/packet_space.h → src/core/packet_space.h b/core/packet_space.h → src/core/packet_space.h
diff --git a/core/path.c → src/core/path.c b/core/path.c → src/core/path.c
diff --git a/core/path.h → src/core/path.h b/core/path.h → src/core/path.h
diff --git a/core/precomp.h → src/core/precomp.h b/core/precomp.h → src/core/precomp.h
diff --git a/core/quicdef.h → src/core/quicdef.h b/core/quicdef.h → src/core/quicdef.h
diff --git a/core/range.c → src/core/range.c b/core/range.c → src/core/range.c
diff --git a/core/range.h → src/core/range.h b/core/range.h → src/core/range.h
diff --git a/core/recv_buffer.c → src/core/recv_buffer.c b/core/recv_buffer.c → src/core/recv_buffer.c
diff --git a/core/recv_buffer.h → src/core/recv_buffer.h b/core/recv_buffer.h → src/core/recv_buffer.h
diff --git a/core/registration.c → src/core/registration.c b/core/registration.c → src/core/registration.c
diff --git a/core/registration.h → src/core/registration.h b/core/registration.h → src/core/registration.h
diff --git a/core/send.c → src/core/send.c b/core/send.c → src/core/send.c
diff --git a/core/send.h → src/core/send.h b/core/send.h → src/core/send.h
diff --git a/core/send_buffer.c → src/core/send_buffer.c b/core/send_buffer.c → src/core/send_buffer.c
diff --git a/core/send_buffer.h → src/core/send_buffer.h b/core/send_buffer.h → src/core/send_buffer.h
diff --git a/core/sent_packet_metadata.c → src/core/sent_packet_metadata.c b/core/sent_packet_metadata.c → src/core/sent_packet_metadata.c
diff --git a/core/sent_packet_metadata.h → src/core/sent_packet_metadata.h b/core/sent_packet_metadata.h → src/core/sent_packet_metadata.h
diff --git a/core/session.c → src/core/session.c b/core/session.c → src/core/session.c
diff --git a/core/session.h → src/core/session.h b/core/session.h → src/core/session.h
diff --git a/core/settings.c → src/core/settings.c b/core/settings.c → src/core/settings.c
diff --git a/core/settings.h → src/core/settings.h b/core/settings.h → src/core/settings.h
diff --git a/core/stream.c → src/core/stream.c b/core/stream.c → src/core/stream.c
diff --git a/core/stream.h → src/core/stream.h b/core/stream.h → src/core/stream.h
diff --git a/core/stream_recv.c → src/core/stream_recv.c b/core/stream_recv.c → src/core/stream_recv.c
diff --git a/core/stream_send.c → src/core/stream_send.c b/core/stream_send.c → src/core/stream_send.c
diff --git a/core/stream_set.c → src/core/stream_set.c b/core/stream_set.c → src/core/stream_set.c
diff --git a/core/stream_set.h → src/core/stream_set.h b/core/stream_set.h → src/core/stream_set.h
diff --git a/core/timer_wheel.c → src/core/timer_wheel.c b/core/timer_wheel.c → src/core/timer_wheel.c
diff --git a/core/timer_wheel.h → src/core/timer_wheel.h b/core/timer_wheel.h → src/core/timer_wheel.h
diff --git a/core/transport_params.h → src/core/transport_params.h b/core/transport_params.h → src/core/transport_params.h
diff --git a/core/unittest/FrameTest.cpp → src/core/unittest/FrameTest.cpp b/core/unittest/FrameTest.cpp → src/core/unittest/FrameTest.cpp
diff --git a/core/unittest/PacketNumberTest.cpp → src/core/unittest/PacketNumberTest.cpp b/core/unittest/PacketNumberTest.cpp → src/core/unittest/PacketNumberTest.cpp
diff --git a/core/unittest/RangeTest.cpp → src/core/unittest/RangeTest.cpp b/core/unittest/RangeTest.cpp → src/core/unittest/RangeTest.cpp
diff --git a/core/unittest/main.cpp → src/core/unittest/main.cpp b/core/unittest/main.cpp → src/core/unittest/main.cpp
diff --git a/core/worker.c → src/core/worker.c b/core/worker.c → src/core/worker.c
diff --git a/core/worker.h → src/core/worker.h b/core/worker.h → src/core/worker.h
diff --git a/inc/msquic.h → src/inc/msquic.h b/inc/msquic.h → src/inc/msquic.h
diff --git a/inc/msquic_fuzz.h → src/inc/msquic_fuzz.h b/inc/msquic_fuzz.h → src/inc/msquic_fuzz.h
diff --git a/inc/msquic_linux.h → src/inc/msquic_linux.h b/inc/msquic_linux.h → src/inc/msquic_linux.h
diff --git a/inc/msquic_winuser.h → src/inc/msquic_winuser.h b/inc/msquic_winuser.h → src/inc/msquic_winuser.h
diff --git a/inc/msquichelper.h → src/inc/msquichelper.h b/inc/msquichelper.h → src/inc/msquichelper.h
diff --git a/inc/msquicp.h → src/inc/msquicp.h b/inc/msquicp.h → src/inc/msquicp.h
diff --git a/inc/quic_cert.h → src/inc/quic_cert.h b/inc/quic_cert.h → src/inc/quic_cert.h
diff --git a/inc/quic_crypt.h → src/inc/quic_crypt.h b/inc/quic_crypt.h → src/inc/quic_crypt.h
diff --git a/inc/quic_datapath.h → src/inc/quic_datapath.h b/inc/quic_datapath.h → src/inc/quic_datapath.h
diff --git a/inc/quic_hashtable.h → src/inc/quic_hashtable.h b/inc/quic_hashtable.h → src/inc/quic_hashtable.h
diff --git a/inc/quic_platform.h → src/inc/quic_platform.h b/inc/quic_platform.h → src/inc/quic_platform.h
diff --git a/inc/quic_platform_dispatch.h → src/inc/quic_platform_dispatch.h b/inc/quic_platform_dispatch.h → src/inc/quic_platform_dispatch.h
diff --git a/inc/quic_platform_linux.h → src/inc/quic_platform_linux.h b/inc/quic_platform_linux.h → src/inc/quic_platform_linux.h
diff --git a/inc/quic_platform_winuser.h → src/inc/quic_platform_winuser.h b/inc/quic_platform_winuser.h → src/inc/quic_platform_winuser.h
diff --git a/inc/quic_sal_stub.h → src/inc/quic_sal_stub.h b/inc/quic_sal_stub.h → src/inc/quic_sal_stub.h
diff --git a/inc/quic_storage.h → src/inc/quic_storage.h b/inc/quic_storage.h → src/inc/quic_storage.h
diff --git a/inc/quic_tls.h → src/inc/quic_tls.h b/inc/quic_tls.h → src/inc/quic_tls.h
diff --git a/inc/quic_trace.h → src/inc/quic_trace.h b/inc/quic_trace.h → src/inc/quic_trace.h
diff --git a/inc/quic_trace_lttng.h → src/inc/quic_trace_lttng.h b/inc/quic_trace_lttng.h → src/inc/quic_trace_lttng.h
diff --git a/inc/quic_var_int.h → src/inc/quic_var_int.h b/inc/quic_var_int.h → src/inc/quic_var_int.h
diff --git a/inc/quic_versions.h → src/inc/quic_versions.h b/inc/quic_versions.h → src/inc/quic_versions.h
diff --git a/manifest/MsQuic.wprp → src/manifest/MsQuic.wprp b/manifest/MsQuic.wprp → src/manifest/MsQuic.wprp
diff --git a/manifest/MsQuicEtw.man → src/manifest/MsQuicEtw.man b/manifest/MsQuicEtw.man → src/manifest/MsQuicEtw.man
diff --git a/platform/CMakeLists.txt → src/platform/CMakeLists.txt b/platform/CMakeLists.txt → src/platform/CMakeLists.txt
diff --git a/platform/cert_capi.c → src/platform/cert_capi.c b/platform/cert_capi.c → src/platform/cert_capi.c
diff --git a/platform/cert_openssl.c → src/platform/cert_openssl.c b/platform/cert_openssl.c → src/platform/cert_openssl.c
diff --git a/platform/cert_stub.c → src/platform/cert_stub.c b/platform/cert_stub.c → src/platform/cert_stub.c
diff --git a/platform/datapath_linux.c → src/platform/datapath_linux.c b/platform/datapath_linux.c → src/platform/datapath_linux.c
diff --git a/platform/datapath_winuser.c → src/platform/datapath_winuser.c b/platform/datapath_winuser.c → src/platform/datapath_winuser.c
diff --git a/platform/hashtable.c → src/platform/hashtable.c b/platform/hashtable.c → src/platform/hashtable.c
diff --git a/platform/inline.c → src/platform/inline.c b/platform/inline.c → src/platform/inline.c
diff --git a/platform/platform_internal.h → src/platform/platform_internal.h b/platform/platform_internal.h → src/platform/platform_internal.h
diff --git a/platform/platform_linux.c → src/platform/platform_linux.c b/platform/platform_linux.c → src/platform/platform_linux.c
diff --git a/platform/platform_winuser.c → src/platform/platform_winuser.c b/platform/platform_winuser.c → src/platform/platform_winuser.c
diff --git a/platform/selfsign_capi.c → src/platform/selfsign_capi.c b/platform/selfsign_capi.c → src/platform/selfsign_capi.c
diff --git a/platform/selfsign_openssl.c → src/platform/selfsign_openssl.c b/platform/selfsign_openssl.c → src/platform/selfsign_openssl.c
diff --git a/platform/selfsign_stub.c → src/platform/selfsign_stub.c b/platform/selfsign_stub.c → src/platform/selfsign_stub.c
diff --git a/platform/storage_linux.c → src/platform/storage_linux.c b/platform/storage_linux.c → src/platform/storage_linux.c
diff --git a/platform/storage_winuser.c → src/platform/storage_winuser.c b/platform/storage_winuser.c → src/platform/storage_winuser.c
diff --git a/platform/tls_mitls.c → src/platform/tls_mitls.c b/platform/tls_mitls.c → src/platform/tls_mitls.c
diff --git a/platform/tls_openssl.c → src/platform/tls_openssl.c b/platform/tls_openssl.c → src/platform/tls_openssl.c
diff --git a/platform/tls_schannel.c → src/platform/tls_schannel.c b/platform/tls_schannel.c → src/platform/tls_schannel.c
diff --git a/platform/tls_stub.c → src/platform/tls_stub.c b/platform/tls_stub.c → src/platform/tls_stub.c
diff --git a/platform/unittest/CryptTest.cpp → src/platform/unittest/CryptTest.cpp b/platform/unittest/CryptTest.cpp → src/platform/unittest/CryptTest.cpp
diff --git a/platform/unittest/DataPathTest.cpp → src/platform/unittest/DataPathTest.cpp b/platform/unittest/DataPathTest.cpp → src/platform/unittest/DataPathTest.cpp
diff --git a/platform/unittest/StorageTest.cpp → src/platform/unittest/StorageTest.cpp b/platform/unittest/StorageTest.cpp → src/platform/unittest/StorageTest.cpp
diff --git a/platform/unittest/TlsTest.cpp → src/platform/unittest/TlsTest.cpp b/platform/unittest/TlsTest.cpp → src/platform/unittest/TlsTest.cpp
diff --git a/platform/unittest/linux/DataPathTest.c → src/platform/unittest/linux/DataPathTest.c b/platform/unittest/linux/DataPathTest.c → src/platform/unittest/linux/DataPathTest.c
diff --git a/platform/unittest/linux/TlsTest.c → src/platform/unittest/linux/TlsTest.c b/platform/unittest/linux/TlsTest.c → src/platform/unittest/linux/TlsTest.c
diff --git a/platform/unittest/main.cpp → src/platform/unittest/main.cpp b/platform/unittest/main.cpp → src/platform/unittest/main.cpp
diff --git a/test/MsQuicTests.h → src/test/MsQuicTests.h b/test/MsQuicTests.h → src/test/MsQuicTests.h
diff --git a/test/bin/CMakeLists.txt → src/test/bin/CMakeLists.txt b/test/bin/CMakeLists.txt → src/test/bin/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-include_directories(${CMAKE_SOURCE_DIR}/test)
+include_directories(${CMAKE_SOURCE_DIR}/src/test)
 include_directories(${CMAKE_SOURCE_DIR}/submodules/googletest/googletest/include)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QUIC_CXX_FLAGS}")

diff --git a/test/bin/quic_gtest.cpp → src/test/bin/quic_gtest.cpp b/test/bin/quic_gtest.cpp → src/test/bin/quic_gtest.cpp
diff --git a/test/bin/quic_gtest.h → src/test/bin/quic_gtest.h b/test/bin/quic_gtest.h → src/test/bin/quic_gtest.h
diff --git a/test/lib/ApiTest.cpp → src/test/lib/ApiTest.cpp b/test/lib/ApiTest.cpp → src/test/lib/ApiTest.cpp
diff --git a/test/lib/CMakeLists.txt → src/test/lib/CMakeLists.txt b/test/lib/CMakeLists.txt → src/test/lib/CMakeLists.txt
@@ -12,7 +12,7 @@ set(SOURCES
     TestStream.cpp
 )
 
-include_directories(${CMAKE_SOURCE_DIR}/test)
+include_directories(${CMAKE_SOURCE_DIR}/src/test)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QUIC_CXX_FLAGS}")
 

diff --git a/test/lib/DrillDescriptor.cpp → src/test/lib/DrillDescriptor.cpp b/test/lib/DrillDescriptor.cpp → src/test/lib/DrillDescriptor.cpp
diff --git a/test/lib/DrillDescriptor.h → src/test/lib/DrillDescriptor.h b/test/lib/DrillDescriptor.h → src/test/lib/DrillDescriptor.h
diff --git a/test/lib/EventTest.cpp → src/test/lib/EventTest.cpp b/test/lib/EventTest.cpp → src/test/lib/EventTest.cpp
diff --git a/test/lib/QuicDrill.cpp → src/test/lib/QuicDrill.cpp b/test/lib/QuicDrill.cpp → src/test/lib/QuicDrill.cpp
diff --git a/test/lib/QuicTest.cpp → src/test/lib/QuicTest.cpp b/test/lib/QuicTest.cpp → src/test/lib/QuicTest.cpp
diff --git a/test/lib/TestAbstractionLayer.h → src/test/lib/TestAbstractionLayer.h b/test/lib/TestAbstractionLayer.h → src/test/lib/TestAbstractionLayer.h
diff --git a/test/lib/TestConnection.cpp → src/test/lib/TestConnection.cpp b/test/lib/TestConnection.cpp → src/test/lib/TestConnection.cpp
diff --git a/test/lib/TestConnection.h → src/test/lib/TestConnection.h b/test/lib/TestConnection.h → src/test/lib/TestConnection.h
diff --git a/test/lib/TestHelpers.h → src/test/lib/TestHelpers.h b/test/lib/TestHelpers.h → src/test/lib/TestHelpers.h
diff --git a/test/lib/TestListener.cpp → src/test/lib/TestListener.cpp b/test/lib/TestListener.cpp → src/test/lib/TestListener.cpp
diff --git a/test/lib/TestListener.h → src/test/lib/TestListener.h b/test/lib/TestListener.h → src/test/lib/TestListener.h
diff --git a/test/lib/TestStream.cpp → src/test/lib/TestStream.cpp b/test/lib/TestStream.cpp → src/test/lib/TestStream.cpp
diff --git a/test/lib/TestStream.h → src/test/lib/TestStream.h b/test/lib/TestStream.h → src/test/lib/TestStream.h
diff --git a/test/lib/precomp.h → src/test/lib/precomp.h b/test/lib/precomp.h → src/test/lib/precomp.h
diff --git a/tools/attack/CMakeLists.txt → src/tools/attack/CMakeLists.txt b/tools/attack/CMakeLists.txt → src/tools/attack/CMakeLists.txt
@@ -8,7 +8,7 @@ set(SOURCES
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QUIC_CXX_FLAGS}")
 
-include_directories(${CMAKE_SOURCE_DIR}/core)
+include_directories(${CMAKE_SOURCE_DIR}/src/core)
 
 add_executable(quicattack ${SOURCES})
 

diff --git a/tools/attack/attack.cpp → src/tools/attack/attack.cpp b/tools/attack/attack.cpp → src/tools/attack/attack.cpp
diff --git a/tools/attack/packet_writer.cpp → src/tools/attack/packet_writer.cpp b/tools/attack/packet_writer.cpp → src/tools/attack/packet_writer.cpp
diff --git a/tools/attack/packet_writer.h → src/tools/attack/packet_writer.h b/tools/attack/packet_writer.h → src/tools/attack/packet_writer.h
diff --git a/tools/etw/CMakeLists.txt → src/tools/etw/CMakeLists.txt b/tools/etw/CMakeLists.txt → src/tools/etw/CMakeLists.txt
diff --git a/tools/etw/binding.c → src/tools/etw/binding.c b/tools/etw/binding.c → src/tools/etw/binding.c
diff --git a/tools/etw/cxn.c → src/tools/etw/cxn.c b/tools/etw/cxn.c → src/tools/etw/cxn.c
diff --git a/tools/etw/library.c → src/tools/etw/library.c b/tools/etw/library.c → src/tools/etw/library.c
diff --git a/tools/etw/listener.c → src/tools/etw/listener.c b/tools/etw/listener.c → src/tools/etw/listener.c
diff --git a/tools/etw/main.c → src/tools/etw/main.c b/tools/etw/main.c → src/tools/etw/main.c
diff --git a/tools/etw/object_set.h → src/tools/etw/object_set.h b/tools/etw/object_set.h → src/tools/etw/object_set.h
diff --git a/tools/etw/python/quic_plot_conn_tput.py → src/tools/etw/python/quic_plot_conn_tput.py b/tools/etw/python/quic_plot_conn_tput.py → src/tools/etw/python/quic_plot_conn_tput.py
diff --git a/tools/etw/qjson.h → src/tools/etw/qjson.h b/tools/etw/qjson.h → src/tools/etw/qjson.h
diff --git a/tools/etw/quicetw.h → src/tools/etw/quicetw.h b/tools/etw/quicetw.h → src/tools/etw/quicetw.h
diff --git a/tools/etw/session.c → src/tools/etw/session.c b/tools/etw/session.c → src/tools/etw/session.c
diff --git a/tools/etw/stream.c → src/tools/etw/stream.c b/tools/etw/stream.c → src/tools/etw/stream.c
diff --git a/tools/etw/trace.c → src/tools/etw/trace.c b/tools/etw/trace.c → src/tools/etw/trace.c
diff --git a/tools/etw/worker.c → src/tools/etw/worker.c b/tools/etw/worker.c → src/tools/etw/worker.c
diff --git a/tools/etwlib/CMakeLists.txt → src/tools/etwlib/CMakeLists.txt b/tools/etwlib/CMakeLists.txt → src/tools/etwlib/CMakeLists.txt
diff --git a/tools/etwlib/MsQuicEventCollection.h → src/tools/etwlib/MsQuicEventCollection.h b/tools/etwlib/MsQuicEventCollection.h → src/tools/etwlib/MsQuicEventCollection.h
diff --git a/tools/etwlib/ObjectSet.h → src/tools/etwlib/ObjectSet.h b/tools/etwlib/ObjectSet.h → src/tools/etwlib/ObjectSet.h
diff --git a/tools/etwlib/QuicEventCollection.cpp → src/tools/etwlib/QuicEventCollection.cpp b/tools/etwlib/QuicEventCollection.cpp → src/tools/etwlib/QuicEventCollection.cpp
diff --git a/tools/etwlib/QuicEvents.h → src/tools/etwlib/QuicEvents.h b/tools/etwlib/QuicEvents.h → src/tools/etwlib/QuicEvents.h
diff --git a/tools/interop/CMakeLists.txt → src/tools/interop/CMakeLists.txt b/tools/interop/CMakeLists.txt → src/tools/interop/CMakeLists.txt
diff --git a/tools/interop/interop.cpp → src/tools/interop/interop.cpp b/tools/interop/interop.cpp → src/tools/interop/interop.cpp
diff --git a/tools/interop/interop.h → src/tools/interop/interop.h b/tools/interop/interop.h → src/tools/interop/interop.h
diff --git a/tools/ping/CMakeLists.txt → src/tools/ping/CMakeLists.txt b/tools/ping/CMakeLists.txt → src/tools/ping/CMakeLists.txt
diff --git a/tools/ping/Client.cpp → src/tools/ping/Client.cpp b/tools/ping/Client.cpp → src/tools/ping/Client.cpp
diff --git a/tools/ping/PingConnection.cpp → src/tools/ping/PingConnection.cpp b/tools/ping/PingConnection.cpp → src/tools/ping/PingConnection.cpp
diff --git a/tools/ping/PingConnection.h → src/tools/ping/PingConnection.h b/tools/ping/PingConnection.h → src/tools/ping/PingConnection.h
diff --git a/tools/ping/PingStream.cpp → src/tools/ping/PingStream.cpp b/tools/ping/PingStream.cpp → src/tools/ping/PingStream.cpp
diff --git a/tools/ping/PingStream.h → src/tools/ping/PingStream.h b/tools/ping/PingStream.h → src/tools/ping/PingStream.h
diff --git a/tools/ping/QuicPing.cpp → src/tools/ping/QuicPing.cpp b/tools/ping/QuicPing.cpp → src/tools/ping/QuicPing.cpp
diff --git a/tools/ping/QuicPing.h → src/tools/ping/QuicPing.h b/tools/ping/QuicPing.h → src/tools/ping/QuicPing.h
diff --git a/tools/ping/Server.cpp → src/tools/ping/Server.cpp b/tools/ping/Server.cpp → src/tools/ping/Server.cpp
diff --git a/tools/ping/readme.md → src/tools/ping/readme.md b/tools/ping/readme.md → src/tools/ping/readme.md
diff --git a/tools/reach/CMakeLists.txt → src/tools/reach/CMakeLists.txt b/tools/reach/CMakeLists.txt → src/tools/reach/CMakeLists.txt
diff --git a/tools/reach/reach.cpp → src/tools/reach/reach.cpp b/tools/reach/reach.cpp → src/tools/reach/reach.cpp
diff --git a/tools/sample/CMakeLists.txt → src/tools/sample/CMakeLists.txt b/tools/sample/CMakeLists.txt → src/tools/sample/CMakeLists.txt
diff --git a/tools/sample/sample.cpp → src/tools/sample/sample.cpp b/tools/sample/sample.cpp → src/tools/sample/sample.cpp
diff --git a/tools/spin/CMakeLists.txt → src/tools/spin/CMakeLists.txt b/tools/spin/CMakeLists.txt → src/tools/spin/CMakeLists.txt
diff --git a/tools/spin/spinquic.cpp → src/tools/spin/spinquic.cpp b/tools/spin/spinquic.cpp → src/tools/spin/spinquic.cpp
diff --git a/tools/void/CMakeLists.txt → src/tools/void/CMakeLists.txt b/tools/void/CMakeLists.txt → src/tools/void/CMakeLists.txt
diff --git a/tools/void/server.cpp → src/tools/void/server.cpp b/tools/void/server.cpp → src/tools/void/server.cpp