[19-move-address-utilities] Moved address utilities

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index f13723dfdc5512774bbedaae5d8d2ccae9dd2bb3..2905c031f08acb1df5954d44e041ca14bf328739 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -23,7 +23,7 @@
 #include <dhcp4/dhcp4to6_ipc.h>
 #include <dhcp4/dhcp4_log.h>
 #include <dhcp4/dhcp4_srv.h>
-#include <dhcpsrv/addr_utilities.h>
+#include <asiolink/addr_utilities.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_host_operations.h>
 #include <dhcpsrv/cfg_iface.h>

diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 76c3c5f4a2a7defcb83f395b0bdd1676985a6cee..ce25a1aa7e7994f515ec25bd43eedc3deaff4103 100644 (file)
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -17,7 +17,7 @@
 #include <dhcp6/json_config_parser.h>
 #include <dhcp6/dhcp6_srv.h>
 #include <dhcp6/ctrl_dhcp6_srv.h>
-#include <dhcpsrv/addr_utilities.h>
+#include <asiolink/addr_utilities.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_expiration.h>
 #include <dhcpsrv/cfg_hosts.h>

diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index f179885397a6a1a5e5d63c8795bb631b27997425..0e9b37045fe4e5880108694096bfc30c9f954cf5 100644 (file)
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -19,6 +19,7 @@ libkea_asiolink_la_LDFLAGS = -no-undefined -version-info 6:1:0
 
 libkea_asiolink_la_SOURCES  = asiolink.h
 libkea_asiolink_la_SOURCES += asio_wrapper.h
+libkea_asiolink_la_SOURCES += addr_utilities.cc addr_utilities.h
 libkea_asiolink_la_SOURCES += dummy_io_cb.h
 libkea_asiolink_la_SOURCES += interval_timer.cc interval_timer.h
 libkea_asiolink_la_SOURCES += io_acceptor.h
@@ -47,6 +48,7 @@ libkea_asiolink_la_LIBADD += $(BOOST_LIBS)
 # Specify the headers for copying into the installation directory tree.
 libkea_asiolink_includedir = $(pkgincludedir)/asiolink
 libkea_asiolink_include_HEADERS = \
+       addr_utilities.h \
        asio_wrapper.h \
        asiolink.h \
        dummy_io_cb.h \

diff --git a/src/lib/dhcpsrv/addr_utilities.cc b/src/lib/asiolink/addr_utilities.cc
similarity index 99%
rename from src/lib/dhcpsrv/addr_utilities.cc
rename to src/lib/asiolink/addr_utilities.cc
index 005d0880056c6ce71a42b3c8ea6c66342070535e..fb2ff366c6b329638fb8c289441b2ab7d8836c5f 100644 (file)
--- a/src/lib/dhcpsrv/addr_utilities.cc
+++ b/src/lib/asiolink/addr_utilities.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2018 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
@@ -6,7 +6,7 @@
 
 #include <config.h>
 
-#include <dhcpsrv/addr_utilities.h>
+#include <asiolink/addr_utilities.h>
 #include <exceptions/exceptions.h>
 
 #include <vector>

diff --git a/src/lib/dhcpsrv/addr_utilities.h b/src/lib/asiolink/addr_utilities.h
similarity index 100%
rename from src/lib/dhcpsrv/addr_utilities.h
rename to src/lib/asiolink/addr_utilities.h

diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am
index 4d6ce6b4e5e4043df4c091b9a530ed754b5e5cc2..0eb92b010955962bbf2f57ddb89aa296ad96768f 100644 (file)
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@ -18,6 +18,7 @@ TESTS =
 if HAVE_GTEST
 TESTS += run_unittests
 run_unittests_SOURCES  = run_unittests.cc
+run_unittests_SOURCES += addr_utilities_unittest.cc
 run_unittests_SOURCES += io_address_unittest.cc
 run_unittests_SOURCES += io_endpoint_unittest.cc
 run_unittests_SOURCES += io_socket_unittest.cc

diff --git a/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc b/src/lib/asiolink/tests/addr_utilities_unittest.cc
similarity index 99%
rename from src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
rename to src/lib/asiolink/tests/addr_utilities_unittest.cc
index f71c6a420d1d7d8a781f35b008cce8897c7370cf..c246a7a09603204e55c3378afbe791abc8bfdc9d 100644 (file)
--- a/src/lib/dhcpsrv/tests/addr_utilities_unittest.cc
+++ b/src/lib/asiolink/tests/addr_utilities_unittest.cc
@@ -6,7 +6,7 @@
 
 #include <config.h>
 
-#include <dhcpsrv/addr_utilities.h>
+#include <asiolink/addr_utilities.h>
 #include <exceptions/exceptions.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index aaf4ef0659a51a5d2bfbd89ee835daafe40dad45..8432c7265ac85eaf18e1fab1f6c87bcdba718e95 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -86,7 +86,6 @@ CLEANFILES += *.csv
 
 lib_LTLIBRARIES = libkea-dhcpsrv.la
 libkea_dhcpsrv_la_SOURCES  =
