Merge branch 'isc-master' into config-h

diff --cc src/bin/d2/d2_update_message.cc
Simple merge

diff --cc src/bin/lfc/tests/lfc_controller_unittests.cc
Simple merge

diff --cc src/bin/perfdhcp/tests/rate_control_unittest.cc
Simple merge

diff --cc src/hooks/dhcp/user_chk/tests/user_file_unittests.cc
Simple merge

diff --cc src/hooks/dhcp/user_chk/tests/user_registry_unittests.cc
Simple merge

diff --cc src/hooks/dhcp/user_chk/tests/userid_unittests.cc
Simple merge

diff --cc src/hooks/dhcp/user_chk/user.cc
Simple merge

diff --cc src/hooks/dhcp/user_chk/user_registry.cc
Simple merge

diff --cc src/lib/cc/tests/data_unittests.cc
index aa1ea68b079bb87ceda21ef85076c5d6ec4a51bf,e1455ec56f6e68f253774796bbf227e055d36c8b..4031356db6e66dc5feb4fc8aeac62fa8cc412df3
--- 1/src/lib/cc/tests/data_unittests.cc
--- 2/src/lib/cc/tests/data_unittests.cc
+++ b/src/lib/cc/tests/data_unittests.cc
@@@ -4,10 -4,9 +4,11 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <gtest/gtest.h>
  #include <boost/foreach.hpp>
+ #include <boost/pointer_cast.hpp>
  #include <boost/assign/std/vector.hpp>
  #include <climits>
  

diff --cc src/lib/config/Makefile.am
Simple merge

diff --cc src/lib/config/command_mgr.cc
index df6496aaf7b5edd49b7d1f82108c09a48f10e9c7,bd1c04b1cb8f4c6fc12d08a61b7532e5544f71e6..88b3dd801f9f13d0825a2042c95fa02231c20d27
--- 1/src/lib/config/command_mgr.cc
--- 2/src/lib/config/command_mgr.cc
+++ b/src/lib/config/command_mgr.cc
@@@ -4,12 -4,16 +4,18 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
+ #include <asiolink/asio_wrapper.h>
+ #include <asiolink/interval_timer.h>
+ #include <asiolink/io_service.h>
+ #include <asiolink/unix_domain_socket.h>
+ #include <asiolink/unix_domain_socket_acceptor.h>
+ #include <asiolink/unix_domain_socket_endpoint.h>
  #include <config/command_mgr.h>
- #include <config/command_socket_factory.h>
  #include <cc/data.h>
  #include <cc/command_interpreter.h>
+ #include <cc/json_feed.h>
  #include <dhcp/iface_mgr.h>
  #include <config/config_log.h>
  #include <boost/bind.hpp>

diff --cc src/lib/config/tests/command_mgr_unittests.cc
index 0b2fbbea4be917d81093c80b5c220bed27db67af,59682cd84f82808cdc1af2f80d9b5801ee86771e..b589c1902bbd509330b456e056922f8ad108bf35
--- 1/src/lib/config/tests/command_mgr_unittests.cc
--- 2/src/lib/config/tests/command_mgr_unittests.cc
+++ b/src/lib/config/tests/command_mgr_unittests.cc
@@@ -4,15 -4,23 +4,25 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <gtest/gtest.h>
  
+ #include <asiolink/io_service.h>
+ #include <config/base_command_mgr.h>
  #include <config/command_mgr.h>
+ #include <config/hooked_command_mgr.h>
  #include <cc/command_interpreter.h>
+ #include <hooks/hooks_manager.h>
+ #include <hooks/callout_handle.h>
+ #include <hooks/library_handle.h>
+ #include <string>
+ #include <vector>
  
- using namespace isc::data;
+ using namespace isc::asiolink;
  using namespace isc::config;
+ using namespace isc::data;
+ using namespace isc::hooks;
  using namespace std;
  
  // Test class for Command Manager

diff --cc src/lib/cryptolink/botan_hash.cc
Simple merge

diff --cc src/lib/cryptolink/botan_hmac.cc
Simple merge

diff --cc src/lib/cryptolink/botan_link.cc
Simple merge

diff --cc src/lib/cryptolink/openssl_hash.cc
Simple merge

diff --cc src/lib/cryptolink/openssl_hmac.cc
Simple merge

diff --cc src/lib/dhcp/duid_factory.cc
Simple merge

diff --cc src/lib/dhcp/option4_client_fqdn.cc
Simple merge

diff --cc src/lib/dhcp/option6_client_fqdn.cc
Simple merge

diff --cc src/lib/dhcp/option_data_types.cc
Simple merge

diff --cc src/lib/dhcp/option_vendor_class.cc
Simple merge

diff --cc src/lib/dhcpsrv/addr_utilities.cc
Simple merge

diff --cc src/lib/dhcpsrv/cfg_duid.cc
Simple merge

diff --cc src/lib/dhcpsrv/cfg_expiration.cc
Simple merge

diff --cc src/lib/dhcpsrv/cfg_host_operations.cc
Simple merge

diff --cc src/lib/dhcpsrv/cfg_option.cc
Simple merge

diff --cc src/lib/dhcpsrv/cfg_rsoo.cc
index a08652c2c7db0c25df56b3579d6bf9e97e01a037,b54262e57f0911366d7410e2b0d5f4f09c0c9b61..30f02e67c20d207e624d4f2938e9b15b30698880
--- 1/src/lib/dhcpsrv/cfg_rsoo.cc
--- 2/src/lib/dhcpsrv/cfg_rsoo.cc
+++ b/src/lib/dhcpsrv/cfg_rsoo.cc
@@@ -4,10 -4,11 +4,13 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <dhcp/dhcp6.h>
  #include <dhcpsrv/cfg_rsoo.h>
+ #include <boost/lexical_cast.hpp>
+ 
+ using namespace isc::data;
  
  namespace isc {
  namespace dhcp {

diff --cc src/lib/dhcpsrv/client_class_def.cc
index bdce9041743c9150c1ad1bd637d4e32212f95433,135982d7089386251f5eeb6797b0def6f81da5ee..d2bd3468b99d6f2ad7602aba58a44f1eb0127aec
--- 1/src/lib/dhcpsrv/client_class_def.cc
--- 2/src/lib/dhcpsrv/client_class_def.cc
+++ b/src/lib/dhcpsrv/client_class_def.cc
@@@ -4,11 -4,12 +4,15 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
 +#include "client_class_def.h"
+ #include <dhcpsrv/client_class_def.h>
+ #include <dhcpsrv/cfgmgr.h>
  #include <boost/foreach.hpp>
  
+ using namespace isc::data;
+ 
  namespace isc {
  namespace dhcp {
  

diff --cc src/lib/dhcpsrv/cql_connection.cc
Simple merge

diff --cc src/lib/dhcpsrv/host_data_source_factory.cc
Simple merge

diff --cc src/lib/dhcpsrv/lease.cc
Simple merge

diff --cc src/lib/dhcpsrv/mysql_connection.cc
Simple merge

diff --cc src/lib/dhcpsrv/parsers/client_class_def_parser.cc
index 82bb8bff56f71a1f4abaa064aeceb798b99419de,01d35beb250181d5cd378f6199ac2d715c671e3f..de0453cda3ebf3ecc4e3a76ae4cad26611273db6
--- 1/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
--- 2/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
+++ b/src/lib/dhcpsrv/parsers/client_class_def_parser.cc
@@@ -5,11 -5,11 +5,13 @@@
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  #include <config.h>
 +
 +#include <cc/data.h>
  #include <dhcpsrv/cfgmgr.h>
  #include <dhcpsrv/client_class_def.h>
+ #include <dhcpsrv/parsers/dhcp_parsers.h>
  #include <dhcpsrv/parsers/client_class_def_parser.h>
+ #include <dhcpsrv/parsers/option_data_parser.h>
  #include <eval/eval_context.h>
  #include <asiolink/io_address.h>
  #include <asiolink/io_error.h>

diff --cc src/lib/dhcpsrv/parsers/expiration_config_parser.cc
Simple merge

diff --cc src/lib/dhcpsrv/pgsql_exchange.cc
Simple merge

diff --cc src/lib/dhcpsrv/pool.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
Simple merge

diff --cc src/lib/dhcpsrv/testutils/config_result_check.cc
Simple merge

diff --cc src/lib/dns/rdatafields.cc
Simple merge

diff --cc src/lib/dns/tests/dns_exceptions_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/master_loader_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/masterload_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/messagerenderer_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/name_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_nsec3_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_nsec_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_pimpl_holder_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_soa_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_srv_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_tsig_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rrclass_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/zone_checker_unittest.cc
Simple merge

diff --cc src/lib/eval/eval_context.cc
Simple merge

diff --cc src/lib/eval/evaluate.cc
Simple merge

diff --cc src/lib/eval/lexer.cc
Simple merge

diff --cc src/lib/eval/parser.cc
Simple merge

diff --cc src/lib/eval/token.cc
Simple merge

diff --cc src/lib/exceptions/tests/exceptions_unittest.cc
Simple merge

diff --cc src/lib/hooks/hooks_log.cc
index 981c48d7378323754a149e63947171b3abc8d1d6,8e554b516643d6959736a9ec649ed39141a649ac..6f75bc92dfdd619ad6a1853ce3950312c06cccd1
--- 1/src/lib/hooks/hooks_log.cc
--- 2/src/lib/hooks/hooks_log.cc
+++ b/src/lib/hooks/hooks_log.cc
@@@ -6,9 -6,8 +6,10 @@@
  
  /// Defines the logger used by the Hooks
  
 +#include <config.h>
 +
  #include <hooks/hooks_log.h>
+ #include <log/macros.h>
  
  namespace isc {
  namespace hooks {

diff --cc src/lib/hooks/hooks_manager.cc
Simple merge

diff --cc src/lib/hooks/library_handle.cc
Simple merge

diff --cc src/lib/hooks/library_manager_collection.cc
index 7206ccaf03fcddf60e0346877c0e3c13aa352a16,ea2daa843ff4bc95c01d8840dc1cfcc384b8a136..0063bb1cdeb0ab4f5e4dfb58668d40b235a11caa
--- 1/src/lib/hooks/library_manager_collection.cc
--- 2/src/lib/hooks/library_manager_collection.cc
+++ b/src/lib/hooks/library_manager_collection.cc
@@@ -4,9 -4,8 +4,10 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
  #include <hooks/callout_manager.h>
+ #include <hooks/hooks_manager.h>
  #include <hooks/library_manager.h>
  #include <hooks/library_manager_collection.h>
  

diff --cc src/lib/hooks/server_hooks.cc
Simple merge

diff --cc src/lib/hooks/tests/callout_manager_unittest.cc
Simple merge

diff --cc src/lib/hooks/tests/hooks_manager_unittest.cc
Simple merge

diff --cc src/lib/hooks/tests/library_manager_unittest.cc
Simple merge

diff --cc src/lib/hooks/tests/server_hooks_unittest.cc
Simple merge

diff --cc src/lib/log/Makefile.am
Simple merge

diff --cc src/lib/log/interprocess/tests/run_unittests.cc
Simple merge

diff --cc src/lib/log/log_messages.cc
index 115f3f6191d6b548fe87d7f34d50d5519b58121a,e1f005cd90135cdb7b55c53c38ed8658d98d7e69..34db41d967d078e563a4df0d0df060dec13dcdd0
--- 1/src/lib/log/log_messages.cc
--- 2/src/lib/log/log_messages.cc
+++ b/src/lib/log/log_messages.cc
@@@ -1,7 -1,5 +1,7 @@@
- // File created from log_messages.mes on Thu Jul  7 15:32:06 2011
+ // File created from log_messages.mes on Tue Jan 24 2017 20:17
  
 +#include <config.h>
 +
  #include <cstddef>
  #include <log/message_types.h>
  #include <log/message_initializer.h>

diff --cc src/lib/log/logger_impl.cc
Simple merge

diff --cc src/lib/log/tests/logger_example.cc
Simple merge

diff --cc src/lib/log/tests/logger_manager_unittest.cc
Simple merge

diff --cc src/lib/process/io_service_signal.cc
Simple merge

diff --cc src/lib/stats/stats_mgr.cc
Simple merge

diff --cc src/lib/testutils/io_utils.cc
index b7401d66d1228fcfcd5278a769d36597755cc869,0081707e97819825ad6ae54b2ef0ab443b60fa73..5590c690dff028efba98ac97275c64bba4694396
--- 1/src/lib/testutils/io_utils.cc
--- 2/src/lib/testutils/io_utils.cc
+++ b/src/lib/testutils/io_utils.cc
@@@ -4,8 -4,7 +4,9 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +#include <config.h>
 +
+ #include <exceptions/exceptions.h>
  #include <testutils/io_utils.h>
  #include <gtest/gtest.h>
  #include <fstream>

diff --cc src/lib/testutils/unix_control_client.cc
Simple merge

diff --cc src/lib/util/strutil.cc
Simple merge

diff --cc src/lib/util/tests/process_spawn_unittest.cc
Simple merge

diff --cc src/lib/util/tests/stopwatch_unittest.cc
Simple merge

diff --cc src/lib/util/tests/strutil_unittest.cc
Simple merge

diff --cc src/lib/util/threads/tests/run_unittests.cc
Simple merge

diff --cc src/lib/util/watch_socket.cc
Simple merge

diff --cc tools/system_messages.cc
Simple merge