[master] Merge branch 'trac5372'

src/lib/asiodns/Makefile.am

@@ -35,3 +35,10 @@ libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiodns_la_LIBADD += $(BOOST_LIBS)
 libkea_asiodns_la_LIBADD += $(LOG4CPLUS_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_asiodns_includedir = $(pkgincludedir)/asiodns
+libkea_asiodns_include_HEADERS = \
+	io_fetch.h \
+	logger.h
+

src/lib/asiolink/Makefile.am

@@ -44,19 +44,25 @@ libkea_asiolink_la_CPPFLAGS = $(AM_CPPFLAGS)
 libkea_asiolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_asiolink_la_LIBADD += $(BOOST_LIBS)
 
-# IOAddress is sometimes used in user-library code
+# Specify the headers for copying into the installation directory tree.
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
 libkea_asiolink_include_HEADERS = \
-    asiolink.h \
-    asio_wrapper.h \
+	asio_wrapper.h \
+	asiolink.h \
+	dummy_io_cb.h \
 	interval_timer.h \
-    io_address.h \
+	io_acceptor.h \
+	io_address.h \
 	io_asio_socket.h \
 	io_endpoint.h \
 	io_error.h \
 	io_service.h \
 	io_socket.h \
+	tcp_acceptor.h \
 	tcp_endpoint.h \
-    tcp_socket.h \
+	tcp_socket.h \
 	udp_endpoint.h \
-    udp_socket.h
+	udp_socket.h \
+	unix_domain_socket.h \
+	unix_domain_socket_acceptor.h \
+	unix_domain_socket_endpoint.h

src/lib/cc/Makefile.am

@@ -18,10 +18,16 @@ libkea_cc_la_LIBADD += $(BOOST_LIBS)
 
 libkea_cc_la_LDFLAGS = -no-undefined -version-info 2:0:0
 
-# Since data.h is now used in the hooks interface, it needs to be
-# installed on target system.
+# Specify the headers for copying into the installation directory tree.
 libkea_cc_includedir = $(pkgincludedir)/cc
-libkea_cc_include_HEADERS = cfg_to_element.h data.h dhcp_config_error.h
+libkea_cc_include_HEADERS = \
+	cfg_to_element.h \
+	command_interpreter.h \
+	data.h \
+	dhcp_config_error.h \
+	json_feed.h \
+	simple_parser.h
+
 
 EXTRA_DIST = cc.dox
 

src/lib/cfgrpt/Makefile.am

@@ -21,3 +21,9 @@ report_file = $(abs_top_builddir)/config.report
 # Generate config_report.cc
 config_report.cc: $(report_file)
 	${SHELL} $(top_srcdir)/tools/mk_cfgrpt.sh $(report_file) $(top_builddir)/src/lib/cfgrpt/config_report.cc
+
+# Specify the headers for copying into the installation directory tree. The
+# following headers are anticipated to be useful for the user libraries.
+libkea_cfgrpt_includedir = $(pkgincludedir)/cfgrpt
+libkea_cfgrpt_include_HEADERS = \
+	config_report.h

src/lib/config/Makefile.am

@@ -43,3 +43,17 @@ nodist_libkea_cfgclient_la_SOURCES  = config_messages.h config_messages.cc
 EXTRA_DIST = config_messages.mes command-socket.dox
 
 CLEANFILES = *.gcno *.gcda config_messages.h config_messages.cc s-messages
+
+# Specify the headers for copying into the installation directory tree.
+libkea_cfgclient_includedir = $(pkgincludedir)/config
+libkea_cfgclient_include_HEADERS = \
+	base_command_mgr.h \
+	client_connection.h \
+	cmds_impl.h \
+	command_mgr.h \
+	config_data.h \
+	config_log.h \
+	hooked_command_mgr.h \
+	module_spec.h
+
+

src/lib/cryptolink/Makefile.am

@@ -29,3 +29,22 @@ libkea_cryptolink_la_LDFLAGS = $(CRYPTO_LDFLAGS)
 libkea_cryptolink_la_LDFLAGS += -no-undefined -version-info 2:0:0
 libkea_cryptolink_la_LIBADD  = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_cryptolink_la_LIBADD += $(CRYPTO_LIBS)
+
+
+# Specify the headers for copying into the installation directory tree.
+libkea_cryptolink_includedir = $(pkgincludedir)/cryptolink
+libkea_cryptolink_include_HEADERS = \
+	crypto_hash.h \
+	crypto_hmac.h \
+	cryptolink.h
+
+if HAVE_BOTAN
+libkea_cryptolink_include_HEADERS += \
+	botan_common.h
+endif
+
+if HAVE_OPENSSL
+libkea_cryptolink_include_HEADERS += \
+	openssl_common.h \
+	openssl_compat.h
+endif

src/lib/dhcp/Makefile.am

@@ -82,47 +82,55 @@ EXTRA_DIST  = README libdhcp++.dox
 # written libraries may need access to all libdhcp++ headers.
 libkea_dhcp___includedir = $(pkgincludedir)/dhcp
 libkea_dhcp___include_HEADERS = \
-    classify.h \
-    dhcp4.h \
-    dhcp6.h \
-    docsis3_option_defs.h \
-    duid.h \
-    duid_factory.h \
-    hwaddr.h \
-    iface_mgr.h \
-    iface_mgr_error_handler.h \
-    libdhcp++.h \
-    opaque_data_tuple.h \
-    option4_addrlst.h \
-    option4_client_fqdn.h \
-    option6_addrlst.h \
-    option6_client_fqdn.h \
-    option6_ia.h \
-    option6_iaaddr.h \
-    option6_iaprefix.h \
-    option6_pdexclude.h \
-    option6_status_code.h \
-    option.h \
-    option_custom.h \
-    option_data_types.h \
-    option_definition.h \
-    option_int.h \
-    option_int_array.h \
-    option_opaque_data_tuples.h \
-    option_space.h \
-    option_space_container.h \
-    option_string.h \
-    option_vendor.h \
-    option_vendor_class.h \
-    pkt.h \
-    pkt4.h \
-    pkt4o6.h \
-    pkt6.h \
-    pkt_filter.h \
-    pkt_filter6.h \
-    pkt_filter_bpf.h \
-    pkt_filter_inet.h \
-    pkt_filter_inet6.h \
-    pkt_filter_lpf.h \
-    protocol_util.h \
-    std_option_defs.h
+	classify.h \
+	dhcp4.h \
+	dhcp6.h \
+	docsis3_option_defs.h \
+	duid.h \
+	duid_factory.h \
+	hwaddr.h \
+	iface_mgr.h \
+	iface_mgr_error_handler.h \
+	libdhcp++.h \
+	opaque_data_tuple.h \
+	option.h \
+	option4_addrlst.h \
+	option4_client_fqdn.h \
+	option6_addrlst.h \
+	option6_client_fqdn.h \
+	option6_ia.h \
+	option6_iaaddr.h \
+	option6_iaprefix.h \
+	option6_pdexclude.h \
+	option6_status_code.h \
+	option_custom.h \
+	option_data_types.h \
+	option_definition.h \
+	option_int.h \
+	option_int_array.h \
+	option_opaque_data_tuples.h \
+	option_space.h \
+	option_space_container.h \
+	option_string.h \
+	option_vendor.h \
+	option_vendor_class.h \
+	pkt.h \
+	pkt4.h \
+	pkt4o6.h \
+	pkt6.h \
+	pkt_filter.h \
+	pkt_filter6.h \
+	pkt_filter_inet.h \
+	pkt_filter_inet6.h \
+	protocol_util.h \
+	std_option_defs.h
+
+if OS_LINUX
+libkea_dhcp___include_HEADERS += \
+	pkt_filter_lpf.h
+endif
+
+if OS_BSD
+libkea_dhcp___include_HEADERS += \
+	pkt_filter_bpf.h
+endif

src/lib/dhcp_ddns/Makefile.am

@@ -52,6 +52,7 @@ libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS)
 # Specify the headers for copying into the installation directory tree.
 libkea_dhcp_ddns_includedir = $(pkgincludedir)/dhcp_ddns
 libkea_dhcp_ddns_include_HEADERS = \
