Populate correct terminusId
Hardcoded terminus id 0 is used at multiple places in the current code.
Made changes to populate correct terminus id instead of hardcoded one.
Change-Id: I63cedcb38fb2d993e2e4a2b45846c19531d55839
Signed-off-by: ArchanaKakani <archana.kakani@ibm.com>
diff --git a/host-bmc/dbus_to_event_handler.cpp b/host-bmc/dbus_to_event_handler.cpp
index fc9fafc..cf3064e 100644
--- a/host-bmc/dbus_to_event_handler.cpp
+++ b/host-bmc/dbus_to_event_handler.cpp
@@ -6,7 +6,6 @@
namespace pldm
{
-
using namespace pldm::dbus_api;
using namespace pldm::responder;
using namespace pldm::responder::pdr;
@@ -35,7 +34,7 @@
auto request = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto rc = encode_platform_event_message_req(
- instanceId, 1 /*formatVersion*/, 0 /*tId*/, eventType,
+ instanceId, 1 /*formatVersion*/, TERMINUS_ID /*tId*/, eventType,
eventDataVec.data(), eventDataVec.size(), request,
eventDataVec.size() + PLDM_PLATFORM_EVENT_MESSAGE_MIN_REQ_BYTES);
if (rc != PLDM_SUCCESS)
diff --git a/host-bmc/host_pdr_handler.cpp b/host-bmc/host_pdr_handler.cpp
index 922e9db..08b78ad 100644
--- a/host-bmc/host_pdr_handler.cpp
+++ b/host-bmc/host_pdr_handler.cpp
@@ -319,8 +319,8 @@
actualSize);
auto request = reinterpret_cast<pldm_msg*>(requestMsg.data());
rc = encode_platform_event_message_req(
- instanceId, 1, 0, PLDM_PDR_REPOSITORY_CHG_EVENT, eventDataVec.data(),
- actualSize, request,
+ instanceId, 1, TERMINUS_ID, PLDM_PDR_REPOSITORY_CHG_EVENT,
+ eventDataVec.data(), actualSize, request,
actualSize + PLDM_PLATFORM_EVENT_MESSAGE_MIN_REQ_BYTES);
if (rc != PLDM_SUCCESS)
{
diff --git a/libpldmresponder/base.cpp b/libpldmresponder/base.cpp
index 4e9c885..e5030ec 100644
--- a/libpldmresponder/base.cpp
+++ b/libpldmresponder/base.cpp
@@ -25,12 +25,10 @@
namespace pldm
{
-
using Type = uint8_t;
namespace responder
{
-
using Cmd = std::vector<uint8_t>;
static const std::map<Type, Cmd> capabilities{
@@ -71,7 +69,6 @@
namespace base
{
-
Response Handler::getPLDMTypes(const pldm_msg* request,
size_t /*payloadLength*/)
{
@@ -242,13 +239,10 @@
Response Handler::getTID(const pldm_msg* request, size_t /*payloadLength*/)
{
- // assigned 1 to the bmc as the PLDM terminus
- uint8_t tid = 1;
-
Response response(sizeof(pldm_msg_hdr) + PLDM_GET_TID_RESP_BYTES, 0);
auto responsePtr = reinterpret_cast<pldm_msg*>(response.data());
- auto rc = encode_get_tid_resp(request->hdr.instance_id, PLDM_SUCCESS, tid,
- responsePtr);
+ auto rc = encode_get_tid_resp(request->hdr.instance_id, PLDM_SUCCESS,
+ TERMINUS_ID, responsePtr);
if (rc != PLDM_SUCCESS)
{
return ccOnlyResponse(request, rc);
diff --git a/libpldmresponder/base.hpp b/libpldmresponder/base.hpp
index 8ec7923..7652279 100644
--- a/libpldmresponder/base.hpp
+++ b/libpldmresponder/base.hpp
@@ -1,5 +1,7 @@
#pragma once
+#include "config.h"
+
#include "libpldmresponder/platform.hpp"
#include "pldmd/handler.hpp"
#include "requester/handler.hpp"
@@ -20,7 +22,6 @@
{
namespace base
{
-
class Handler : public CmdHandler
{
public:
diff --git a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
index 6e77e99..081a92e 100644
--- a/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
+++ b/oem/ibm/libpldmresponder/oem_ibm_handler.cpp
@@ -17,7 +17,6 @@
{
namespace oem_ibm_platform
{
-
int pldm::responder::oem_ibm_platform::Handler::
getOemStateSensorReadingsHandler(
EntityType entityType, EntityInstance entityInstance,
@@ -340,7 +339,7 @@
auto request = reinterpret_cast<pldm_msg*>(requestMsg.data());
auto rc = encode_platform_event_message_req(
- instanceId, 1 /*formatVersion*/, 0 /*tId*/, eventType,
+ instanceId, 1 /*formatVersion*/, TERMINUS_ID /*tId*/, eventType,
eventDataVec.data(), eventDataVec.size(), request,
eventDataVec.size() + PLDM_PLATFORM_EVENT_MESSAGE_MIN_REQ_BYTES);