diff options
| author | Russ White <russ@riw.us> | 2023-04-11 09:49:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 09:49:01 -0400 |
| commit | f26a87cd247c6ece48ef843476afc3b44e6ce5d1 (patch) | |
| tree | 20a46d79a9b32b8447fc481d3747c637036a3934 /lib/link_state.c | |
| parent | e80c797a1f8f98c129a9605a174d451356dde008 (diff) | |
| parent | 5d39a8190740b2b54de3b4d7e1527901bcbc2a33 (diff) | |
Merge pull request #12698 from Orange-OpenSource/isisd
Isisd/Lib: Add new printfrr format facility for Intermediate System ID
Diffstat (limited to 'lib/link_state.c')
| -rw-r--r-- | lib/link_state.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/link_state.c b/lib/link_state.c index 0aba021b1a..076030a839 100644 --- a/lib/link_state.c +++ b/lib/link_state.c @@ -26,6 +26,7 @@ #include "printfrr.h" #include <lib/json.h> #include "link_state.h" +#include "iso.h" /* Link State Memory allocation */ DEFINE_MTYPE_STATIC(LIB, LS_DB, "Link State Database"); @@ -1966,13 +1967,9 @@ static const char *const status2txt[] = { static const char *ls_node_id_to_text(struct ls_node_id lnid, char *str, size_t size) { - if (lnid.origin == ISIS_L1 || lnid.origin == ISIS_L2) { - uint8_t *id; - - id = lnid.id.iso.sys_id; - snprintfrr(str, size, "%02x%02x.%02x%02x.%02x%02x", id[0], - id[1], id[2], id[3], id[4], id[5]); - } else + if (lnid.origin == ISIS_L1 || lnid.origin == ISIS_L2) + snprintfrr(str, size, "%pSY", lnid.id.iso.sys_id); + else snprintfrr(str, size, "%pI4", &lnid.id.ip.addr); return str; |