[master] Merge branch 'trac5055'

src/bin/dhcp6/tests/dhcp6_srv_unittest.cc

@@ -30,6 +30,7 @@
 #include <dhcpsrv/utils.h>
 #include <util/buffer.h>
 #include <util/range_utilities.h>
+#include <util/encode/hex.h>
 #include <stats/stats_mgr.h>
 
 #include <dhcp6/tests/dhcp6_test_utils.h>

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

src/lib/dhcp/Makefile.am

@@ -12,6 +12,7 @@ libkea_dhcp___la_SOURCES += classify.cc classify.h
 libkea_dhcp___la_SOURCES += dhcp6.h dhcp4.h
 libkea_dhcp___la_SOURCES += duid.cc duid.h
 libkea_dhcp___la_SOURCES += duid_factory.cc duid_factory.h
+libkea_dhcp___la_SOURCES += docsis3_option_defs.h
 libkea_dhcp___la_SOURCES += hwaddr.cc hwaddr.h
 libkea_dhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
 libkea_dhcp___la_SOURCES += iface_mgr_bsd.cc
@@ -22,29 +23,28 @@ libkea_dhcp___la_SOURCES += libdhcp++.cc libdhcp++.h
 libkea_dhcp___la_SOURCES += opaque_data_tuple.cc opaque_data_tuple.h
 libkea_dhcp___la_SOURCES += option4_addrlst.cc option4_addrlst.h
 libkea_dhcp___la_SOURCES += option4_client_fqdn.cc option4_client_fqdn.h
+libkea_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
+libkea_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h
 libkea_dhcp___la_SOURCES += option6_ia.cc option6_ia.h
 libkea_dhcp___la_SOURCES += option6_iaaddr.cc option6_iaaddr.h
 libkea_dhcp___la_SOURCES += option6_iaprefix.cc option6_iaprefix.h
-libkea_dhcp___la_SOURCES += option6_addrlst.cc option6_addrlst.h
-libkea_dhcp___la_SOURCES += option6_client_fqdn.cc option6_client_fqdn.h
 libkea_dhcp___la_SOURCES += option6_status_code.cc option6_status_code.h
-libkea_dhcp___la_SOURCES += option_vendor.cc option_vendor.h
-libkea_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h
-libkea_dhcp___la_SOURCES += option_int.h
-libkea_dhcp___la_SOURCES += option_int_array.h
 libkea_dhcp___la_SOURCES += option.cc option.h
 libkea_dhcp___la_SOURCES += option_custom.cc option_custom.h
 libkea_dhcp___la_SOURCES += option_data_types.cc option_data_types.h
 libkea_dhcp___la_SOURCES += option_definition.cc option_definition.h
+libkea_dhcp___la_SOURCES += option_int.h
+libkea_dhcp___la_SOURCES += option_int_array.h
 libkea_dhcp___la_SOURCES += option_opaque_data_tuples.cc option_opaque_data_tuples.h
 libkea_dhcp___la_SOURCES += option_space.cc option_space.h
 libkea_dhcp___la_SOURCES += option_space_container.h
 libkea_dhcp___la_SOURCES += option_string.cc option_string.h
-libkea_dhcp___la_SOURCES += protocol_util.cc protocol_util.h
+libkea_dhcp___la_SOURCES += option_vendor.cc option_vendor.h
+libkea_dhcp___la_SOURCES += option_vendor_class.cc option_vendor_class.h
 libkea_dhcp___la_SOURCES += pkt.cc pkt.h
-libkea_dhcp___la_SOURCES += pkt6.cc pkt6.h
 libkea_dhcp___la_SOURCES += pkt4.cc pkt4.h
 libkea_dhcp___la_SOURCES += pkt4o6.cc pkt4o6.h
+libkea_dhcp___la_SOURCES += pkt6.cc pkt6.h
 libkea_dhcp___la_SOURCES += pkt_filter.h pkt_filter.cc
 libkea_dhcp___la_SOURCES += pkt_filter6.h pkt_filter6.cc
 libkea_dhcp___la_SOURCES += pkt_filter_inet.cc pkt_filter_inet.h
@@ -60,8 +60,8 @@ if OS_BSD
 libkea_dhcp___la_SOURCES += pkt_filter_bpf.cc pkt_filter_bpf.h
 endif
 
+libkea_dhcp___la_SOURCES += protocol_util.cc protocol_util.h
 libkea_dhcp___la_SOURCES += std_option_defs.h
-libkea_dhcp___la_SOURCES += docsis3_option_defs.h
 
 libkea_dhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 libkea_dhcp___la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -83,27 +83,43 @@ 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 \
-    option.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_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

src/lib/dhcp_ddns/Makefile.am

@@ -48,3 +48,10 @@ 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_includedir = $(pkgincludedir)/dhcp_ddns
+libkea_dhcp_ddns_include_HEADERS = \
+   ncr_io.h \
+   ncr_msg.h \
+   ncr_udp.h

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>
 

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>

src/lib/dhcpsrv/Makefile.am

@@ -218,6 +218,22 @@ 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_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
+
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
 

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:
 

src/lib/dns/Makefile.am

@@ -176,7 +176,7 @@ s-rdatacode: Makefile $(EXTRA_DIST)
 
 #rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: s-rdatacode
 
-libdns___includedir = $(includedir)/$(PACKAGE_NAME)/dns
+libdns___includedir = $(pkgincludedir)/dns
 libdns___include_HEADERS = \
 	edns.h \
 	exceptions.h \

src/lib/exceptions/Makefile.am

@@ -8,5 +8,5 @@ libkea_exceptions_la_SOURCES = exceptions.h exceptions.cc
 
 CLEANFILES = *.gcno *.gcda
 
-libkea_exceptions_includedir = $(includedir)/$(PACKAGE_NAME)/exceptions
+libkea_exceptions_includedir = $(pkgincludedir)/exceptions
 libkea_exceptions_include_HEADERS = exceptions.h

src/lib/stats/Makefile.am

@@ -16,5 +16,5 @@ libkea_stats_la_LIBADD  = $(top_builddir)/src/lib/cc/libkea-cc.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la
 libkea_stats_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
 
-libkea_stats_includedir = $(includedir)/$(PACKAGE_NAME)/stats
+libkea_stats_includedir = $(pkgincludedir)/stats
 libkea_stats_include_HEADERS = stats_mgr.h

src/lib/util/Makefile.am

@@ -41,5 +41,12 @@ 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
+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