Skip to content

GitLab

Commit d101aed6 authored by Stephen Morris's avatar Stephen Morris
Browse files

[master] Merge branch 'trac3481' 

Conflicts:
	configure.ac
	src/bin/Makefile.am
parents 81df8441 1c76dae7
Hide whitespace changes
Inline Side-by-side
configure.ac
View file @ d101aed6
......@@ -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/Makefile
src/bin/keactrl/kea.conf
src/bin/keactrl/keactrl
src/bin/keactrl/keactrl.conf
src/bin/keactrl/Makefile
src/bin/keactrl/tests/keactrl_tests.sh
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], [
......
src/bin/Makefile.am
View file @ d101aed6
# The following build order must be maintained.
SUBDIRS = dhcp4 dhcp6 d2
SUBDIRS = dhcp4 dhcp6 d2 perfdhcp
if CONFIG_BACKEND_JSON
SUBDIRS += keactrl
......
tests/tools/perfdhcp/Makefile.am → src/bin/perfdhcp/Makefile.am
View file @ d101aed6
......@@ -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
......
tests/tools/perfdhcp/main.cc → src/bin/perfdhcp/main.cc
View file @ d101aed6
// 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);
}
tests/tools/perfdhcp/perf_pkt4.h → src/bin/perfdhcp/perf_pkt4.h
View file @ d101aed6
// 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.
......
tests/tools/perfdhcp/perfdhcp.xml → src/bin/perfdhcp/perfdhcp.xml
View file @ d101aed6
......@@ -24,7 +24,7 @@
<refmeta>
<refentrytitle>perfdhcp</refentrytitle>
<manvolnum>1</manvolnum>
<manvolnum>8</manvolnum>
<refmiscinfo>Kea</refmiscinfo>
</refmeta>
......
tests/tools/perfdhcp/pkt_transform.cc → src/bin/perfdhcp/pkt_transform.cc
View file @ d101aed6
// 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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment