From: Francis Dupont <fdupont@isc.org>
Date: Thu, 25 Mar 2021 18:29:18 +0000 (+0100)
Subject: [#1662] Fixed netconf build
X-Git-Tag: Kea-1.9.6~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a412fdc8dd878c4bb4bc8f6d6a730605040221;p=thirdparty%2Fkea.git

[#1662] Fixed netconf build
---

diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index 5b00fd22ad..de8c393e60 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
-AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
+AM_CPPFLAGS += $(SYSREPO_INCLUDEDIR)
 
 AM_CXXFLAGS = $(KEA_CXXFLAGS)
 
diff --git a/src/bin/netconf/http_control_socket.cc b/src/bin/netconf/http_control_socket.cc
index b3d91796d9..dbe46440ea 100644
--- a/src/bin/netconf/http_control_socket.cc
+++ b/src/bin/netconf/http_control_socket.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2021 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
@@ -11,6 +11,9 @@
 
 #include <netconf/http_control_socket.h>
 #include <cc/command_interpreter.h>
+#include <asiolink/asio_wrapper.h>
+#include <asiolink/io_service.h>
+#include <asiolink/tls_socket.h>
 #include <http/client.h>
 #include <http/post_request_json.h>
 #include <http/response_json.h>
@@ -84,7 +87,7 @@ HttpControlSocket::sendCommand(ConstElementPtr command) {
     string receive_errmsg;
     HttpResponseJsonPtr response(new HttpResponseJson());
 
-    client.asyncSendRequest(getUrl(), request, response,
+    client.asyncSendRequest(getUrl(), TlsContextPtr(), request, response,
                 [&io_service, &received_ec, &receive_errmsg]
                 (const boost::system::error_code& ec,
                 const HttpResponsePtr&, const string& errmsg) {
diff --git a/src/bin/netconf/tests/Makefile.am b/src/bin/netconf/tests/Makefile.am
index ca47d74f9a..0c5e5fd0a1 100644
--- a/src/bin/netconf/tests/Makefile.am
+++ b/src/bin/netconf/tests/Makefile.am
@@ -9,7 +9,8 @@ AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\
 AM_CPPFLAGS += -DCFG_EXAMPLES=\"$(abs_top_srcdir)/doc/examples/netconf\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/bin/netconf/tests\"
 AM_CPPFLAGS += -DSYNTAX_FILE=\"$(abs_srcdir)/../netconf_parser.yy\"
-AM_CPPFLAGS += $(BOOST_INCLUDES) $(SYSREPO_INCLUDEDIR)
+AM_CPPFLAGS += $(BOOST_INCLUDES) $(CRYPTO_CFLAGS) $(CRYPTO_INCLUDES)
+AM_CPPFLAGS += $(SYSREPO_INCLUDEDIR)
 
 CLEANFILES = *.json *.log
 
diff --git a/src/bin/netconf/tests/control_socket_unittests.cc b/src/bin/netconf/tests/control_socket_unittests.cc
index 5f754cb284..9e7700a111 100644
--- a/src/bin/netconf/tests/control_socket_unittests.cc
+++ b/src/bin/netconf/tests/control_socket_unittests.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2020 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2021 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
@@ -613,7 +613,7 @@ HttpControlSocketTest::createReflectListener() {
     listener_.reset(new
                 HttpListener(io_service_,
                              IOAddress(SERVER_ADDRESS), SERVER_PORT,
-                             factory,
+                             TlsContextPtr(), factory,
                              HttpListener::RequestTimeout(2000),
                              HttpListener::IdleTimeout(2000)));
 }