diff options
| -rw-r--r-- | ospfd/ospf_opaque.c | 44 | ||||
| -rw-r--r-- | ospfd/ospf_sr.c | 4 |
2 files changed, 25 insertions, 23 deletions
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c index 009fd997ea..4417f42b3c 100644 --- a/ospfd/ospf_opaque.c +++ b/ospfd/ospf_opaque.c @@ -610,28 +610,28 @@ static void free_opaque_info_owner(void *val) { struct opaque_info_per_type *oipt = (struct opaque_info_per_type *)val; - switch (oipt->lsa_type) { - case OSPF_OPAQUE_LINK_LSA: { - struct ospf_interface *oi = - (struct ospf_interface *)(oipt->owner); - listnode_delete(oi->opaque_lsa_self, oipt); - break; - } - case OSPF_OPAQUE_AREA_LSA: { - struct ospf_area *area = (struct ospf_area *)(oipt->owner); - listnode_delete(area->opaque_lsa_self, oipt); - break; - } - case OSPF_OPAQUE_AS_LSA: { - struct ospf *top = (struct ospf *)(oipt->owner); - listnode_delete(top->opaque_lsa_self, oipt); - break; - } - default: - zlog_warn("free_opaque_info_owner: Unexpected LSA-type(%u)", - oipt->lsa_type); - break; /* This case may not exist. */ - } + switch (oipt->lsa_type) { + case OSPF_OPAQUE_LINK_LSA: { + struct ospf_interface *oi = + (struct ospf_interface *)(oipt->owner); + listnode_delete(oi->opaque_lsa_self, oipt); + break; + } + case OSPF_OPAQUE_AREA_LSA: { + struct ospf_area *area = (struct ospf_area *)(oipt->owner); + listnode_delete(area->opaque_lsa_self, oipt); + break; + } + case OSPF_OPAQUE_AS_LSA: { + struct ospf *top = (struct ospf *)(oipt->owner); + listnode_delete(top->opaque_lsa_self, oipt); + break; + } + default: + zlog_warn("free_opaque_info_owner: Unexpected LSA-type(%u)", + oipt->lsa_type); + break; /* This case may not exist. */ + } } static void free_opaque_info_per_type(void *val) diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 3dc18e6e34..0cdd464a26 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -2170,6 +2170,7 @@ static void show_sr_node(struct vty *vty, struct json_object *json, continue; json_obj = json_object_new_object(); char tmp[2]; + snprintf(tmp, 2, "%u", i); json_object_string_add(json_obj, tmp, srn->algo[i] == SR_ALGORITHM_SPF ? @@ -2355,7 +2356,8 @@ DEFUN (show_ip_opsf_srdb, inet_ntoa(OspfSR.self->adv_router)); json_object_object_add(json, "srNodes", json_node_array); } else { - vty_out(vty, "\n OSPF Segment Routing database for ID %s\n\n", + vty_out(vty, + "\n\t\tOSPF Segment Routing database for ID %s\n\n", inet_ntoa(OspfSR.self->adv_router)); } |