mirror of
https://gitlab.isc.org/isc-projects/kea
synced 2025-08-30 13:37:55 +00:00
[master] Merge branch 'trac3481'
Conflicts: configure.ac src/bin/Makefile.am
This commit is contained in:
Stephen Morris
46
configure.ac
46
configure.ac
@@ -1363,6 +1363,8 @@ AC_CONFIG_FILES([compatcheck/Makefile
|
||||
ext/Makefile
|
||||
m4macros/Makefile
|
||||
Makefile
|
||||
src/Makefile
|
||||
src/bin/Makefile
|
||||
src/bin/d2/Makefile
|
||||
src/bin/d2/spec_config.h.pre
|
||||
src/bin/d2/tests/Makefile
|
||||
@@ -1370,30 +1372,33 @@ AC_CONFIG_FILES([compatcheck/Makefile
|
||||
src/bin/d2/tests/test_data_files_config.h
|
||||
src/bin/dhcp4/Makefile
|
||||
src/bin/dhcp4/spec_config.h.pre
|
||||
src/bin/dhcp4/tests/dhcp4_process_tests.sh
|
||||
src/bin/dhcp4/tests/Makefile
|
||||
src/bin/dhcp4/tests/dhcp4_process_tests.sh
|
||||
src/bin/dhcp4/tests/marker_file.h
|
||||
src/bin/dhcp4/tests/test_data_files_config.h
|
||||
src/bin/dhcp4/tests/test_libraries.h
|
||||
src/bin/dhcp6/Makefile
|
||||
src/bin/dhcp6/spec_config.h.pre
|
||||
src/bin/dhcp6/tests/dhcp6_process_tests.sh
|
||||
src/bin/dhcp6/tests/Makefile
|
||||
src/bin/dhcp6/tests/dhcp6_process_tests.sh
|
||||
src/bin/dhcp6/tests/marker_file.h
|
||||
src/bin/dhcp6/tests/test_data_files_config.h
|
||||
src/bin/dhcp6/tests/test_libraries.h
|
||||
src/bin/keactrl/keactrl
|
||||
src/bin/keactrl/kea.conf
|
||||
src/bin/keactrl/keactrl.conf
|
||||
src/bin/keactrl/Makefile
|
||||
src/bin/keactrl/tests/keactrl_tests.sh
|
||||
src/bin/keactrl/kea.conf
|
||||
src/bin/keactrl/keactrl
|
||||
src/bin/keactrl/keactrl.conf
|
||||
src/bin/keactrl/tests/Makefile
|
||||
src/bin/Makefile
|
||||
src/bin/keactrl/tests/keactrl_tests.sh
|
||||
src/bin/perfdhcp/Makefile
|
||||
src/bin/perfdhcp/tests/Makefile
|
||||
src/bin/perfdhcp/tests/testdata/Makefile
|
||||
src/hooks/Makefile
|
||||
src/hooks/dhcp/Makefile
|
||||
src/hooks/dhcp/user_chk/Makefile
|
||||
src/hooks/dhcp/user_chk/tests/Makefile
|
||||
src/hooks/dhcp/user_chk/tests/test_data_files_config.h
|
||||
src/hooks/Makefile
|
||||
src/lib/Makefile
|
||||
src/lib/asiodns/Makefile
|
||||
src/lib/asiodns/tests/Makefile
|
||||
src/lib/asiolink/Makefile
|
||||
@@ -1403,21 +1408,21 @@ AC_CONFIG_FILES([compatcheck/Makefile
|
||||
src/lib/cc/tests/Makefile
|
||||
src/lib/cc/tests/session_unittests_config.h
|
||||
src/lib/config/Makefile
|
||||
src/lib/config/tests/data_def_unittests_config.h
|
||||
src/lib/config/tests/Makefile
|
||||
src/lib/config/tests/data_def_unittests_config.h
|
||||
src/lib/config/tests/testdata/Makefile
|
||||
src/lib/cryptolink/Makefile
|
||||
src/lib/cryptolink/tests/Makefile
|
||||
src/lib/dhcp/Makefile
|
||||
src/lib/dhcp/tests/Makefile
|
||||
src/lib/dhcp_ddns/Makefile
|
||||
src/lib/dhcp_ddns/tests/Makefile
|
||||
src/lib/dhcp/Makefile
|
||||
src/lib/dhcpsrv/Makefile
|
||||
src/lib/dhcpsrv/testutils/Makefile
|
||||
src/lib/dhcpsrv/tests/Makefile
|
||||
src/lib/dhcpsrv/tests/test_libraries.h
|
||||
src/lib/dhcp/tests/Makefile
|
||||
src/lib/dns/gen-rdatacode.py
|
||||
src/lib/dhcpsrv/testutils/Makefile
|
||||
src/lib/dns/Makefile
|
||||
src/lib/dns/gen-rdatacode.py
|
||||
src/lib/dns/tests/Makefile
|
||||
src/lib/dns/tests/testdata/Makefile
|
||||
src/lib/exceptions/Makefile
|
||||
@@ -1426,37 +1431,32 @@ AC_CONFIG_FILES([compatcheck/Makefile
|
||||
src/lib/hooks/tests/Makefile
|
||||
src/lib/hooks/tests/marker_file.h
|
||||
src/lib/hooks/tests/test_libraries.h
|
||||
src/lib/log/Makefile
|
||||
src/lib/log/compiler/Makefile
|
||||
src/lib/log/interprocess/Makefile
|
||||
src/lib/log/interprocess/tests/Makefile
|
||||
src/lib/log/Makefile
|
||||
src/lib/log/tests/Makefile
|
||||
src/lib/log/tests/buffer_logger_test.sh
|
||||
src/lib/log/tests/console_test.sh
|
||||
src/lib/log/tests/destination_test.sh
|
||||
src/lib/log/tests/init_logger_test.sh
|
||||
src/lib/log/tests/local_file_test.sh
|
||||
src/lib/log/tests/logger_lock_test.sh
|
||||
src/lib/log/tests/Makefile
|
||||
src/lib/log/tests/severity_test.sh
|
||||
src/lib/log/tests/tempdir.h
|
||||
src/lib/Makefile
|
||||
src/lib/testutils/dhcp_test_lib.sh
|
||||
src/lib/testutils/Makefile
|
||||
src/lib/testutils/dhcp_test_lib.sh
|
||||
src/lib/testutils/testdata/Makefile
|
||||
src/lib/util/io/Makefile
|
||||
src/lib/util/Makefile
|
||||
src/lib/util/python/gen_wiredata.py
|
||||
src/lib/util/io/Makefile
|
||||
src/lib/util/python/Makefile
|
||||
src/lib/util/python/gen_wiredata.py
|
||||
src/lib/util/tests/Makefile
|
||||
src/lib/util/threads/Makefile
|
||||
src/lib/util/threads/tests/Makefile
|
||||
src/lib/util/unittests/Makefile
|
||||
src/Makefile
|
||||
tests/Makefile
|
||||
tests/tools/Makefile
|
||||
tests/tools/perfdhcp/Makefile
|
||||
tests/tools/perfdhcp/tests/Makefile
|
||||
tests/tools/perfdhcp/tests/testdata/Makefile
|
||||
])
|
||||
|
||||
AC_CONFIG_COMMANDS([permissions], [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# The following build order must be maintained.
|
||||
SUBDIRS = dhcp4 dhcp6 d2
|
||||
SUBDIRS = dhcp4 dhcp6 d2 perfdhcp
|
||||
|
||||
if CONFIG_BACKEND_JSON
|
||||
SUBDIRS += keactrl
|
||||
|
||||
@@ -17,7 +17,7 @@ if USE_STATIC_LINK
|
||||
AM_LDFLAGS += -static
|
||||
endif
|
||||
|
||||
bin_PROGRAMS = perfdhcp
|
||||
sbin_PROGRAMS = perfdhcp
|
||||
perfdhcp_SOURCES = main.cc
|
||||
perfdhcp_SOURCES += command_options.cc command_options.h
|
||||
perfdhcp_SOURCES += localized_option.h
|
||||
@@ -45,13 +45,13 @@ perfdhcp_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la
|
||||
# ... and the documentation
|
||||
EXTRA_DIST = perfdhcp_internals.dox
|
||||
|
||||
man_MANS = perfdhcp.1
|
||||
man_MANS = perfdhcp.8
|
||||
DISTCLEANFILES = $(man_MANS)
|
||||
EXTRA_DIST += $(man_MANS) perfdhcp.xml
|
||||
|
||||
if GENERATE_DOCS
|
||||
|
||||
perfdhcp.1: perfdhcp.xml
|
||||
perfdhcp.8: perfdhcp.xml
|
||||
@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(builddir)/perfdhcp.xml
|
||||
|
||||
else
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
|
||||
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -61,4 +61,3 @@ main(int argc, char* argv[]) {
|
||||
}
|
||||
return (ret_code);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
|
||||
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
void writeAt(size_t dest_pos,
|
||||
std::vector<uint8_t>::iterator first,
|
||||
std::vector<uint8_t>::iterator last);
|
||||
|
||||
|
||||
/// \brief Replace contents of buffer with value.
|
||||
///
|
||||
/// Function replaces part of buffer with value.
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
<refmeta>
|
||||
<refentrytitle>perfdhcp</refentrytitle>
|
||||
<manvolnum>1</manvolnum>
|
||||
<manvolnum>8</manvolnum>
|
||||
<refmiscinfo>Kea</refmiscinfo>
|
||||
</refmeta>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2012 Internet Systems Consortium, Inc. ("ISC")
|
||||
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -214,7 +214,7 @@ PktTransform::unpackOptions(const OptionBuffer& in_buffer,
|
||||
in_buffer.begin() + offset + opt_len);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PktTransform::writeAt(dhcp::OptionBuffer& in_buffer, size_t dest_pos,
|
||||
dhcp::OptionBuffer::iterator first,
|
||||
@@ -31,12 +31,12 @@ run_unittests_SOURCES += rate_control_unittest.cc
|
||||
run_unittests_SOURCES += stats_mgr_unittest.cc
|
||||
run_unittests_SOURCES += test_control_unittest.cc
|
||||
run_unittests_SOURCES += command_options_helper.h
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/command_options.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/pkt_transform.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/perf_pkt6.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/perf_pkt4.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/rate_control.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/tests/tools/perfdhcp/test_control.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/command_options.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/pkt_transform.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/perf_pkt6.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/perf_pkt4.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/rate_control.cc
|
||||
run_unittests_SOURCES += $(top_builddir)/src/bin/perfdhcp/test_control.cc
|
||||
|
||||
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
|
||||
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
|
||||
@@ -1,4 +1,4 @@
|
||||
// Copyright (C) 2012-2013 Internet Systems Consortium, Inc. ("ISC")
|
||||
// Copyright (C) 2012-2014 Internet Systems Consortium, Inc. ("ISC")
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
@@ -781,7 +781,7 @@ TEST_F(CommandOptionsTest, Interface) {
|
||||
const dhcp::IfaceMgr::IfaceCollection& ifaces = iface_mgr.getIfaces();
|
||||
std::string iface_name;
|
||||
CommandOptions& opt = CommandOptions::instance();
|
||||
// The local loopback interface should be available.
|
||||
// The local loopback interface should be available.
|
||||
// If no interface have been found for any reason we should
|
||||
// not fail this test.
|
||||
if (ifaces.size() > 0) {
|
||||
@@ -1 +1 @@
|
||||
SUBDIRS = . perfdhcp
|
||||
SUBDIRS = .
|
||||
|
||||
Reference in New Issue
Block a user