From d3f80805981c437ebbaeaec4e0cc5bd62033f14b Mon Sep 17 00:00:00 2001 From: Christian Giese Date: Mon, 4 Sep 2023 14:10:06 +0000 Subject: [PATCH] enhance lspgen root node output --- code/lspgen/src/lspgen_lsdb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/lspgen/src/lspgen_lsdb.c b/code/lspgen/src/lspgen_lsdb.c index 3b8c3395..9d24d15d 100644 --- a/code/lspgen/src/lspgen_lsdb.c +++ b/code/lspgen/src/lspgen_lsdb.c @@ -181,16 +181,20 @@ lsdb_format_node(lsdb_node_t *node) if (ctx->protocol_id == PROTO_ISIS) { if (node->node_name) { - snprintf(buffer, sizeof(buffer), "%s", node->node_name); + snprintf(buffer, sizeof(buffer), "%s (%s)", + lsdb_format_node_id(node->key.node_id), node->node_name); } else { - snprintf(buffer, sizeof(buffer), "%s", lsdb_format_node_id(node->key.node_id)); + snprintf(buffer, sizeof(buffer), "%s", + lsdb_format_node_id(node->key.node_id)); } } else if (ctx->protocol_id == PROTO_OSPF2 || ctx->protocol_id == PROTO_OSPF3) { if (node->node_name) { - snprintf(buffer, sizeof(buffer), "%s", node->node_name); + snprintf(buffer, sizeof(buffer), "%u.%u.%u.%u (%s)", + node->key.node_id[0], node->key.node_id[1], node->key.node_id[2], node->key.node_id[3], node->node_name); + } else { snprintf(buffer, sizeof(buffer), "%u.%u.%u.%u", - node->key.node_id[0], node->key.node_id[1], node->key.node_id[2], node->key.node_id[3]); + node->key.node_id[0], node->key.node_id[1], node->key.node_id[2], node->key.node_id[3]); } } else { snprintf(buffer, sizeof(buffer), "0x%08x%08x", ntohl(node->key.node_id[0]), ntohl(node->key.node_id[4]));