fix ubuntu 20.10 build

src/cache/cache-updater-test.cpp

@@ -37,6 +37,7 @@
 #include "model/apartment.h"
 #include "model/device-mock.h"
 #include "model/modelmaintenance-mock.h"
+#include "dsm-api-mock.h"
 #include "propertysystem-mock.h"
 #include "propertysystem_common_paths.h"
 
@@ -505,6 +506,7 @@ SCENARIO("A device gets added to cache", TAGS) {
     boost::shared_ptr<Device> dev2 = apt.allocateDevice(dsuid2);
     spec.FunctionID = functionID100(DEVICE_CLASS_GR, FID100keys::_1);
     spec.ProductID = 0xCC8;
+    ALLOW_CALL(dsm_api_mock, DsmApiGetDeviceDescription(_, _, _, _, _, _, _)).RETURN(0);
     dev2->setPartiallyFromSpec(spec);
     dev2->setIsPresent(true);
     dev2->setIsConnected(true);

src/ds/asio/meson.build

@@ -10,7 +10,6 @@ dsAsioLibrary = library('dsAsio', [
     'promise.cpp',
     'property.cpp',
     'reconnect-timer.cpp',
-    'reconnecting-socket.cpp',
     'resource.cpp',
     'retryer.cpp',
     'state-poller.cpp',

src/ds-api/http-server-test.cpp

@@ -44,7 +44,7 @@ SCENARIO("dsApiHttpServer", TAGS) {
   auto& io = loop.io;
 
   dsApi::AsyncCalleeMock asyncCalle;
-  auto server = dsApi::makeHttpServer(loop, {.acceptor = {.endpoint = {.address = "127.0.0.1"}}}, asyncCalle);
+  auto server = dsApi::makeHttpServer(loop, {.acceptor = {.endpoint = {.address = "127.0.0.1"}}}, io, asyncCalle);
   WHEN("client connects") {
     tcp::resolver resolver{io};
     tcp::socket socket{io};

src/ds-api/http-server.cpp

@@ -28,6 +28,7 @@ namespace {
 class Connection : public std::enable_shared_from_this<Connection> {
 private:
   tcp::socket m_socket;
+  boost::asio::io_service& m_ioService;
   dsApi::AsyncCallee& m_router;
   boost::beast::flat_buffer m_buffer{4096};
   http::request<http::string_body> m_request;
@@ -35,26 +36,16 @@ private:
   bool m_replied{false};
 
 public:
-  Connection(tcp::socket&& socket, dsApi::AsyncCallee& router) : m_socket(std::move(socket)), m_router(router) {
+  Connection(tcp::socket&& socket, boost::asio::io_service& ioService, dsApi::AsyncCallee& router) : m_socket(std::move(socket)), m_ioService(ioService), m_router(router) {
     DS_INFO_ENTER("");
   }
 
   void asyncRun() {
     DS_INFO_ENTER("");
-    io().post([this, self = shared_from_this()] { asyncRead(); });
+    m_ioService.post([this, self = shared_from_this()] { asyncRead(); });
   }
 
 private:
-  boost::asio::io_service& io() {
-#if BOOST_VERSION < 107000
-    return m_socket.get_io_context();
-#else
-    auto ex = m_socket.get_executor();
-    auto* ioContext = ex.target<boost::asio::io_context>();
-    return *ioContext;
-#endif
-  }
-
   // Asynchronously receive a complete request message.
   void asyncRead() {
     DS_DEBUG_ENTER("");
@@ -102,8 +93,8 @@ private:
                                             .content = content(),
                                             .query = std::string{query},
                                             .headers = headers()}},
-            ds::makePromise<dsApi::HttpResult>(io(), [this, self, version](std::optional<dsApi::HttpResult>&& result) {
-              io().post(
+            ds::makePromise<dsApi::HttpResult>(m_ioService, [this, self, version](std::optional<dsApi::HttpResult>&& result) {
+              m_ioService.post(
                   ds::asio::MoveOnly{[this, self = std::move(self), result = std::move(result), version]() mutable {
                     asyncReply(result ? std::move(*result) : dsApi::cancelledResult(), version);
                   }});
@@ -142,17 +133,18 @@ private:
 };
 
 class HttpServerImpl : public ds::asio::Resource<HttpServerConfig>, public HttpServer {
+  boost::asio::io_service& m_ioService;
   dsApi::AsyncCallee& m_api;
   std::unique_ptr<dsNet::TcpAcceptor> m_acceptor =
       dsNet::makeTcpAcceptor(*this, dsNet::TcpAcceptorConfig{config().acceptor});
 
 public:
-  HttpServerImpl(ds::asio::ResourceBase& parent, HttpServerConfig&& config, dsApi::AsyncCallee& api)
-      : ds::asio::Resource<HttpServerConfig>{parent, "httpServer", std::move(config)}, m_api{api} {
+  HttpServerImpl(ds::asio::ResourceBase& parent, HttpServerConfig&& config, boost::asio::io_service& ioService, dsApi::AsyncCallee& api)
+      : ds::asio::Resource<HttpServerConfig>{parent, "httpServer", std::move(config)}, m_ioService(ioService), m_api{api} {
     DS_DEBUG_ENTER("");
     m_acceptor->asyncRun(dsNet::TcpAcceptorHooks{.accept = [this](tcp::socket&& socket) {
       // TcpAcceptorHooks does not call hooks after desctruction
-      auto connection = std::make_shared<Connection>(std::move(socket), m_api);
+      auto connection = std::make_shared<Connection>(std::move(socket), m_ioService, m_api);
       connection->asyncRun();
     }});
   }
@@ -161,9 +153,9 @@ public:
 };
 } // namespace
 
-std::unique_ptr<HttpServer> makeHttpServer(ds::asio::ResourceBase& parent, HttpServerConfig&& config,
+std::unique_ptr<HttpServer> makeHttpServer(ds::asio::ResourceBase& parent, HttpServerConfig&& config, boost::asio::io_service& ioService,
                                            dsApi::AsyncCallee& api) {
-  return std::make_unique<HttpServerImpl>(parent, std::move(config), api);
+  return std::make_unique<HttpServerImpl>(parent, std::move(config), ioService, api);
 }
 
 } // namespace dsApi