osaf/libs/agents/saf/clma/clma.h | 2 +-
osaf/libs/agents/saf/clma/clma_api.c | 10 +---------
osaf/libs/agents/saf/clma/clma_mds.c | 2 +-
osaf/services/saf/clmsv/nodeagent/main.c | 2 +-
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/osaf/libs/agents/saf/clma/clma.h b/osaf/libs/agents/saf/clma/clma.h
--- a/osaf/libs/agents/saf/clma/clma.h
+++ b/osaf/libs/agents/saf/clma/clma.h
@@ -94,7 +94,7 @@ extern clma_cb_t clma_cb;
extern uint32_t clma_validate_version(SaVersionT *version);
extern uint32_t clma_mds_init(clma_cb_t * cb);
-extern uint32_t clma_mds_msg_sync_send(clma_cb_t * cb, CLMSV_MSG * i_msg,
CLMSV_MSG ** o_msg, uint32_t timeout);
+extern uint32_t clma_mds_msg_sync_send(clma_cb_t * cb, CLMSV_MSG * i_msg,
CLMSV_MSG ** o_msg, SaTimeT timeout);
extern uint32_t clma_mds_msg_async_send(clma_cb_t * cb, CLMSV_MSG * i_msg,
uint32_t prio);
extern unsigned int clma_startup(void);
diff --git a/osaf/libs/agents/saf/clma/clma_api.c
b/osaf/libs/agents/saf/clma/clma_api.c
--- a/osaf/libs/agents/saf/clma/clma_api.c
+++ b/osaf/libs/agents/saf/clma/clma_api.c
@@ -1266,15 +1266,7 @@ static SaAisErrorT clmaclusternodeget(Sa
rc = SA_AIS_ERR_INVALID_PARAM;
goto done;
} else if (timeout > ( SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND)) {
- /* Unfortunately the current MDS transport support only
uint32_t type variable (232-1) for timeout parameter ,
- even though SAF APIS supports SaTimeT (SaInt64T) type
(263-1).
- So as work around currently if SAF API receives the higher
value then uint32_t (232-1) that it can hold , form now
- implicitly set to max MDS supported value (4294967295 *
10000000) , which is already very large impractical value.
-
- In Future solution : `[ticket:#1658] mds : Opensf transport
should adopt the size of the
- timeout parameter from 32 bits to 64 bits` will resolve the
issue by matching both MDS transport and SAF API's
- */
- TRACE_4("saClmClusterNodeGet: timeout > MDS_MAX_TIMEOUT setting
to MDS max timeout value:%llu, clmHandle:%llx",
+ TRACE_4("saClmClusterNodeGet: timeout>MDS_MAX_TIMEOUT setting
to MDS max timeout value:%lld, clmHandle:%llx",
(SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND) , clmHandle);
timeout = (SA_TIME_ONE_MILLISECOND *
MDS_MAX_TIMEOUT_MILLISECOND);
}
diff --git a/osaf/libs/agents/saf/clma/clma_mds.c
b/osaf/libs/agents/saf/clma/clma_mds.c
--- a/osaf/libs/agents/saf/clma/clma_mds.c
+++ b/osaf/libs/agents/saf/clma/clma_mds.c
@@ -1219,7 +1219,7 @@ void clma_mds_finalize(clma_cb_t * cb)
Notes : None.
******************************************************************************/
-uint32_t clma_mds_msg_sync_send(clma_cb_t * cb, CLMSV_MSG * i_msg, CLMSV_MSG
** o_msg, uint32_t timeout)
+uint32_t clma_mds_msg_sync_send(clma_cb_t * cb, CLMSV_MSG * i_msg, CLMSV_MSG
** o_msg, SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc = NCSCC_RC_SUCCESS;
diff --git a/osaf/services/saf/clmsv/nodeagent/main.c
b/osaf/services/saf/clmsv/nodeagent/main.c
--- a/osaf/services/saf/clmsv/nodeagent/main.c
+++ b/osaf/services/saf/clmsv/nodeagent/main.c
@@ -450,7 +450,7 @@ static int get_node_info(NODE_INFO *node
return 0;
}
-static uint32_t clmna_mds_msg_sync_send(CLMSV_MSG * i_msg, CLMSV_MSG ** o_msg,
uint32_t timeout)
+static uint32_t clmna_mds_msg_sync_send(CLMSV_MSG * i_msg, CLMSV_MSG ** o_msg,
SaTimeT timeout)
{
NCSMDS_INFO mds_info;
uint32_t rc = NCSCC_RC_SUCCESS;
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity
planning reports. http://sdm.link/zohodev2dev
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
