lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pim_msdp.h

diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h
index a24883b5d435d7f078e62f81b7dec36e2f2445bc..8363d509915ac7953c9a7a2419501386cda24bbe 100644 (file)
--- a/pimd/pim_msdp.h
+++ b/pimd/pim_msdp.h
@@ -119,12 +119,8 @@ struct pim_msdp_peer {
 /* protocol timers */
 #define PIM_MSDP_PEER_HOLD_TIME 75
        struct thread *hold_timer; // 5.4
-                                  /* $FRR indent$ */
-/* clang-format off */
 #define PIM_MSDP_PEER_KA_TIME 60
        struct thread *ka_timer; // 5.5
-                                /* $FRR indent$ */
-                                /* clang-format off */
 #define PIM_MSDP_PEER_CONNECT_RETRY_TIME 30
        struct thread *cr_timer; // 5.6
 
@@ -139,8 +135,6 @@ struct pim_msdp_peer {
        uint32_t conn_attempts;
        uint32_t est_flaps;
        uint32_t sa_cnt; /* number of SAs attributed to this peer */
-                        /* $FRR indent$ */
-                        /* clang-format off */
 #define PIM_MSDP_PEER_LAST_RESET_STR 20
        char last_reset[PIM_MSDP_PEER_LAST_RESET_STR];
 
@@ -219,7 +213,7 @@ struct pim_msdp {
 
 // struct pim_msdp *msdp;
 struct pim_instance;
-void pim_msdp_init(struct thread_master *master, struct pim_instance *pim);
+void pim_msdp_init(struct pim_instance *pim, struct thread_master *master);
 void pim_msdp_exit(struct pim_instance *pim);
 enum pim_msdp_err pim_msdp_peer_add(struct pim_instance *pim,
                                    struct in_addr peer, struct in_addr local,