-   ncr_io.h \
-   ncr_msg.h \
-   ncr_udp.h
+	dhcp_ddns_log.h \
+	ncr_io.h \
+	ncr_msg.h \
+	ncr_udp.h

src/lib/dhcpsrv/Makefile.am

@@ -188,7 +188,7 @@ libkea_dhcpsrv_la_SOURCES += parsers/simple_parser4.h
 libkea_dhcpsrv_la_SOURCES += parsers/simple_parser6.cc
 libkea_dhcpsrv_la_SOURCES += parsers/simple_parser6.h
 
-nodist_libkea_dhcpsrv_la_SOURCES = alloc_engine__messages.h
+nodist_libkea_dhcpsrv_la_SOURCES = alloc_engine_messages.h
 nodist_libkea_dhcpsrv_la_SOURCES += alloc_engine_messages.cc
 nodist_libkea_dhcpsrv_la_SOURCES += dhcpsrv_messages.h dhcpsrv_messages.cc
 nodist_libkea_dhcpsrv_la_SOURCES += hosts_messages.h hosts_messages.cc
@@ -235,21 +235,107 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox
 # Specification file
 EXTRA_DIST += logging.spec
 
-# Specify the headers for copying into the installation directory tree. The
-# following headers are anticipated to be useful for the user libraries.
+# Specify the headers for copying into the installation directory tree.
 libkea_dhcpsrv_includedir = $(pkgincludedir)/dhcpsrv
 libkea_dhcpsrv_include_HEADERS = \