-libkea_dhcpsrv_la_SOURCES += addr_utilities.cc addr_utilities.h
 libkea_dhcpsrv_la_SOURCES += alloc_engine.cc alloc_engine.h
 libkea_dhcpsrv_la_SOURCES += alloc_engine_log.cc alloc_engine_log.h
 libkea_dhcpsrv_la_SOURCES += assignable_network.h
@@ -251,7 +250,6 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox
 # Specify the headers for copying into the installation directory tree.
 libkea_dhcpsrv_includedir = $(pkgincludedir)/dhcpsrv
 libkea_dhcpsrv_include_HEADERS = \
-       addr_utilities.h \
        alloc_engine.h \
        alloc_engine_log.h \
        assignable_network.h \

diff --git a/src/lib/dhcpsrv/cfg_subnets4.cc b/src/lib/dhcpsrv/cfg_subnets4.cc
index 4d12e83e08df07286ce34f008905c1717f215490..754d318e9ba174d48ba3c7e0e7311ed68e1672f9 100644 (file)
--- a/src/lib/dhcpsrv/cfg_subnets4.cc
+++ b/src/lib/dhcpsrv/cfg_subnets4.cc
@@ -12,8 +12,8 @@
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet_id.h>
-#include <dhcpsrv/addr_utilities.h>
 #include <asiolink/io_address.h>
+#include <asiolink/addr_utilities.h>
 #include <stats/stats_mgr.h>
 #include <sstream>
 

diff --git a/src/lib/dhcpsrv/cfg_subnets6.cc b/src/lib/dhcpsrv/cfg_subnets6.cc
index 0d058b3954d5d51130e3551716a21a2e942bfef1..ed8592d7132cd4b932f2fdc07e6bb7e39b09611c 100644 (file)
--- a/src/lib/dhcpsrv/cfg_subnets6.cc
+++ b/src/lib/dhcpsrv/cfg_subnets6.cc
@@ -7,11 +7,11 @@
 #include <config.h>
 #include <dhcp/dhcp6.h>
 #include <dhcp/option_custom.h>
+#include <asiolink/addr_utilities.h>
 #include <dhcpsrv/cfg_subnets6.h>
 #include <dhcpsrv/dhcpsrv_log.h>
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/subnet_id.h>
-#include <dhcpsrv/addr_utilities.h>
 #include <stats/stats_mgr.h>
 #include <boost/foreach.hpp>
 #include <string.h>

diff --git a/src/lib/dhcpsrv/pool.cc b/src/lib/dhcpsrv/pool.cc
index cba3b0f41f4aee91159dfae6ccc8b2c613f269ab..9a3306d264808e8a485aa38ce6e211aa39ed0d03 100644 (file)
--- a/src/lib/dhcpsrv/pool.cc
+++ b/src/lib/dhcpsrv/pool.cc
@@ -7,7 +7,7 @@
 #include <config.h>
 
 #include <asiolink/io_address.h>
-#include <dhcpsrv/addr_utilities.h>
+#include <asiolink/addr_utilities.h>
 #include <dhcpsrv/pool.h>
 #include <sstream>
 

diff --git a/src/lib/dhcpsrv/subnet.cc b/src/lib/dhcpsrv/subnet.cc
index ae4aefe3069e83d93740c695795e76163b781410..993d5495c80547c0365d3d7a6f16eda36869736d 100644 (file)
--- a/src/lib/dhcpsrv/subnet.cc
+++ b/src/lib/dhcpsrv/subnet.cc
@@ -7,8 +7,8 @@
 #include <config.h>
 
 #include <asiolink/io_address.h>
+#include <asiolink/addr_utilities.h>
 #include <dhcp/option_space.h>
-#include <dhcpsrv/addr_utilities.h>
 #include <dhcpsrv/shared_network.h>
 #include <dhcpsrv/subnet.h>
 #include <algorithm>

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 72afb9f70509bd6c939568ed5727a8b101c927fb..d2ec70d85b3c34338bd6728f0443df800dbb410d 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -57,7 +57,6 @@ libco3_la_LDFLAGS = -avoid-version -export-dynamic -module -rpath /nowhere
 TESTS += libdhcpsrv_unittests
 
 libdhcpsrv_unittests_SOURCES  = run_unittests.cc
-libdhcpsrv_unittests_SOURCES += addr_utilities_unittest.cc
 libdhcpsrv_unittests_SOURCES += alloc_engine_utils.cc alloc_engine_utils.h
 libdhcpsrv_unittests_SOURCES += alloc_engine_expiration_unittest.cc
 libdhcpsrv_unittests_SOURCES += alloc_engine_hooks_unittest.cc