[#3731] Addressed fuzz option

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index 051b458b03ddc86bbb56bfc85e3c50e505725fba..55818d700c6c80811767fdde90aad8e5effb2fb3 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -1,5 +1,4 @@
-kea_dhcpsrv_lib = shared_library(
-    'kea-dhcpsrv',
+sources = [
     'allocation_state.cc',
     'allocator.cc',
     'alloc_engine.cc',
@@ -43,8 +42,6 @@ kea_dhcpsrv_lib = shared_library(
     'dhcpsrv_messages.cc',
     'flq_allocation_state.cc',
     'flq_allocator.cc',
-    'fuzz_log.cc',
-    'fuzz_messages.cc',
     'host.cc',
     'hosts_log.cc',
     'hosts_messages.cc',
@@ -63,7 +60,6 @@ kea_dhcpsrv_lib = shared_library(
     'ncr_generator.cc',
     'network.cc',
     'network_state.cc',
-    'packet_fuzzer.cc',
     'parsers/base_network_parser.cc',
     'parsers/client_class_def_parser.cc',
     'parsers/dhcp_parsers.cc',
@@ -88,6 +84,13 @@ kea_dhcpsrv_lib = shared_library(
     'subnet.cc',
     'timer_mgr.cc',
     'tracking_lease_mgr.cc',
+]
+if FUZZ_OPT.enabled()
+    sources += ['fuzz_log.cc', 'fuzz_messages.cc', 'packet_fuzzer.cc']
+endif
+kea_dhcpsrv_lib = shared_library(
+    'kea-dhcpsrv',
+    sources,
     cpp_args: [
         f'-DDHCP_DATA_DIR="@DHCP_DATA_DIR@"',
         f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
@@ -154,8 +157,6 @@ kea_dhcpsrv_headers = [
     'dhcpsrv_messages.h',
     'flq_allocation_state.h',
     'flq_allocator.h',
-    'fuzz_log.h',
-    'fuzz_messages.h',
     'host.h',
     'host_container.h',
     'host_data_source_factory.h',
@@ -179,7 +180,6 @@ kea_dhcpsrv_headers = [
     'ncr_generator.h',
     'network.h',
     'network_state.h',
-    'packet_fuzzer.h',
     'parsers/base_network_parser.h',
     'parsers/client_class_def_parser.h',
     'parsers/dhcp_parsers.h',
@@ -211,6 +211,9 @@ kea_dhcpsrv_headers = [
     'utils.h',
     'writable_host_data_source.h',
 ]
+if FUZZ_OPT.enabled()
+    kea_dhcpsrv_headers += ['fuzz_log.h', 'fuzz_messages.h', 'packet_fuzzer.h']
+endif
 install_headers(kea_dhcpsrv_headers, preserve_path: true, subdir: 'kea/dhcpsrv')
 
 if KEA_MSG_COMPILER.found()

diff --git a/src/lib/dhcpsrv/tests/meson.build b/src/lib/dhcpsrv/tests/meson.build
index 648e97f14dd75f822e12af50d48bc052d9438c3a..13e98a130d86a78304b44a14ef863b2ab0266852 100644 (file)
--- a/src/lib/dhcpsrv/tests/meson.build
+++ b/src/lib/dhcpsrv/tests/meson.build
@@ -47,8 +47,7 @@ co3 = shared_library(
     name_suffix: 'so',
 )
 
-kea_dhcpsrv_tests = executable(
-    'kea-dhcpsrv-tests',
+sources = [
     'alloc_engine4_unittest.cc',
     'alloc_engine6_unittest.cc',
     'alloc_engine_expiration_unittest.cc',
@@ -122,6 +121,13 @@ kea_dhcpsrv_tests = executable(
     'test_get_callout_handle.cc',
     'timer_mgr_unittest.cc',
     'tracking_lease_mgr_unittest.cc',
+]
+if FUZZ_OPT.enabled()
+    sources += ['packet_fuzzer_unittest.cc']
+endif
+kea_dhcpsrv_tests = executable(
+    'kea-dhcpsrv-tests',
+    sources,
     cpp_args: [
         f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
         f'-DDHCP_DATA_DIR="@current_build_dir@"',