---
src/dtm/dtmnd/dtm_inter_svc.cc | 2 +-
src/dtm/dtmnd/dtm_intra.cc | 4 ++--
src/dtm/dtmnd/dtm_intra_svc.cc | 22 +++++++++++-----------
src/dtm/dtmnd/dtm_node.cc | 6 +++---
src/dtm/dtmnd/dtm_node_db.cc | 12 ++++++------
src/dtm/dtmnd/dtm_node_sockets.cc | 30 +++++++++++++++---------------
src/dtm/dtmnd/dtm_read_config.cc | 2 +-
7 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/dtm/dtmnd/dtm_inter_svc.cc b/src/dtm/dtmnd/dtm_inter_svc.cc
index 270c98817..468db1dcd 100644
--- a/src/dtm/dtmnd/dtm_inter_svc.cc
+++ b/src/dtm/dtmnd/dtm_inter_svc.cc
@@ -138,7 +138,7 @@ uint32_t dtm_node_up(NODE_ID node_id, char *node_name, char
*node_ip,
dtm_msg_elem->info.node.i_addr_family =
i_addr_family; /* Indicates V4 or V6 */
strcpy(dtm_msg_elem->info.node.node_ip, node_ip);
- TRACE("DTM: node_ip:%s, node_id:%u i_addr_family:%d ",
+ TRACE("DTM: node_ip:%s, node_id:%x i_addr_family:%d ",
dtm_msg_elem->info.node.node_ip, dtm_msg_elem->info.node.node_id,
dtm_msg_elem->info.node.i_addr_family);
diff --git a/src/dtm/dtmnd/dtm_intra.cc b/src/dtm/dtmnd/dtm_intra.cc
index 2b09359e8..f592449a3 100644
--- a/src/dtm/dtmnd/dtm_intra.cc
+++ b/src/dtm/dtmnd/dtm_intra.cc
@@ -700,7 +700,7 @@ static void dtm_intranode_processing(void *) {
msg_elem->info.svc_event.node_id);
free(msg_elem->info.svc_event.buffer);
} else if (DTM_MBX_NODE_UP_TYPE == msg_elem->type) {
- TRACE("DTM: node_ip:%s, node_id:%u i_addr_family:%d ",
+ TRACE("DTM: node_ip:%s, node_id:%x i_addr_family:%d ",
msg_elem->info.node.node_ip, msg_elem->info.node.node_id,
msg_elem->info.node.i_addr_family);
dtm_intranode_process_node_up(
@@ -708,7 +708,7 @@ static void dtm_intranode_processing(void *) {
msg_elem->info.node.node_ip,
msg_elem->info.node.i_addr_family, msg_elem->info.node.mbx);
} else if (DTM_MBX_NODE_DOWN_TYPE == msg_elem->type) {
- TRACE("DTM: node_ip:%s, node_id:%u i_addr_family:%d ",
+ TRACE("DTM: node_ip:%s, node_id:%x i_addr_family:%d ",
msg_elem->info.node.node_ip, msg_elem->info.node.node_id,
msg_elem->info.node.i_addr_family);
dtm_intranode_process_node_down(msg_elem->info.node.node_id);
diff --git a/src/dtm/dtmnd/dtm_intra_svc.cc b/src/dtm/dtmnd/dtm_intra_svc.cc
index cf38e4544..8e0474210 100644
--- a/src/dtm/dtmnd/dtm_intra_svc.cc
+++ b/src/dtm/dtmnd/dtm_intra_svc.cc
@@ -123,7 +123,7 @@ uint32_t dtm_intranode_process_pid_msg(uint8_t *buffer, int
fd) {
pid_node->node_id = m_NCS_GET_NODE_ID;
pid_node->pid_node.key_info = reinterpret_cast<uint8_t *>(&pid_node->pid);
- TRACE_1("DTM: INTRA: Processid message rcvd: pid=%d, node_id=%u", process_id,
+ TRACE_1("DTM: INTRA: Processid message rcvd: pid=%d, node_id=%x", process_id,
node_id);
ncs_patricia_tree_add(&dtm_intranode_cb->dtm_intranode_pid_list,
@@ -719,7 +719,7 @@ uint32_t dtm_intranode_process_node_subscribe_msg(uint8_t
*buff, int fd) {
strncpy(node_up_msg.node_name, node_db->node_name,
_POSIX_HOST_NAME_MAX);
node_up_msg.i_addr_family = node_db->i_addr_family;
- TRACE("DTM: node_ip:%s, node_id:%u i_addr_family:%d",
+ TRACE("DTM: node_ip:%s, node_id:%x i_addr_family:%d",
node_up_msg.node_ip, node_up_msg.node_id,
node_up_msg.i_addr_family);
dtm_lib_prepare_node_up_msg(&node_up_msg, buffer);
@@ -1260,7 +1260,7 @@ static uint32_t dtm_del_from_node_subscr_list(uint32_t
pid, uint64_t ref_val) {
uint32_t dtm_add_to_node_db_list(DTM_INTRANODE_NODE_DB *add_node) {
DTM_INTRANODE_NODE_DB *node_db = dtm_intranode_node_list_db;
TRACE_ENTER();
- TRACE("node_ip:%s, node_id:%u i_addr_family:%d ", add_node->node_ip,
+ TRACE("node_ip:%s, node_id:%x i_addr_family:%d ", add_node->node_ip,
add_node->node_id, add_node->i_addr_family);
if (nullptr == node_db) {
add_node->next = nullptr;
@@ -1431,7 +1431,7 @@ static uint32_t
dtm_lib_prepare_node_up_msg(DTM_LIB_NODE_UP_MSG *up_msg,
uint8_t *buffer) {
uint8_t *data = buffer;
TRACE_ENTER();
- TRACE("node_ip:%s, node_id:%u i_addr_family:%d ", up_msg->node_ip,
+ TRACE("node_ip:%s, node_id:%x i_addr_family:%d ", up_msg->node_ip,
up_msg->node_id, up_msg->i_addr_family);
ncs_encode_16bit(&data, DTM_LIB_NODE_UP_MSG_SIZE);
ncs_encode_32bit(&data, DTM_INTRANODE_SND_MSG_IDENTIFIER);
@@ -1499,7 +1499,7 @@ uint32_t dtm_intranode_process_node_up(NODE_ID node_id,
char *node_name,
node_db_info->mbx = mbx;
node_db_info->i_addr_family = i_addr_family;
strcpy(node_db_info->node_ip, node_ip);
- TRACE("node_name:%s, node_ip:%s, node_id:%u i_addr_family:%d ",
+ TRACE("node_name:%s, node_ip:%s, node_id:%x i_addr_family:%d ",
node_db_info->node_name, node_db_info->node_ip, node_db_info->node_id,
node_db_info->i_addr_family);
/* Initialize the pat tree */
@@ -1526,7 +1526,7 @@ uint32_t dtm_intranode_process_node_up(NODE_ID node_id,
char *node_name,
strncpy(node_up_msg.node_ip, node_ip, INET6_ADDRSTRLEN - 1);
strncpy(node_up_msg.node_name, node_db_info->node_name,
_POSIX_HOST_NAME_MAX);
- TRACE("DTM: node_ip:%s, node_id:%u i_addr_family:%d ", node_up_msg.node_ip,
+ TRACE("DTM: node_ip:%s, node_id:%x i_addr_family:%d ", node_up_msg.node_ip,
node_up_msg.node_id, node_up_msg.i_addr_family);
dtm_lib_prepare_node_up_msg(&node_up_msg, buffer);
while (nullptr != node_subscr_info) {
@@ -1616,7 +1616,7 @@ static uint32_t dtm_deliver_svc_down(NODE_ID node_id) {
if (nullptr == node_info) {
LOG_ER(
- "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%u",
+ "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%x",
node_id);
osafassert(0);
} else {
@@ -1773,7 +1773,7 @@ uint32_t dtm_process_internode_service_up_msg(uint8_t
*buffer, uint16_t len,
if (nullptr == node_info) {
LOG_ER(
- "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%u",
+ "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%x",
node_id);
osafassert(0);
} else {
@@ -1913,7 +1913,7 @@ uint32_t dtm_process_internode_service_down_msg(uint8_t
*buffer, uint16_t len,
if (nullptr == node_info) {
LOG_ER(
- "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%u",
+ "DTM INTRA: node_info of coressponding to node_id doesnt exist,
database mismatch.node_id=%x",
node_id);
osafassert(0);
} else {
@@ -1931,7 +1931,7 @@ uint32_t dtm_process_internode_service_down_msg(uint8_t
*buffer, uint16_t len,
svc_list.process_id = ncs_decode_32bit(&data);
TRACE(
- "DTM :rcvd internode down Msg type: %d, inst : %d, node: %d , pid
:%d",
+ "DTM :rcvd internode down Msg type: %d, inst : %d, node: %x , pid
:%d",
server_type, svc_list.server_inst_lower, node_id,
svc_list.process_id);
dtm_internode_del_svclist_from_svc_tree(node_info, svc_info,
&svc_list);
@@ -2024,7 +2024,7 @@ uint32_t dtm_intranode_add_self_node_to_node_db(NODE_ID
node_id,
node_db_info->i_addr_family = i_addr_family;
memcpy(node_db_info->node_ip, node_ip, INET6_ADDRSTRLEN);
memcpy(node_db_info->node_name, node_name, _POSIX_HOST_NAME_MAX);
- TRACE("DTM: nnode_name:%s, node_ip:%s, node_id:%u i_addr_family:%d ",
+ TRACE("DTM: nnode_name:%s, node_ip:%s, node_id:%x i_addr_family:%d ",
node_db_info->node_name, node_db_info->node_ip, node_db_info->node_id,
node_db_info->i_addr_family);
if (NCSCC_RC_SUCCESS != (dtm_add_to_node_db_list(node_db_info))) {
diff --git a/src/dtm/dtmnd/dtm_node.cc b/src/dtm/dtmnd/dtm_node.cc
index 5e51f7a17..c39a2e6ee 100644
--- a/src/dtm/dtmnd/dtm_node.cc
+++ b/src/dtm/dtmnd/dtm_node.cc
@@ -154,7 +154,7 @@ uint32_t dtm_process_node_info(DTM_INTERNODE_CB *dtms_cb,
DTM_NODE_DB *node,
TRACE(
"DTM: dtm_process_node_info node_name: '%s' node_ip:%s, "
- "node_id:%u i_addr_family:%d ",
+ "node_id:%x i_addr_family:%d ",
node->node_name, node->node_ip, node->node_id, node->i_addr_family);
rc = dtm_process_node_up_down(node->node_id, node->node_name,
node->node_ip,
node->i_addr_family, node->comm_status);
@@ -187,7 +187,7 @@ uint32_t dtm_process_node_up_down(NODE_ID node_id, char
*node_name,
bool comm_status) {
if (comm_status == true) {
TRACE(
- "DTM: dtm_process_node_up_down node_ip:%s, node_id:%u i_addr_family:%d
",
+ "DTM: dtm_process_node_up_down node_ip:%s, node_id:%x i_addr_family:%d
",
node_ip, node_id, i_addr_family);
dtm_node_up(node_id, node_name, node_ip, i_addr_family, 0);
} else {
@@ -268,7 +268,7 @@ void dtm_internode_process_poll_rcv_msg_common(
memcpy(alloc_buffer + 8, buffer + 6, local_len_buf - 6);
NODE_ID dst_nodeid = ncs_decode_32bit(&data);
if (dtms_cb->node_id != dst_nodeid)
- LOG_ER("Invalid dest_nodeid: %u received in dtm_internode_processing",
+ LOG_ER("Invalid dest_nodeid: %x received in dtm_internode_processing",
dst_nodeid);
uint32_t dst_processid = ncs_decode_32bit(&data);
dtm_internode_process_rcv_data_msg(alloc_buffer, dst_processid,
diff --git a/src/dtm/dtmnd/dtm_node_db.cc b/src/dtm/dtmnd/dtm_node_db.cc
index ff1f44b6f..679368971 100644
--- a/src/dtm/dtmnd/dtm_node_db.cc
+++ b/src/dtm/dtmnd/dtm_node_db.cc
@@ -140,7 +140,7 @@ DTM_NODE_DB *dtm_node_get(uint8_t *key, KeyTypes type) {
switch (type) {
case KeyTypes::kDtmNodeIdKeyType:
- TRACE("DTM: Getting node from the database by node_id : %u as key",
+ TRACE("DTM: Getting node from the database by node_id : %x as key",
*reinterpret_cast<NODE_ID *>(key));
node = reinterpret_cast<DTM_NODE_DB *>(ncs_patricia_tree_get(
&dtms_cb->nodeid_tree, key));
@@ -198,7 +198,7 @@ DTM_NODE_DB *dtm_node_getnext_by_id(uint32_t node_id) {
/* Adjust the pointer */
node = reinterpret_cast<DTM_NODE_DB *>(reinterpret_cast<char *>(node) -
offsetof(DTM_NODE_DB, pat_nodeid));
- TRACE("DTM:Node found %d", node->node_id);
+ TRACE("DTM:Node found %x", node->node_id);
}
TRACE_LEAVE();
@@ -223,12 +223,12 @@ uint32_t dtm_node_add(DTM_NODE_DB *node, KeyTypes type) {
switch (type) {
case KeyTypes::kDtmNodeIdKeyType:
- TRACE("DTM:Adding node_id to the database with node_id :%u as key",
+ TRACE("DTM:Adding node_id to the database with node_id :%x as key",
node->node_id);
node->pat_nodeid.key_info = reinterpret_cast<uint8_t
*>(&(node->node_id));
rc = ncs_patricia_tree_add(&dtms_cb->nodeid_tree, &node->pat_nodeid);
if (rc != NCSCC_RC_SUCCESS) {
- TRACE("DTM:ncs_patricia_tree_add for node_id FAILED for :%d :%u",
+ TRACE("DTM:ncs_patricia_tree_add for node_id FAILED for :%x :%u",
node->node_id, rc);
node->pat_nodeid.key_info = nullptr;
goto done;
@@ -279,12 +279,12 @@ uint32_t dtm_node_delete(DTM_NODE_DB *node, KeyTypes
type) {
switch (type) {
case KeyTypes::kDtmNodeIdKeyType:
if (node->node_id != 0 && node->pat_nodeid.key_info) {
- TRACE("DTM:Deleting node_id from the database with node_id :%u as key",
+ TRACE("DTM:Deleting node_id from the database with node_id :%x as key",
node->node_id);
if ((rc = ncs_patricia_tree_del(&dtms_cb->nodeid_tree,
&node->pat_nodeid)) !=
NCSCC_RC_SUCCESS) {
- TRACE("DTM:ncs_patricia_tree_del FAILED for node_id :%u rc :%d",
+ TRACE("DTM:ncs_patricia_tree_del FAILED for node_id :%x rc :%d",
node->node_id, rc);
goto done;
}
diff --git a/src/dtm/dtmnd/dtm_node_sockets.cc
b/src/dtm/dtmnd/dtm_node_sockets.cc
index 7cb461810..8e1299368 100644
--- a/src/dtm/dtmnd/dtm_node_sockets.cc
+++ b/src/dtm/dtmnd/dtm_node_sockets.cc
@@ -161,7 +161,7 @@ void dtm_comm_socket_close(DTM_NODE_DB *node) {
TRACE("DTM: node deleting enty ");
if (node->comm_status == true) {
TRACE(
- "DTM: dtm_comm_socket_close node_ip:%s, node_id:%u i_addr_family:%d
",
+ "DTM: dtm_comm_socket_close node_ip:%s, node_id:%x i_addr_family:%d
",
node->node_ip, node->node_id, node->i_addr_family);
if (dtm_process_node_up_down(node->node_id, node->node_name,
node->node_ip, node->i_addr_family,
@@ -559,11 +559,11 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB
*dtms_cb, uint8_t *data,
if (dtms_cb->node_id == node.node_id) {
if (dtms_cb->mcast_flag() != true) {
TRACE(
- "DTM: received the self node_id bcast message, dropping message
cluster_id: %d node_id: %u",
+ "DTM: received the self node_id bcast message, dropping message
cluster_id: %d node_id: %x",
node.cluster_id, node.node_id);
} else {
TRACE(
- "DTM: received the self node_id mcast message, dropping message
cluster_id: %d node_id: %u",
+ "DTM: received the self node_id mcast message, dropping message
cluster_id: %d node_id: %x",
node.cluster_id, node.node_id);
}
TRACE_LEAVE();
@@ -573,7 +573,7 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB *dtms_cb,
uint8_t *data,
/* Decode end */
if (node.cluster_id != dtms_cb->cluster_id) {
LOG_WA(
- "DTM:cluster_id mis match dropping message cluster_id: %d, node_id:
%u",
+ "DTM:cluster_id mis match dropping message cluster_id: %d, node_id:
%x",
node.cluster_id, node.node_id);
TRACE_LEAVE();
return nullptr;
@@ -590,7 +590,7 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB *dtms_cb,
uint8_t *data,
if (initial_discovery_phase == true) {
if (node.node_id < dtms_cb->node_id) {
TRACE(
- "DTM: received node_id is less than local node_id dropping message
cluster_id: %d node_id: %u",
+ "DTM: received node_id is less than local node_id dropping message
cluster_id: %d node_id: %x",
node.cluster_id, node.node_id);
return nullptr;
}
@@ -608,15 +608,15 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB
*dtms_cb, uint8_t *data,
if ((new_node->node_id == node.node_id) &&
(strncmp(node.node_ip, new_node->node_ip, INET6_ADDRSTRLEN) == 0))
TRACE(
- "DTM:node already discovered dropping message cluster_id:
%d,node_id :%u, node_ip: %s",
+ "DTM:node already discovered dropping message cluster_id:
%d,node_id :%x, node_ip: %s",
node.cluster_id, node.node_id, node.node_ip);
else
LOG_WA(
- "DTM:node duplicate discovered dropping message cluster_id: %d,
node_id :%u, node_ip:%s",
+ "DTM:node duplicate discovered dropping message cluster_id: %d,
node_id :%x, node_ip:%s",
node.cluster_id, node.node_id, node.node_ip);
} else {
TRACE(
- "DTM: discovery in progress dropping message cluster_id: %d,
node_id :%u, node_ip:%s",
+ "DTM: discovery in progress dropping message cluster_id: %d,
node_id :%x, node_ip:%s",
node.cluster_id, node.node_id, node.node_ip);
}
TRACE_LEAVE();
@@ -625,7 +625,7 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB *dtms_cb,
uint8_t *data,
((new_node->node_id != node.node_id) ||
(strncmp(node.node_ip, new_node->node_ip, INET6_ADDRSTRLEN) !=
0))) {
- TRACE("DTM: deleting stale enty cluster_id: %d, node_id :%u, node_ip:%s",
+ TRACE("DTM: deleting stale enty cluster_id: %d, node_id :%x, node_ip:%s",
node.cluster_id, node.node_id, node.node_ip);
if (dtm_node_delete(new_node, KeyTypes::kDtmNodeIdKeyType) !=
NCSCC_RC_SUCCESS) {
@@ -655,11 +655,11 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB
*dtms_cb, uint8_t *data,
new_node->i_addr_family = node.i_addr_family;
if (sock_desc != -1) {
- TRACE("DTM: dtm_node_add .node_ip: %s node_id: %u, comm_socket %d",
+ TRACE("DTM: dtm_node_add .node_ip: %s node_id: %x, comm_socket %d",
new_node->node_ip, new_node->node_id, new_node->comm_socket);
if (dtm_node_add(new_node, KeyTypes::kDtmNodeIdKeyType) !=
NCSCC_RC_SUCCESS) {
- LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %u",
+ LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %x",
new_node->node_ip, new_node->node_id);
dtm_comm_socket_close(new_node);
sock_desc = -1;
@@ -668,13 +668,13 @@ DTM_NODE_DB *dtm_process_connect(DTM_INTERNODE_CB
*dtms_cb, uint8_t *data,
if (dtm_node_add(new_node, KeyTypes::kDtmNodeIpKeyType) !=
NCSCC_RC_SUCCESS) {
- LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %u",
+ LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %x",
new_node->node_ip, new_node->node_id);
dtm_comm_socket_close(new_node);
sock_desc = -1;
goto node_fail;
} else
- TRACE("DTM: dtm_node_add add .node_ip: %s, node_id: %u",
+ TRACE("DTM: dtm_node_add add .node_ip: %s, node_id: %x",
new_node->node_ip, new_node->node_id);
}
@@ -780,7 +780,7 @@ DTM_NODE_DB *dtm_process_accept(DTM_INTERNODE_CB *dtms_cb,
int stream_sock) {
new_node = dtm_node_new(&node);
if (new_node == nullptr) {
- LOG_ER("DTM: dtm_node_new failed. node_ip: %s, node_id: %u",
node.node_ip,
+ LOG_ER("DTM: dtm_node_new failed. node_ip: %s, node_id: %x",
node.node_ip,
node.node_id);
close(new_conn_sd);
continue;
@@ -788,7 +788,7 @@ DTM_NODE_DB *dtm_process_accept(DTM_INTERNODE_CB *dtms_cb,
int stream_sock) {
if (dtm_node_add(new_node, KeyTypes::kDtmNodeIpKeyType) !=
NCSCC_RC_SUCCESS) {
- LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %u",
+ LOG_ER("DTM: dtm_node_add failed .node_ip: %s, node_id: %x",
new_node->node_ip, new_node->node_id);
dtm_comm_socket_close(new_node);
continue;
diff --git a/src/dtm/dtmnd/dtm_read_config.cc b/src/dtm/dtmnd/dtm_read_config.cc
index 5424be367..7184c44e3 100644
--- a/src/dtm/dtmnd/dtm_read_config.cc
+++ b/src/dtm/dtmnd/dtm_read_config.cc
@@ -81,7 +81,7 @@ void dtm_print_config(DTM_INTERNODE_CB *config) {
TRACE(" DTM_CLUSTER_ID: ");
TRACE(" %d", config->cluster_id);
TRACE(" NODE_ID: ");
- TRACE(" %d", config->node_id);
+ TRACE(" %x", config->node_id);
TRACE(" IP_ADDR: ");
TRACE(" %s", config->ip_addr.c_str());
TRACE(" PUBLIC_IP_ADDR: ");
--
2.25.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