-    cfg_option.h \
-    cfg_4o6.h \
-    d2_client_cfg.h \
-    d2_client_mgr.h \
-    key_from_key.h \
-    lease.h \
-    ncr_generator.h \
-    pool.h \
-    subnet.h \
-    subnet_id.h \
-    triplet.h
+	addr_utilities.h \
+	alloc_engine.h \
+	alloc_engine_log.h \
+	assignable_network.h \
+	base_host_data_source.h \
+	callout_handle_store.h \
+	cfg_4o6.h \
+	cfg_db_access.h \
+	cfg_duid.h \
+	cfg_expiration.h \
+	cfg_host_operations.h \
+	cfg_hosts.h \
+	cfg_hosts_util.h \
+	cfg_iface.h \
+	cfg_mac_source.h \
+	cfg_option.h \
+	cfg_option_def.h \
+	cfg_rsoo.h \
+	cfg_shared_networks.h \
+	cfg_subnets4.h \
+	cfg_subnets6.h \
+	cfgmgr.h \
+	client_class_def.h \
+	csv_lease_file4.h \
+	csv_lease_file6.h \
+	d2_client_cfg.h \
+	d2_client_mgr.h \
+	daemon.h \
+	database_connection.h \
+	db_exceptions.h \
+	dhcp4o6_ipc.h \
+	dhcpsrv_log.h \
+	host.h \
+	host_container.h \
+	host_data_source_factory.h \
+	host_mgr.h \
+	hosts_log.h \
+	key_from_key.h \
+	lease.h \
+	lease_file_loader.h \
+	lease_file_stats.h \
+	lease_mgr.h \
+	lease_mgr_factory.h \
+	logging.h \
+	logging_info.h \
+	memfile_lease_mgr.h \
+	memfile_lease_storage.h \
+	ncr_generator.h \
+	network.h \
+	pool.h \
+	shared_network.h \
+	srv_config.h \
+	subnet.h \
+	subnet_id.h \
+	subnet_selector.h \
+	timer_mgr.h \
+	triplet.h \
+	utils.h \
+	writable_host_data_source.h
+
+if HAVE_CQL
+libkea_dhcpsrv_include_HEADERS += \
+	cql_connection.h \
+	cql_lease_mgr.h
+endif
+
+if HAVE_MYSQL
+libkea_dhcpsrv_include_HEADERS += \
+	mysql_connection.h \
+	mysql_host_data_source.h \
+	mysql_lease_mgr.h
+endif
+
+if HAVE_PGSQL
+libkea_dhcpsrv_include_HEADERS += \
+	pgsql_connection.h \
+	pgsql_exchange.h \
+	pgsql_host_data_source.h \
+	pgsql_lease_mgr.h
+endif
+
+# Specify parsers' headers for copying into installation directory tree.
+libkea_dhcpsrv_parsers_includedir = $(pkgincludedir)/dhcpsrv/parsers
+libkea_dhcpsrv_parsers_include_HEADERS = \
+	parsers/client_class_def_parser.h \
+	parsers/dbaccess_parser.h \
+	parsers/dhcp_parsers.h \
+	parsers/duid_config_parser.h \
+	parsers/expiration_config_parser.h \
+	parsers/host_reservation_parser.h \
+	parsers/host_reservations_list_parser.h \
+	parsers/ifaces_config_parser.h \
+	parsers/option_data_parser.h \
+	parsers/shared_network_parser.h \
+	parsers/shared_networks_list_parser.h \
+	parsers/simple_parser4.h \
+	parsers/simple_parser6.h
+
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)

