[5055] Install selected headers from Kea libraries.

diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index eb293e6b22fc68ff24739993c1655b368aa2d719..ab1ee62fc1cd5cff6f0d6192bd32e4500797e4fd 100644 (file)
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -41,4 +41,17 @@ libkea_asiolink_la_LIBADD += $(BOOST_LIBS)
 
 # IOAddress is sometimes used in user-library code
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
-libkea_asiolink_include_HEADERS = io_address.h
+libkea_asiolink_include_HEADERS = \
+    asiolink.h \
+    asio_wrapper.h \
+       interval_timer.h \
+    io_address.h \
+       io_asio_socket.h \
+       io_endpoint.h \
+       io_error.h \
+       io_service.h \
+       io_socket.h \
+       tcp_endpoint.h \
+    tcp_socket.h \
+       udp_endpoint.h \
+    udp_socket.h

diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am
index 820f448e72bac5cb823b30fc87f39f5361689499..306f65c2560a953c444b78cdf6dd078adadfaa2d 100644 (file)
--- a/src/lib/dhcp_ddns/Makefile.am
+++ b/src/lib/dhcp_ddns/Makefile.am
@@ -48,3 +48,9 @@ libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-thread
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS)
+
+# Specify the headers for copying into the installation directory tree.
+libkea_dhcp_ddns_include_HEADERS = \
+   ncr_io.h \
+   ncr_msg.h \
+   ncr_udp.h

diff --git a/src/lib/dhcp_ddns/ncr_msg.cc b/src/lib/dhcp_ddns/ncr_msg.cc
index 289d83177e90ebb7601bca4fff4cb1c9a2a4d75c..f579a0274a9f0ceddcf276b01ecf127ea5c26112 100644 (file)
--- a/src/lib/dhcp_ddns/ncr_msg.cc
+++ b/src/lib/dhcp_ddns/ncr_msg.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -10,6 +10,7 @@
 #include <asiolink/io_error.h>
 #include <cryptolink/cryptolink.h>
 #include <cryptolink/crypto_hash.h>
+#include <util/encode/hex.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 

diff --git a/src/lib/dhcp_ddns/ncr_msg.h b/src/lib/dhcp_ddns/ncr_msg.h
index 484778e420fd54ce2a8b56d2a6951239856a3a31..065e1181bc9ae3210ae01cd81a44491bc7eb2a1c 100644 (file)
--- a/src/lib/dhcp_ddns/ncr_msg.h
+++ b/src/lib/dhcp_ddns/ncr_msg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,7 +18,6 @@
 #include <dns/name.h>
 #include <exceptions/exceptions.h>
 #include <util/buffer.h>
-#include <util/encode/hex.h>
 #include <util/time_utilities.h>
 
 #include <time.h>

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index f763340e9d4f8fdd59fd9487d73905a4bee55f1c..13cfde64fc33c9e5ab92f4138af1934676a52753 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -218,6 +218,21 @@ 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.
+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 \
+
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
 

diff --git a/src/lib/dhcpsrv/client_class_def.h b/src/lib/dhcpsrv/client_class_def.h
index 51fb7e2544f8a2aa3da823ece47cb5d3330992aa..201b22c785d4a68530c4fbaa0da3db21f4e2fbdb 100644 (file)
--- a/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@ -8,7 +8,6 @@
 #define CLIENT_CLASS_DEF_H
 
 #include <dhcpsrv/cfg_option.h>
-#include <eval/token.h>
 #include <exceptions/exceptions.h>
 
 #include <string>

diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index d1d6d48403de9b2621bf40366c7a32bf1aadc7c9..fe2e330e5140bd54fc20e7adec134dc937c04f83 100644 (file)
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -13,32 +13,16 @@
 #include <dhcp/option_space_container.h>
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfg_4o6.h>
+#include <dhcpsrv/lease.h>
 #include <dhcpsrv/pool.h>
+#include <dhcpsrv/subnet_id.h
 #include <dhcpsrv/triplet.h>
-#include <dhcpsrv/lease.h>
 
 #include <boost/shared_ptr.hpp>
 
 namespace isc {
 namespace dhcp {
 
-/// @brief a base class for Subnet4 and Subnet6
-///
-/// This class presents a common base for IPv4 and IPv6 subnets.
-/// In a physical sense, a subnet defines a single network link with all devices
-/// attached to it. In most cases all devices attached to a single link can
-/// share the same parameters. Therefore Subnet holds several values that are
-/// typically shared by all hosts: renew timer (T1), rebind timer (T2) and
-/// leased addresses lifetime (valid-lifetime). It also holds the set
-/// of DHCP option instances configured for the subnet. These options are
-/// included in DHCP messages being sent to clients which are connected
-/// to the particular subnet.
-///
-/// @todo: Implement support for options here
-
-/// @brief Unique identifier for a subnet (both v4 and v6)
-typedef uint32_t SubnetID;
-
 class Subnet {
 public:
 

diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am
index 708890275c4122f0a5f6e4ecc8cb181818fd5d19..c9545e5d5180362e4e7c678967745fbdde9f2874 100644 (file)
--- a/src/lib/util/Makefile.am
+++ b/src/lib/util/Makefile.am
@@ -42,4 +42,11 @@ libkea_util_la_LDFLAGS  = -no-undefined -version-info 2:0:0
 CLEANFILES = *.gcno *.gcda
 
 libkea_util_includedir = $(includedir)/$(PACKAGE_NAME)/util
-libkea_util_include_HEADERS = buffer.h io_utilities.h strutil.h staged_value.h
+libkea_util_include_HEADERS = \
+    buffer.h \
+    io_utilities.h \
+    optional_value.h \
+    pointer_util.h \
+    stopwatch.h \
+    strutil.h \
+    staged_value.h