diff options
| -rw-r--r-- | bgpd/bgp_route.c | 1 | ||||
| -rw-r--r-- | bgpd/bgp_updgrp.c | 3 | ||||
| -rw-r--r-- | lib/log.c | 25 |
3 files changed, 21 insertions, 8 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 427997fe21..a22cf655ba 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -14071,6 +14071,7 @@ show_adj_route(struct vty *vty, struct peer *peer, struct bgp_table *table, vty_out(vty, "Originating default network %s\n\n", (afi == AFI_IP) ? "0.0.0.0/0" : "::/0"); } + (*output_count)++; *header1 = 0; } diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index ee0def29b3..afd2107b48 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -775,7 +775,8 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg) : ""); } } - json_subgrps = json_object_new_array(); + if (ctx->uj) + json_subgrps = json_object_new_array(); UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) { if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id)) continue; @@ -337,6 +337,7 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_INTERFACE_UP), DESC_ENTRY(ZEBRA_INTERFACE_DOWN), DESC_ENTRY(ZEBRA_INTERFACE_SET_MASTER), + DESC_ENTRY(ZEBRA_INTERFACE_SET_PROTODOWN), DESC_ENTRY(ZEBRA_ROUTE_ADD), DESC_ENTRY(ZEBRA_ROUTE_DELETE), DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_OWNER), @@ -386,10 +387,10 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_FEC_REGISTER), DESC_ENTRY(ZEBRA_FEC_UNREGISTER), DESC_ENTRY(ZEBRA_FEC_UPDATE), - DESC_ENTRY(ZEBRA_ADVERTISE_ALL_VNI), DESC_ENTRY(ZEBRA_ADVERTISE_DEFAULT_GW), DESC_ENTRY(ZEBRA_ADVERTISE_SVI_MACIP), DESC_ENTRY(ZEBRA_ADVERTISE_SUBNET), + DESC_ENTRY(ZEBRA_ADVERTISE_ALL_VNI), DESC_ENTRY(ZEBRA_LOCAL_ES_ADD), DESC_ENTRY(ZEBRA_LOCAL_ES_DEL), DESC_ENTRY(ZEBRA_REMOTE_ES_VTEP_ADD), @@ -438,19 +439,23 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_MLAG_CLIENT_REGISTER), DESC_ENTRY(ZEBRA_MLAG_CLIENT_UNREGISTER), DESC_ENTRY(ZEBRA_MLAG_FORWARD_MSG), + DESC_ENTRY(ZEBRA_NHG_ADD), + DESC_ENTRY(ZEBRA_NHG_DEL), + DESC_ENTRY(ZEBRA_NHG_NOTIFY_OWNER), + DESC_ENTRY(ZEBRA_EVPN_REMOTE_NH_ADD), + DESC_ENTRY(ZEBRA_EVPN_REMOTE_NH_DEL), + DESC_ENTRY(ZEBRA_SRV6_LOCATOR_ADD), + DESC_ENTRY(ZEBRA_SRV6_LOCATOR_DELETE), + DESC_ENTRY(ZEBRA_SRV6_MANAGER_GET_LOCATOR_CHUNK), + DESC_ENTRY(ZEBRA_SRV6_MANAGER_RELEASE_LOCATOR_CHUNK), DESC_ENTRY(ZEBRA_ERROR), DESC_ENTRY(ZEBRA_CLIENT_CAPABILITIES), DESC_ENTRY(ZEBRA_OPAQUE_MESSAGE), DESC_ENTRY(ZEBRA_OPAQUE_REGISTER), DESC_ENTRY(ZEBRA_OPAQUE_UNREGISTER), DESC_ENTRY(ZEBRA_NEIGH_DISCOVER), - DESC_ENTRY(ZEBRA_NHG_ADD), - DESC_ENTRY(ZEBRA_NHG_DEL), - DESC_ENTRY(ZEBRA_NHG_NOTIFY_OWNER), DESC_ENTRY(ZEBRA_ROUTE_NOTIFY_REQUEST), DESC_ENTRY(ZEBRA_CLIENT_CLOSE_NOTIFY), - DESC_ENTRY(ZEBRA_EVPN_REMOTE_NH_ADD), - DESC_ENTRY(ZEBRA_EVPN_REMOTE_NH_DEL), DESC_ENTRY(ZEBRA_NHRP_NEIGH_ADDED), DESC_ENTRY(ZEBRA_NHRP_NEIGH_REMOVED), DESC_ENTRY(ZEBRA_NHRP_NEIGH_GET), @@ -461,7 +466,13 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_CONFIGURE_ARP), DESC_ENTRY(ZEBRA_GRE_GET), DESC_ENTRY(ZEBRA_GRE_UPDATE), - DESC_ENTRY(ZEBRA_GRE_SOURCE_SET)}; + DESC_ENTRY(ZEBRA_GRE_SOURCE_SET), + DESC_ENTRY(ZEBRA_TC_QDISC_INSTALL), + DESC_ENTRY(ZEBRA_TC_QDISC_UNINSTALL), + DESC_ENTRY(ZEBRA_TC_CLASS_ADD), + DESC_ENTRY(ZEBRA_TC_CLASS_DELETE), + DESC_ENTRY(ZEBRA_TC_FILTER_ADD), + DESC_ENTRY(ZEBRA_TC_FILTER_DELETE)}; #undef DESC_ENTRY static const struct zebra_desc_table unknown = {0, "unknown", '?'}; |