src/lib/dns/Makefile.am

@@ -178,27 +178,40 @@ s-rdatacode: Makefile $(EXTRA_DIST)
 
 libdns___includedir = $(pkgincludedir)/dns
 libdns___include_HEADERS = \
+	dns_fwd.h \
 	edns.h \
 	exceptions.h \
-	dns_fwd.h \
 	labelsequence.h \
-	message.h \
-	masterload.h \
 	master_lexer.h \
+	master_lexer_inputsource.h \
+	master_lexer_state.h \
 	master_loader.h \
 	master_loader_callbacks.h \
+	masterload.h \
+	message.h \
 	messagerenderer.h \
 	name.h \
-	question.h \
+	nsec3hash.h \
 	opcode.h \
+	question.h \
 	rcode.h \
 	rdata.h \
+	rdata_pimpl_holder.h \
+	rdataclass.h \
+	rdatafields.h \
+	rrclass.h \
+	rrcollator.h \
 	rrparamregistry.h \
 	rrset.h \
-	rrset_collection_base.h \
 	rrset_collection.h \
+	rrset_collection_base.h \
 	rrttl.h \
+	rrtype.h \
+	serial.h \
+	tsig.h \
+	tsigerror.h \
 	tsigkey.h \
+	tsigrecord.h \
 	zone_checker.h
 # Purposely not installing these headers:
 # name_internal.h: used only internally, and not actually DNS specific

src/lib/eval/Makefile.am

@@ -102,3 +102,15 @@ parser location.hh position.hh stack.hh parser.cc parser.h lexer.cc:
 	@echo Parser generation disabled. Configure with --enable-generate-parser to enable it.
 
 endif
+
+
+# Specify the headers for copying into the installation directory tree.
+libkea_eval_includedir = $(pkgincludedir)/eval
+libkea_eval_include_HEADERS = \
+	eval_context.h \
+	eval_context_decl.h \
+	eval_log.h \
+	evaluate.h \
+	parser.h \
+	token.h
+# does not include *.hh generated headers as they come with lexer and parser.

src/lib/hooks/Makefile.am

@@ -59,14 +59,21 @@ libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.l
 libkea_hooks_la_LIBADD += $(BOOST_LIBS)
 libkea_hooks_la_LIBADD += $(LOG4CPLUS_LIBS)
 
-# Specify the headers for copying into the installation directory tree. User-
-# written libraries only need the definitions from the headers for the
-# CalloutHandle and LibraryHandle objects. CalloutManager may be required by
-# users testing statically linked KEA binaries.
+# Specify the headers for copying into the installation directory tree.
 libkea_hooks_includedir = $(pkgincludedir)/hooks
 libkea_hooks_include_HEADERS = \
-    callout_handle.h \
-    callout_manager.h \
-    library_handle.h \
-    hooks.h \
-    server_hooks.h
+	callout_handle.h \
+	callout_manager.h \
+	hooks.h \
+	hooks_config.h \
+	hooks_log.h \
+	hooks_manager.h \
+	hooks_parser.h \
+	libinfo.h \
+	library_handle.h \
+	library_manager.h \
+	library_manager_collection.h \
+	pointer_converter.h \
+	server_hooks.h
+
+

src/lib/http/Makefile.am

@@ -57,6 +57,23 @@ libkea_http_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_http_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 
 # Specify the headers for copying into the installation directory tree.
-libkea_process_includedir = $(pkgincludedir)/http
-libkea_process_include_HEADERS = \
-	http_log.h
+libkea_http_includedir = $(pkgincludedir)/http
+libkea_http_include_HEADERS = \
+	connection.h \
+	connection_pool.h \
+	date_time.h \
+	header_context.h \
+	http_acceptor.h \
+	http_log.h \
+	http_types.h \
+	listener.h \
+	post_request.h \
+	post_request_json.h \
+	request.h \
+	request_context.h \
+	request_parser.h \
+	response.h \
+	response_creator.h \
+	response_creator_factory.h \
+	response_json.h
+

src/lib/log/Makefile.am

@@ -50,15 +50,34 @@ libkea_log_la_LIBADD  += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_log_la_LIBADD  += $(LOG4CPLUS_LIBS)
 libkea_log_la_LDFLAGS = -no-undefined -version-info 3:0:0
 
