Merge pull request #11242 from patrasar/pimv6_issue_11233

[mirror_frr.git] / ospfd / ospfd.c

diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index 726ce329e33a9dd4d623a9a44402ee52c27af78e..33872950ac7a38329de6d231827cf9b13e7a8ab0 100644 (file)
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -61,6 +61,7 @@
 #include "ospfd/ospf_ase.h"
 #include "ospfd/ospf_ldp_sync.h"
 #include "ospfd/ospf_gr.h"
+#include "ospfd/ospf_apiserver.h"
 
 
 DEFINE_QOBJ_TYPE(ospf);
@@ -241,6 +242,10 @@ void ospf_process_refresh_data(struct ospf *ospf, bool reset)
                }
 
                ospf_external_lsa_rid_change(ospf);
+
+#ifdef SUPPORT_OSPF_API
+               ospf_apiserver_clients_notify_router_id_change(router_id);
+#endif
        }
 
        ospf->inst_shutdown = 0;
@@ -406,8 +411,6 @@ struct ospf *ospf_new_alloc(unsigned short instance, const char *name)
 
        ospf_opaque_type11_lsa_init(new);
 
-       SET_FLAG(new->config, OSPF_SEND_EXTRA_DATA_TO_ZEBRA);
-
        QOBJ_REG(new, ospf);
 
        new->fd = -1;
@@ -586,13 +589,11 @@ static void ospf_deferred_shutdown_finish(struct ospf *ospf)
 }
 
 /* Timer thread for G-R */
-static int ospf_deferred_shutdown_timer(struct thread *t)
+static void ospf_deferred_shutdown_timer(struct thread *t)
 {
        struct ospf *ospf = THREAD_ARG(t);
 
        ospf_deferred_shutdown_finish(ospf);
-
-       return 0;
 }
 
 /* Check whether deferred-shutdown must be scheduled, otherwise call
@@ -1091,7 +1092,7 @@ struct ospf_interface *add_ospf_interface(struct connected *co,
        ospf_ldp_sync_if_init(oi);
 
        /*
-        * if router_id is not configured, dont bring up
+        * if router_id is not configured, don't bring up
         * interfaces.
         * ospf_router_id_update() will call ospf_if_update
         * whenever r-id is configured instead.
@@ -2118,7 +2119,7 @@ int ospf_nbr_nbma_poll_interval_unset(struct ospf *ospf, struct in_addr addr)
 
 void ospf_master_init(struct thread_master *master)
 {
-       memset(&ospf_master, 0, sizeof(struct ospf_master));
+       memset(&ospf_master, 0, sizeof(ospf_master));
 
        om = &ospf_master;
        om->ospf = list_new();