This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new c81bc2b013 cmake: add build support for some experimental plugins
(#10037)
c81bc2b013 is described below
commit c81bc2b0136fb494e78e2373073be1dedea559d8
Author: Brian Neradt <[email protected]>
AuthorDate: Fri Jul 14 19:45:32 2023 -0500
cmake: add build support for some experimental plugins (#10037)
This patch adds cmake build support for the following experimental plugins:
header_freq
fq_pacing
custom_redirect
cookie_remap
collapsed_forwarding
cert_reporting_tool
cache_fill
access_control
---
plugins/experimental/CMakeLists.txt | 8 ++++++
.../CMakeLists.txt | 24 +++++++++--------
.../unit_tests}/CMakeLists.txt | 31 ++++++++++++----------
plugins/experimental/access_control/utils.cc | 2 +-
.../experimental/{ => cache_fill}/CMakeLists.txt | 2 +-
.../{ => cert_reporting_tool}/CMakeLists.txt | 9 ++++++-
.../{ => collapsed_forwarding}/CMakeLists.txt | 2 +-
.../{traffic_dump => cookie_remap}/CMakeLists.txt | 31 ++++++++++++----------
.../{ => custom_redirect}/CMakeLists.txt | 2 +-
.../experimental/{ => fq_pacing}/CMakeLists.txt | 2 +-
.../experimental/{ => header_freq}/CMakeLists.txt | 2 +-
plugins/experimental/traffic_dump/CMakeLists.txt | 4 +--
.../traffic_dump/unit_tests/CMakeLists.txt | 2 +-
13 files changed, 71 insertions(+), 50 deletions(-)
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/CMakeLists.txt
index e67b6e83ae..57efb0b3fd 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/CMakeLists.txt
@@ -15,4 +15,12 @@
#
#######################
+add_subdirectory(access_control)
+add_subdirectory(cache_fill)
+add_subdirectory(cert_reporting_tool)
+add_subdirectory(collapsed_forwarding)
+add_subdirectory(cookie_remap)
+add_subdirectory(custom_redirect)
+add_subdirectory(fq_pacing)
+add_subdirectory(header_freq)
add_subdirectory(traffic_dump)
diff --git a/plugins/experimental/traffic_dump/CMakeLists.txt
b/plugins/experimental/access_control/CMakeLists.txt
similarity index 75%
copy from plugins/experimental/traffic_dump/CMakeLists.txt
copy to plugins/experimental/access_control/CMakeLists.txt
index 73f1ce8fce..14d194363a 100644
--- a/plugins/experimental/traffic_dump/CMakeLists.txt
+++ b/plugins/experimental/access_control/CMakeLists.txt
@@ -15,21 +15,23 @@
#
#######################
-project(traffic_dump)
+project(access_control)
-add_atsplugin(traffic_dump
- json_utils.cc
- session_data.cc
- traffic_dump.cc
- transaction_data.cc
+add_atsplugin(access_control
+ access_control.cc
+ common.cc
+ config.cc
+ headers.cc
+ pattern.cc
+ plugin.cc
+ utils.cc
)
-target_include_directories(traffic_dump PRIVATE
"${PROJECT_SOURCE_DIR}/include")
-
-target_link_libraries(traffic_dump
+target_link_libraries(access_control
PRIVATE
- libswoc
- "${OPENSSL_SSL_LIBRARY}"
+ ${PCRE_LIBRARY}
+ OpenSSL::SSL
+ OpenSSL::Crypto
)
if(BUILD_TESTING)
diff --git a/plugins/experimental/traffic_dump/CMakeLists.txt
b/plugins/experimental/access_control/unit_tests/CMakeLists.txt
similarity index 60%
copy from plugins/experimental/traffic_dump/CMakeLists.txt
copy to plugins/experimental/access_control/unit_tests/CMakeLists.txt
index 73f1ce8fce..32d4312350 100644
--- a/plugins/experimental/traffic_dump/CMakeLists.txt
+++ b/plugins/experimental/access_control/unit_tests/CMakeLists.txt
@@ -15,23 +15,26 @@
#
#######################
-project(traffic_dump)
-
-add_atsplugin(traffic_dump
- json_utils.cc
- session_data.cc
- traffic_dump.cc
- transaction_data.cc
+add_executable(test_access_control
+ test_access_control.cc
+ test_utils.cc
+ ${PROJECT_SOURCE_DIR}/access_control.cc
+ ${PROJECT_SOURCE_DIR}/common.cc
+ ${PROJECT_SOURCE_DIR}/utils.cc
)
-target_include_directories(traffic_dump PRIVATE
"${PROJECT_SOURCE_DIR}/include")
+target_include_directories(test_access_control
+ PRIVATE
+ ${PROJECT_SOURCE_DIR}
+)
-target_link_libraries(traffic_dump
+target_link_libraries(test_access_control
PRIVATE
- libswoc
- "${OPENSSL_SSL_LIBRARY}"
+ ts::tscore
+ OpenSSL::SSL
+ OpenSSL::Crypto
+ catch2::catch2
)
+target_compile_definitions(test_access_control PRIVATE
ACCESS_CONTROL_UNIT_TEST)
-if(BUILD_TESTING)
- add_subdirectory(unit_tests)
-endif()
+add_test(NAME test_access_control COMMAND test_access_control)
diff --git a/plugins/experimental/access_control/utils.cc
b/plugins/experimental/access_control/utils.cc
index 3ff7e247c7..fd27dc1a73 100644
--- a/plugins/experimental/access_control/utils.cc
+++ b/plugins/experimental/access_control/utils.cc
@@ -30,7 +30,7 @@
#include "common.h"
#include "utils.h"
#include "tscore/ink_base64.h"
-#include "ink_autoconf.h"
+#include "tscore/ink_config.h"
/* ******* Encoding/Decoding functions ******* */
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/cache_fill/CMakeLists.txt
similarity index 93%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/cache_fill/CMakeLists.txt
index e67b6e83ae..b43cf1cf39 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/cache_fill/CMakeLists.txt
@@ -15,4 +15,4 @@
#
#######################
-add_subdirectory(traffic_dump)
+add_atsplugin(cache_fill background_fetch.cc cache_fill.cc)
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/cert_reporting_tool/CMakeLists.txt
similarity index 83%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/cert_reporting_tool/CMakeLists.txt
index e67b6e83ae..3d3fb36c90 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/cert_reporting_tool/CMakeLists.txt
@@ -15,4 +15,11 @@
#
#######################
-add_subdirectory(traffic_dump)
+project(cert_reporting_tool)
+
+add_atsplugin(cert_reporting_tool cert_reporting_tool.cc)
+
+target_link_libraries(cert_reporting_tool
+ PRIVATE
+ OpenSSL::SSL
+)
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/collapsed_forwarding/CMakeLists.txt
similarity index 93%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/collapsed_forwarding/CMakeLists.txt
index e67b6e83ae..57828632f9 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/collapsed_forwarding/CMakeLists.txt
@@ -15,4 +15,4 @@
#
#######################
-add_subdirectory(traffic_dump)
+add_atsplugin(collapsed_forwarding collapsed_forwarding.cc)
diff --git a/plugins/experimental/traffic_dump/CMakeLists.txt
b/plugins/experimental/cookie_remap/CMakeLists.txt
similarity index 65%
copy from plugins/experimental/traffic_dump/CMakeLists.txt
copy to plugins/experimental/cookie_remap/CMakeLists.txt
index 73f1ce8fce..09bb7bcc46 100644
--- a/plugins/experimental/traffic_dump/CMakeLists.txt
+++ b/plugins/experimental/cookie_remap/CMakeLists.txt
@@ -15,23 +15,26 @@
#
#######################
-project(traffic_dump)
+project(cookie_remap)
-add_atsplugin(traffic_dump
- json_utils.cc
- session_data.cc
- traffic_dump.cc
- transaction_data.cc
+add_atsplugin(cookie_remap
+ cookie_remap.cc
+ cookiejar.cc
+ strip.cc
)
-target_include_directories(traffic_dump PRIVATE
"${PROJECT_SOURCE_DIR}/include")
-
-target_link_libraries(traffic_dump
- PRIVATE
- libswoc
- "${OPENSSL_SSL_LIBRARY}"
-)
+target_link_libraries(cookie_remap PRIVATE yaml-cpp::yaml-cpp)
if(BUILD_TESTING)
- add_subdirectory(unit_tests)
+ add_executable(test_cookiejar
+ test_cookiejar.cc
+ strip.cc
+ cookiejar.cc
+ )
+
+ target_include_directories(test_cookiejar PRIVATE "${PROJECT_SOURCE_DIR}")
+
+ target_link_libraries(test_cookiejar PRIVATE catch2::catch2)
+
+ add_test(NAME test_cookiejar COMMAND test_cookiejar)
endif()
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/custom_redirect/CMakeLists.txt
similarity index 94%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/custom_redirect/CMakeLists.txt
index e67b6e83ae..c08a12770b 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/custom_redirect/CMakeLists.txt
@@ -15,4 +15,4 @@
#
#######################
-add_subdirectory(traffic_dump)
+add_atsplugin(custom_redirect custom_redirect.cc)
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/fq_pacing/CMakeLists.txt
similarity index 95%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/fq_pacing/CMakeLists.txt
index e67b6e83ae..457e69ae60 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/fq_pacing/CMakeLists.txt
@@ -15,4 +15,4 @@
#
#######################
-add_subdirectory(traffic_dump)
+add_atsplugin(fq_pacing fq_pacing.c)
diff --git a/plugins/experimental/CMakeLists.txt
b/plugins/experimental/header_freq/CMakeLists.txt
similarity index 95%
copy from plugins/experimental/CMakeLists.txt
copy to plugins/experimental/header_freq/CMakeLists.txt
index e67b6e83ae..58b8c850cd 100644
--- a/plugins/experimental/CMakeLists.txt
+++ b/plugins/experimental/header_freq/CMakeLists.txt
@@ -15,4 +15,4 @@
#
#######################
-add_subdirectory(traffic_dump)
+add_atsplugin(header_freq header_freq.cc)
diff --git a/plugins/experimental/traffic_dump/CMakeLists.txt
b/plugins/experimental/traffic_dump/CMakeLists.txt
index 73f1ce8fce..f2e282c010 100644
--- a/plugins/experimental/traffic_dump/CMakeLists.txt
+++ b/plugins/experimental/traffic_dump/CMakeLists.txt
@@ -24,12 +24,10 @@ add_atsplugin(traffic_dump
transaction_data.cc
)
-target_include_directories(traffic_dump PRIVATE
"${PROJECT_SOURCE_DIR}/include")
-
target_link_libraries(traffic_dump
PRIVATE
libswoc
- "${OPENSSL_SSL_LIBRARY}"
+ OpenSSL::SSL
)
if(BUILD_TESTING)
diff --git a/plugins/experimental/traffic_dump/unit_tests/CMakeLists.txt
b/plugins/experimental/traffic_dump/unit_tests/CMakeLists.txt
index 30136656fb..47a987315b 100644
--- a/plugins/experimental/traffic_dump/unit_tests/CMakeLists.txt
+++ b/plugins/experimental/traffic_dump/unit_tests/CMakeLists.txt
@@ -19,7 +19,7 @@ add_executable(test_traffic_dump
unit_test_main.cc
test_json_utils.cc
test_sensitive_fields.cc
- "${PROJECT_SOURCE_DIR}/json_utils.cc"
+ ${PROJECT_SOURCE_DIR}/json_utils.cc
)
target_include_directories(test_traffic_dump PRIVATE "${PROJECT_SOURCE_DIR}")