-# Specify the headers for copying into the installation directory tree. User-
-# written libraries only need the definitions for logger.h and dependencies.
+# Specify the headers for copying into the installation directory tree.
 libkea_log_includedir = $(pkgincludedir)/log
 libkea_log_include_HEADERS = \
-    log_dbglevels.h \
-    log_formatter.h \
-    logger.h \
-    logger_level.h \
-    macros.h \
-    message_initializer.h \
-    message_types.h
+	buffer_appender_impl.h \
+	log_dbglevels.h \
+	log_formatter.h \
+	log_messages.h \
+	logger.h \
+	logger_impl.h \
+	logger_level.h \
+	logger_level_impl.h \
+	logger_manager.h \
+	logger_manager_impl.h \
+	logger_name.h \
+	logger_specification.h \
+	logger_support.h \
+	logger_unittest_support.h \
+	logimpl_messages.h \
+	macros.h \
+	message_dictionary.h \
+	message_exception.h \
+	message_initializer.h \
+	message_reader.h \
+	message_types.h \
+	output_option.h
 
+libkea_log_interprocess_includedir = $(pkgincludedir)/log/interprocess
+libkea_log_interprocess_include_HEADERS = \
+	interprocess/interprocess_sync.h \
+	interprocess/interprocess_sync_file.h \
+	interprocess/interprocess_sync_null.h

src/lib/process/Makefile.am

@@ -65,8 +65,8 @@ libkea_process_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS)
 # Specify the headers for copying into the installation directory tree.
 libkea_process_includedir = $(pkgincludedir)/process
 libkea_process_include_HEADERS = \
-	d_log.h \
 	d_cfg_mgr.h \
 	d_controller.h \
+	d_log.h \
 	d_process.h \
 	io_service_signal.h

src/lib/stats/Makefile.am

@@ -18,4 +18,8 @@ libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.l
 libkea_stats_la_LIBADD += $(BOOST_LIBS)
 
 libkea_stats_includedir = $(pkgincludedir)/stats
-libkea_stats_include_HEADERS = stats_mgr.h
+libkea_stats_include_HEADERS = \
+	context.h \
+	observation.h \
+	stats_mgr.h
+

src/lib/util/Makefile.am

@@ -43,12 +43,56 @@ libkea_util_la_LDFLAGS  = -no-undefined -version-info 2:1:0
 
 CLEANFILES = *.gcno *.gcda
 
+# Specify the headers for copying into the installation directory tree.
 libkea_util_includedir = $(pkgincludedir)/util
 libkea_util_include_HEADERS = \
-    buffer.h \
-    io_utilities.h \
-    optional_value.h \
-    pointer_util.h \
-    stopwatch.h \
-    strutil.h \
-    staged_value.h
+	boost_time_utils.h \
+	buffer.h \
+	csv_file.h \
+	filename.h \
+	io_utilities.h \
+	labeled_value.h \
+	memory_segment.h \
+	memory_segment_local.h \
+	optional_value.h \
+	pid_file.h \
+	pointer_util.h \
+	process_spawn.h \
+	range_utilities.h \
+	signal_set.h \
+	staged_value.h \
+	state_model.h \
+	stopwatch.h \
+	stopwatch_impl.h \
+	strutil.h \
+	time_utilities.h \
+	versioned_csv_file.h \
+	watch_socket.h
+
+libkea_util_encode_includedir = $(pkgincludedir)/util/encode
+libkea_util_encode_include_HEADERS = \
+	encode/base16_from_binary.h \
+	encode/base32hex.h \
+	encode/base32hex_from_binary.h \
+	encode/base64.h \
+	encode/binary_from_base16.h \
+	encode/binary_from_base32hex.h \
+	encode/hex.h
+
+libkea_util_io_includedir = $(pkgincludedir)/util/io
+libkea_util_io_include_HEADERS = \
+	io/fd.h \
+	io/fd_share.h \
+	io/pktinfo_utilities.h \
+	io/sockaddr_util.h \
+	io/socketsession.h
+
+libkea_util_random_includedir = $(pkgincludedir)/util/random
+libkea_util_random_include_HEADERS = \
+	random/qid_gen.h \
+	random/random_number_generator.h
+
+libkea_util_threads_includedir = $(pkgincludedir)/util/threads
+libkea_util_threads_include_HEADERS = \
+	threads/sync.h \
+	threads/thread.h