Revert "bgpd: fix printing link state ospf opaque data"

This reverts commit e1333d12e0.
This commit is contained in:
Donald Sharp 2023-10-10 13:30:57 -04:00
parent d2324b7b4a
commit 28dab73877

View File

@ -1353,6 +1353,7 @@ static void bgp_linkstate_tlv_opaque_display(struct vty *vty, uint8_t *pnt,
uint8_t *lim = pnt + length; uint8_t *lim = pnt + length;
bool ospf_tlv_header; bool ospf_tlv_header;
char tlv_type[6]; char tlv_type[6];
int i;
if (json) { if (json) {
@ -1398,16 +1399,22 @@ static void bgp_linkstate_tlv_opaque_display(struct vty *vty, uint8_t *pnt,
continue; continue;
} }
vty_out(vty, "\n%*sTLV type %u: ", indent, "", sub_type); vty_out(vty, "\n%*sTLV type %u: 0x", indent, "", sub_type);
if (pnt + sub_length > lim) { if (pnt + sub_length > lim) {
vty_out(vty, "Bad length received: %u\n", sub_length); vty_out(vty, "Bad length received: %u\n", sub_length);
break; break;
} }
bgp_linkstate_tlv_hexa_display(vty, pnt, sub_length, NULL); for (i = 0; i < sub_length; i++) {
if (i != 0 && i % 8 == 0)
vty_out(vty, " ");
vty_out(vty, "%02x", *pnt);
} }
} }
if (!json)
vty_out(vty, "\n");
}
static void bgp_linkstate_tlv_rtm_capability_display(struct vty *vty, static void bgp_linkstate_tlv_rtm_capability_display(struct vty *vty,
uint8_t *pnt, uint8_t *pnt,