Merge pull request #5305 from ton31337/feature/draft-ietf-idr-deprecate-as-set-confed-set

[mirror_frr.git] / ospfd / ospf_asbr.c

diff --git a/ospfd/ospf_asbr.c b/ospfd/ospf_asbr.c
index ba2e04bf766b23b4f8daa2ad0e0b520fd6e3f9bd..a60af36564f6974ff5c9bb756ab398f069f0e439 100644 (file)
--- a/ospfd/ospf_asbr.c
+++ b/ospfd/ospf_asbr.c
@@ -79,8 +79,7 @@ struct external_info *ospf_external_info_new(uint8_t type,
 {
        struct external_info *new;
 
-       new = (struct external_info *)XCALLOC(MTYPE_OSPF_EXTERNAL_INFO,
-                                             sizeof(struct external_info));
+       new = XCALLOC(MTYPE_OSPF_EXTERNAL_INFO, sizeof(struct external_info));
        new->type = type;
        new->instance = instance;
 
@@ -239,20 +238,23 @@ struct ospf_lsa *ospf_external_info_find_lsa(struct ospf *ospf,
 /* Update ASBR status. */
 void ospf_asbr_status_update(struct ospf *ospf, uint8_t status)
 {
-       zlog_info("ASBR[Status:%d]: Update", status);
+       zlog_info("ASBR[%s:Status:%d]: Update",
+                 ospf_get_name(ospf), status);
 
        /* ASBR on. */
        if (status) {
                /* Already ASBR. */
                if (IS_OSPF_ASBR(ospf)) {
-                       zlog_info("ASBR[Status:%d]: Already ASBR", status);
+                       zlog_info("ASBR[%s:Status:%d]: Already ASBR",
+                                 ospf_get_name(ospf), status);
                        return;
                }
                SET_FLAG(ospf->flags, OSPF_FLAG_ASBR);
        } else {
                /* Already non ASBR. */
                if (!IS_OSPF_ASBR(ospf)) {
-                       zlog_info("ASBR[Status:%d]: Already non ASBR", status);
+                       zlog_info("ASBR[%s:Status:%d]: Already non ASBR",
+                                 ospf_get_name(ospf), status);
                        return;
                }
                UNSET_FLAG(ospf->flags, OSPF_FLAG_ASBR);