osaf/libs/core/mds/mds_c_api.c | 2 +-
osaf/libs/core/mds/mds_c_db.c | 12 ++++++------
osaf/libs/core/mds/mds_c_sndrcv.c | 18 +++++++++---------
osaf/libs/core/mds/mds_dt_common.c | 12 ++++++------
osaf/libs/core/mds/mds_dt_tipc.c | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
Description :
If mds detect some error , it will log as as an error
with src and dest service ID. But currently some of the logs less
arguments were passed,
so application getting core dump.
Fix:
Now m_MDS_LOG is corrected with proper arguments.
diff --git a/osaf/libs/core/mds/mds_c_api.c b/osaf/libs/core/mds/mds_c_api.c
--- a/osaf/libs/core/mds/mds_c_api.c
+++ b/osaf/libs/core/mds/mds_c_api.c
@@ -3616,7 +3616,7 @@ uint32_t mds_mcm_subtn_add(MDS_SVC_HDL s
/* Remove Subscription info from MCM database */
mds_subtn_tbl_del(svc_hdl, subscr_svc_id);
- m_MDS_LOG_ERR("MCM_API : mcm_subtn_add : Can't Subscribe from
SVC id = %s on DEST = %d to svc_id = %s(%d) : MDTM Returned Failure",
+ m_MDS_LOG_ERR("MCM_API : mcm_subtn_add : Can't Subscribe from
SVC id = %s(%d) on DEST = %d to svc_id = %s(%d) : MDTM Returned Failure",
get_svc_names(m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_hdl)),
m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_hdl),
m_MDS_GET_VDEST_ID_FROM_SVC_HDL(svc_hdl), get_svc_names(subscr_svc_id),
subscr_svc_id);
m_MDS_LOG_DBG("MCM_API : Leaving : F : mds_mcm_subtn_add");
return NCSCC_RC_FAILURE;
diff --git a/osaf/libs/core/mds/mds_c_db.c b/osaf/libs/core/mds/mds_c_db.c
--- a/osaf/libs/core/mds/mds_c_db.c
+++ b/osaf/libs/core/mds/mds_c_db.c
@@ -225,7 +225,7 @@ uint32_t mds_vdest_tbl_add(MDS_VDEST_ID
/* Create Quiesced timer */
m_NCS_TMR_CREATE(vdest_info->quiesced_cbk_tmr, MDS_QUIESCED_TMR_VAL,
mds_tmr_callback, (void *)NULL);
- m_MDS_LOG_DBG("Quiescedcbk tmr=0x%08x", vdest_info->quiesced_cbk_tmr);
+ m_MDS_LOG_DBG("Quiescedcbk tmr=0x%08x", *(unsigned
int*)vdest_info->quiesced_cbk_tmr);
vdest_info->node.key_info = (uint8_t *)&vdest_info->vdest_id;
ncs_patricia_tree_add(&gl_mds_mcm_cb->vdest_list, (NCS_PATRICIA_NODE
*)&vdest_info->node);
@@ -1131,10 +1131,10 @@ uint32_t mds_subtn_tbl_add(MDS_SVC_HDL s
(NCSCONTEXT)tmr_req_info);
m_NCS_TMR_CREATE(subtn_info->discovery_tmr, MDS_SUBSCRIPTION_TMR_VAL,
mds_tmr_callback, (void *)tmr_req_info);
- m_MDS_LOG_DBG("discovery_tmr=0x%08x", subtn_info->discovery_tmr);
+ m_MDS_LOG_DBG("discovery_tmr=0x%08x", *(unsigned
int*)subtn_info->discovery_tmr);
m_NCS_TMR_START(subtn_info->discovery_tmr, MDS_SUBSCRIPTION_TMR_VAL,
(TMR_CALLBACK)mds_tmr_callback, (void
*)(long)subtn_info->tmr_req_info_hdl);
-
m_MDS_LOG_DBG("MCM_DB:mds_subtn_tbl_add:TimerStart:SubTmr:Hdl=0x%08x:SvcHdl=%"PRIu64":sbscr-svcid=%s\n",
+
m_MDS_LOG_DBG("MCM_DB:mds_subtn_tbl_add:TimerStart:SubTmr:Hdl=0x%08x:SvcHdl=%"PRIu64":sbscr-svcid=%s(%d)\n",
subtn_info->tmr_req_info_hdl, svc_hdl,
get_svc_names(subscr_svc_id), subscr_svc_id);
m_MDS_LOG_DBG("MCM_DB : Leaving : S : mds_subtn_tbl_add
sub_adest_details : %s",subtn_info->sub_adest_details);
@@ -1670,7 +1670,7 @@ uint32_t mds_subtn_res_tbl_add(MDS_SVC_H
m_NCS_TMR_CREATE(active_info->await_active_tmr,
MDS_AWAIT_ACTIVE_TMR_VAL,
mds_tmr_callback, NULL);
- m_MDS_LOG_DBG("Await active tmr=0x%08x",
active_info->await_active_tmr);
+ m_MDS_LOG_DBG("Await active tmr=0x%08x",
*(unsigned int*)active_info->await_active_tmr);
/* add entry in tree */
active_subtn_res_info->node.key_info = (uint8_t
*)&active_subtn_res_info->key;
ncs_patricia_tree_add(&gl_mds_mcm_cb->subtn_results,
@@ -1984,7 +1984,7 @@ uint32_t mds_subtn_res_tbl_remove_active
MDS_AWAIT_ACTIVE_TMR_VAL,
(TMR_CALLBACK)mds_tmr_callback,
(void
*)(long)(subtn_res_info->info.active_vdest.active_route_info->tmr_req_info_hdl));
-
m_MDS_LOG_DBG("MCM_DB:RemoveActive:TimerStart:AwaitActiveTmri:Hdl=0x%08x:SvcHdl=%"PRIu64":sbscr-svcid=%s,vdest=%d\n",
+
m_MDS_LOG_DBG("MCM_DB:RemoveActive:TimerStart:AwaitActiveTmri:Hdl=0x%08x:SvcHdl=%"PRIu64":sbscr-svcid=%s(%d),vdest=%d\n",
subtn_res_info->info.active_vdest.active_route_info->tmr_req_info_hdl, svc_hdl,
get_svc_names(subscr_svc_id), subscr_svc_id,
vdest_id);
@@ -2046,7 +2046,7 @@ uint32_t mds_subtn_res_tbl_add_active(MD
/* Create Await active timer (dont start, just create) */
m_NCS_TMR_CREATE(active_info->await_active_tmr,
MDS_AWAIT_ACTIVE_TMR_VAL, mds_tmr_callback, NULL);
- m_MDS_LOG_DBG("Await active tmr=0x%08x",
active_info->await_active_tmr);
+ m_MDS_LOG_DBG("Await active tmr=0x%08x", *(unsigned
int*)active_info->await_active_tmr);
if (vdest_policy == NCS_VDEST_TYPE_MxN) {
active_info->dest_is_n_way = false;
diff --git a/osaf/libs/core/mds/mds_c_sndrcv.c
b/osaf/libs/core/mds/mds_c_sndrcv.c
--- a/osaf/libs/core/mds/mds_c_sndrcv.c
+++ b/osaf/libs/core/mds/mds_c_sndrcv.c
@@ -1029,7 +1029,7 @@ static uint32_t mcm_pvt_normal_snd_proce
/* Destination Route Not Found */
subs_result_hdl = NULL;
m_MDS_LOG_ERR("MDS_SND_RCV: Query for Destination failed, This
case cannot exist as this has "
- "been validated before src svc_id = %s(%d),
dest scv_id = %s, vdest=%d, Adest = %s",
+ "been validated before src svc_id = %s(%d),
dest scv_id = %s(%d), vdest=%d, Adest = %s",
get_svc_names(svc_cb->svc_id), svc_cb->svc_id,
get_svc_names(to_svc_id), to_svc_id, dest_vdest_id,
log_tx_send_hdl->sub_adest_details );
return NCSCC_RC_FAILURE;
}
@@ -1065,7 +1065,7 @@ static uint32_t mds_mcm_send_msg_enc(uin
/* Destination Route Not Found */
subs_result_hdl = NULL;
m_MDS_LOG_ERR("MDS_SND_RCV: Query for Destination failed, This
case cannot exist as this has been "
- "validated before src svc_id = %s(%d), dest
scv_id = %s, vdest=%d, Adest = <%"PRId64">",
+ "validated before src svc_id = %s(%d), dest
scv_id = %s(%d), vdest=%d, Adest = <%"PRId64">",
get_svc_names(svc_cb->svc_id), svc_cb->svc_id,
get_svc_names(to_svc_id), to_svc_id, dest_vdest_id, dest);
return NCSCC_RC_FAILURE;
}
@@ -2283,7 +2283,7 @@ static uint32_t mcm_pvt_red_snd_process_
/* Destination Route Not Found */
subs_result_hdl = NULL;
m_MDS_LOG_ERR("MDS_SND_RCV: Query for Destination failed, This
case cannot exist as \
- this has been validated before src svc = %s,
dest scv_id = %s, vdest=%d, Adest = %s",
+ this has been validated before src svc =
%s(%d), dest scv_id = %s(%d), vdest=%d, Adest = %s",
get_svc_names(svc_cb->svc_id), svc_cb->svc_id,
get_svc_names(to_svc_id), to_svc_id, dest_vdest_id,
log_subs_result_hdl->sub_adest_details);
return NCSCC_RC_FAILURE;
}
@@ -2671,7 +2671,7 @@ static uint32_t mcm_pvt_create_sync_send
/* Validate PWE-Handle first: */
if (NCSCC_RC_SUCCESS != mds_svc_tbl_get((MDS_PWE_HDL)env_hdl,
fr_svc_id, &hdl)) {
- m_MDS_LOG_ERR("MDS_SND_RCV: svc_is = %s doesnt exists\n",
get_svc_names(fr_svc_id), fr_svc_id);
+ m_MDS_LOG_ERR("MDS_SND_RCV: svc_is = %s(%d) doesnt exists\n",
get_svc_names(fr_svc_id), fr_svc_id);
return NCSCC_RC_FAILURE;
}
@@ -2945,7 +2945,7 @@ static uint32_t mcm_pvt_process_sndrack_
/* Destination Route Not Found */
subs_result_hdl = NULL;
m_MDS_LOG_ERR("MDS_SND_RCV: Query for Destination failed, This
case cannot exist as \
- this has been validated before src svc_id =
%s(%d), dest scv_id = %s, vdest=%d, Adest = %s",
+ this has been validated before src svc_id =
%s(%d), dest scv_id = %s(%d), vdest=%d, Adest = %s",
get_svc_names(svc_cb->svc_id), svc_cb->svc_id,
get_svc_names(to_svc_id), to_svc_id, dest_vdest_id,
log_subtn_result_info->sub_adest_details);
return NCSCC_RC_FAILURE;
}
@@ -3874,7 +3874,7 @@ static uint32_t mcm_pvt_process_svc_bcas
req, 0, info_result->key.adest, pri);
if ((svc_cb->subtn_info->prev_ver_sub_count == 0) &&
(tipc_mode_enabled) && (tipc_mcast_enabled)
&& (to_msg.bcast_buff_len <
MDS_DIRECT_BUF_MAXSIZE)) {
- m_MDS_LOG_DBG("MDTM: Break while(1)
prev_ver_sub_count: %d svc_id =%s to_msg.bcast_buff_len: %d ",
+ m_MDS_LOG_DBG("MDTM: Break while(1)
prev_ver_sub_count: %d svc_id =%s(%d) to_msg.bcast_buff_len: %d ",
svc_cb->subtn_info->prev_ver_sub_count,
get_svc_names(m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_cb->svc_hdl)),
m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_cb->svc_hdl), to_msg.bcast_buff_len);
if (status == NCSCC_RC_SUCCESS) {
@@ -3885,7 +3885,7 @@ static uint32_t mcm_pvt_process_svc_bcas
m_MDS_LOG_ERR("MDTM:Continue while(1) status =
mds_mcm_send_msg_enc = NCSCC_RC_FAILURE");
}
- m_MDS_LOG_DBG("MDTM: Continue multi-unicast svc_id =%s
to_msg.bcast_buff_len: %d ",
+ m_MDS_LOG_DBG("MDTM: Continue multi-unicast svc_id =%s(%d)
to_msg.bcast_buff_len: %d ",
get_svc_names(m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_cb->svc_hdl)),
m_MDS_GET_SVC_ID_FROM_SVC_HDL(svc_cb->svc_hdl), to_msg.bcast_buff_len);
} /* While Loop */
@@ -4046,8 +4046,8 @@ uint32_t mds_mcm_ll_data_rcv(MDS_DATA_RE
if (recv->src_seq_num != lcl_subtn_res->msg_rcv_cnt) {
m_MDS_LOG_ERR("MDS_SND_RCV: msg loss detected,
Src svc_id = %s(%d), Src vdest id= %d,\
Src Adest = %"PRIu64", local
svc_id = %s(%d) msg num=%d, recvd cnt=%d\n",
-
ncsmds_svc_names[recv->src_svc_id], recv->src_vdest, recv->src_adest,
-
ncsmds_svc_names[svccb->svc_id], recv->src_seq_num, lcl_subtn_res->msg_rcv_cnt);
+
get_svc_names(recv->src_svc_id), recv->src_svc_id, recv->src_vdest,
recv->src_adest,
+ get_svc_names(svccb->svc_id),
svccb->svc_id, recv->src_seq_num, lcl_subtn_res->msg_rcv_cnt);
mds_mcm_msg_loss(recv->dest_svc_hdl,
recv->src_adest,
recv->src_svc_id, recv->src_vdest);
diff --git a/osaf/libs/core/mds/mds_dt_common.c
b/osaf/libs/core/mds/mds_dt_common.c
--- a/osaf/libs/core/mds/mds_dt_common.c
+++ b/osaf/libs/core/mds/mds_dt_common.c
@@ -326,7 +326,7 @@ uint32_t mdtm_process_recv_message_commo
if (NCSCC_RC_SUCCESS != mds_svc_tbl_get_svc_hdl(pwe_hdl,
dest_svc_id, &dest_svc_hdl)) {
*buff_dump = 0; /* For future hack */
- m_MDS_LOG_ERR("MDTM: svc_id = %s Doesnt exists for the
message recd, Adest = <%"PRId64">\n",
+ m_MDS_LOG_ERR("MDTM: svc_id = %s(%d) Doesnt exists for
the message recd, Adest = <%"PRId64">\n",
get_svc_names(dest_svc_id), dest_svc_id,
transport_adest);
return NCSCC_RC_FAILURE;
}
@@ -364,7 +364,7 @@ uint32_t mdtm_process_recv_message_commo
case MDS_SENDTYPE_SNDRSP:
case MDS_SENDTYPE_SNDACK:
case MDS_SENDTYPE_BCAST:
- m_MDS_LOG_ERR("MDTM: Recd Message SVC is in
standby so dropping the message:Dest svc_id = %s, dest_vdest_id = %d\n",
+ m_MDS_LOG_ERR("MDTM: Recd Message SVC is in
standby so dropping the message:Dest svc_id = %s(%d), dest_vdest_id = %d\n",
get_svc_names(dest_svc_id), dest_svc_id,
dest_vdest_id);
/* Increment the recd counter as this is normal
*/
mds_incr_subs_res_recvd_msg_cnt(dest_svc_hdl,
src_svc_id,
@@ -549,7 +549,7 @@ uint32_t mdtm_process_recv_message_commo
pwe_hdl =
m_MDS_GET_PWE_HDL_FROM_VDEST_HDL_AND_PWE_ID((MDS_VDEST_HDL)dest_vdest_id,
pwe_id);
if (NCSCC_RC_SUCCESS != mds_svc_tbl_get_svc_hdl(pwe_hdl,
dest_svc_id, &dest_svc_hdl)) {
*buff_dump = 0; /* For future hack */
- m_MDS_LOG_ERR("MDTM: svc_id = %s Doesnt exists for the
message recd\n",
+ m_MDS_LOG_ERR("MDTM: svc_id = %s(%d) Doesnt exists for
the message recd\n",
get_svc_names(dest_svc_id), dest_svc_id);
return NCSCC_RC_FAILURE;
}
@@ -592,7 +592,7 @@ uint32_t mdtm_process_recv_message_commo
case MDS_SENDTYPE_SNDACK:
case MDS_SENDTYPE_BCAST:
m_MDS_LOG_ERR
- ("MDTM: Recd Message svc_id = %s is in
standby so dropping the message: Dest = %d\n",
+ ("MDTM: Recd Message svc_id = %s(%d) is in
standby so dropping the message: Dest = %d\n",
get_svc_names(dest_svc_id), dest_svc_id,
dest_vdest_id);
/* Increment the recd counter as this is normal
*/
mds_incr_subs_res_recvd_msg_cnt(dest_svc_hdl,
src_svc_id,
@@ -691,14 +691,14 @@ uint32_t mdtm_process_recv_message_commo
m_NCS_TMR_CREATE(reassem_queue->tmr, MDTM_REASSEMBLE_TMR_VAL,
(TMR_CALLBACK)mds_tmr_callback, (void *)NULL);
- m_MDS_LOG_DBG(" Reassembly tmr=0x%08x", reassem_queue->tmr);
+ m_MDS_LOG_DBG(" Reassembly tmr=0x%08x", reassem_queue->tmr_hdl);
reassem_queue->tmr_hdl =
ncshm_create_hdl(NCS_HM_POOL_ID_COMMON,
NCS_SERVICE_ID_COMMON,
(NCSCONTEXT)(reassem_queue->tmr_info));
m_NCS_TMR_START(reassem_queue->tmr, MDTM_REASSEMBLE_TMR_VAL,
(TMR_CALLBACK)mds_tmr_callback, (void
*)(long)(reassem_queue->tmr_hdl));
-
m_MDS_LOG_DBG("MCM_DB:RecvMessage:TimerStart:Reassemble:Hdl=0x%08x:SrcSvcId=%s:SrcVdest=%d,DestSvcHdl=%"PRId64"\n",
+
m_MDS_LOG_DBG("MCM_DB:RecvMessage:TimerStart:Reassemble:Hdl=0x%08x:SrcSvcId=%s(%d):SrcVdest=%d,DestSvcHdl=%"PRId64"\n",
reassem_queue->tmr_hdl, get_svc_names(src_svc_id),
src_svc_id, src_vdest_id, dest_svc_hdl);
}
return NCSCC_RC_SUCCESS;
diff --git a/osaf/libs/core/mds/mds_dt_tipc.c b/osaf/libs/core/mds/mds_dt_tipc.c
--- a/osaf/libs/core/mds/mds_dt_tipc.c
+++ b/osaf/libs/core/mds/mds_dt_tipc.c
@@ -581,7 +581,7 @@ ssize_t recvfrom_connectionless (int sd,
if (sz >= 0) {
anc = CMSG_FIRSTHDR(&msg);
if (anc == NULL) {
- m_MDS_LOG_DBG("MDTM: size: %d anc is NULL", sz);
+ m_MDS_LOG_DBG("MDTM: size: %d anc is NULL", (int)sz);
}
while (anc != NULL) {
cptr = CMSG_DATA(anc);
------------------------------------------------------------------------------
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
