summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-11-01 15:52:26 -0700
committerVernon Mauery <vernon.mauery@linux.intel.com>2019-02-25 14:40:59 -0800
commit7b98c0725eec2a09bf65ee1e78839fc2c4a3da03 (patch)
tree7bab9756ea6753c902322b176465f1da6ff8d87e
parent665016490f0727eba19eb711cef030bf0c3b7000 (diff)
downloadphosphor-net-ipmid-7b98c0725eec2a09bf65ee1e78839fc2c4a3da03.tar.gz
phosphor-net-ipmid-7b98c0725eec2a09bf65ee1e78839fc2c4a3da03.zip
netipmid: move to sdbusplus::asio from sdbusplus
To be able to support asynchronous dbus calls, the main bus object should be an sdbusplus::asio::connection. Change-Id: Ib7d3474eb32505d2326f0d6db9566528a58ccd03 Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
-rw-r--r--main.cpp4
-rw-r--r--main.hpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 04f3d44..27661c1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -36,7 +36,7 @@ std::tuple<session::Manager&, command::Table&, eventloop::EventLoop&,
sd_bus* bus = nullptr;
sd_event* events = nullptr;
-std::shared_ptr<sdbusplus::bus::bus> sdbusp;
+std::shared_ptr<sdbusplus::asio::connection> sdbusp;
/*
* @brief Required by apphandler IPMI Provider Library
@@ -49,7 +49,7 @@ sd_bus* ipmid_get_sd_bus_connection()
/*
* @brief mechanism to get at sdbusplus object
*/
-std::shared_ptr<sdbusplus::bus::bus> getSdBus()
+std::shared_ptr<sdbusplus::asio::connection> getSdBus()
{
return sdbusp;
}
diff --git a/main.hpp b/main.hpp
index 5639342..6aa3a3f 100644
--- a/main.hpp
+++ b/main.hpp
@@ -5,7 +5,7 @@
#include "sol/sol_manager.hpp"
#include <command_table.hpp>
-#include <sdbusplus/bus.hpp>
+#include <sdbusplus/asio/connection.hpp>
#include <sessions_manager.hpp>
#include <tuple>
@@ -19,4 +19,4 @@ static const auto IPMI_STD_PORT = 623;
extern sd_bus* bus;
-std::shared_ptr<sdbusplus::bus::bus> getSdBus();
+std::shared_ptr<sdbusplus::asio::connection> getSdBus();
OpenPOWER on IntegriCloud