lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pimd.c

diff --git a/pimd/pimd.c b/pimd/pimd.c
index 164dafe5f7165986e228d629313bdc2e6734da8c..5d3018b2fd45e4cc2574a2836fe68e285777f6fe 100644 (file)
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -28,6 +28,7 @@
 #include "hash.h"
 #include "jhash.h"
 #include "vrf.h"
+#include "lib_errors.h"
 
 #include "pimd.h"
 #include "pim_cmd.h"
@@ -52,21 +53,7 @@ int qpim_t_periodic =
        PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */
 struct pim_assert_metric qpim_infinite_assert_metric;
 long qpim_rpf_cache_refresh_delay_msec = 50;
-struct thread *qpim_rpf_cache_refresher = NULL;
-int64_t qpim_rpf_cache_refresh_requests = 0;
-int64_t qpim_rpf_cache_refresh_events = 0;
-int64_t qpim_rpf_cache_refresh_last = 0;
-struct list *qpim_ssmpingd_list = NULL;
-struct in_addr qpim_ssmpingd_group_addr;
-int64_t qpim_scan_oil_events = 0;
-int64_t qpim_scan_oil_last = 0;
-struct list *qpim_static_route_list = NULL;
-unsigned int qpim_keep_alive_time = PIM_KEEPALIVE_PERIOD;
-signed int qpim_rp_keep_alive_time = 0;
-int64_t qpim_nexthop_lookups = 0;
 int qpim_packet_process = PIM_DEFAULT_PACKET_PROCESS;
-uint8_t qpim_ecmp_enable = 0;
-uint8_t qpim_ecmp_rebalance_enable = 0;
 struct pim_instance *pimg = NULL;
 
 int32_t qpim_register_suppress_time = PIM_REGISTER_SUPPRESSION_TIME_DEFAULT;
@@ -74,40 +61,32 @@ int32_t qpim_register_probe_time = PIM_REGISTER_PROBE_TIME_DEFAULT;
 
 void pim_prefix_list_update(struct prefix_list *plist)
 {
-       pim_rp_prefix_list_update(plist);
-       pim_ssm_prefix_list_update(plist);
-       pim_upstream_spt_prefix_list_update(plist);
+       struct pim_instance *pim;
+       struct vrf *vrf;
+
+       RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
+               pim = vrf->info;
+               if (!pim)
+                       continue;
+
+               pim_rp_prefix_list_update(pim, plist);
+               pim_ssm_prefix_list_update(pim, plist);
+               pim_upstream_spt_prefix_list_update(pim, plist);
+       }
 }
 
 static void pim_free()
 {
-       pim_ssmpingd_destroy();
-
-       pim_oil_terminate();
-
-       pim_upstream_terminate();
-
-       if (qpim_static_route_list)
-               list_free(qpim_static_route_list);
-
-       pim_if_terminate();
-       pim_rp_free();
-
        pim_route_map_terminate();
 
        zclient_lookup_free();
-
-       zprivs_terminate(&pimd_privs);
 }
 
 void pim_init()
 {
-       qpim_rp_keep_alive_time = PIM_RP_KEEPALIVE_PERIOD;
-
-       pim_rp_init();
-
        if (!inet_aton(PIM_ALL_PIM_ROUTERS, &qpim_all_pim_routers_addr)) {
-               zlog_err(
+               flog_err(
+                       EC_LIB_SOCKET,
                        "%s %s: could not solve %s to group address: errno=%d: %s",
                        __FILE__, __PRETTY_FUNCTION__, PIM_ALL_PIM_ROUTERS,
                        errno, safe_strerror(errno));
@@ -115,18 +94,6 @@ void pim_init()
                return;
        }
 
-       pim_oil_init();
-
-       pim_upstream_init();
-
-       qpim_static_route_list = list_new();
-       if (!qpim_static_route_list) {
-               zlog_err("%s %s: failure: static_route_list=list_new()",
-                        __FILE__, __PRETTY_FUNCTION__);
-               return;
-       }
-       qpim_static_route_list->del = (void (*)(void *))pim_static_route_free;
-
        /*
          RFC 4601: 4.6.3.  Assert Metrics
 
@@ -141,9 +108,7 @@ void pim_init()
        qpim_infinite_assert_metric.route_metric = PIM_ASSERT_ROUTE_METRIC_MAX;
        qpim_infinite_assert_metric.ip_address.s_addr = INADDR_ANY;
 
-       pim_if_init();
        pim_cmd_init();
-       pim_ssmpingd_init();
 }
 
 void pim_terminate()
@@ -164,4 +129,6 @@ void pim_terminate()
                zclient_stop(zclient);
                zclient_free(zclient);
        }
+
+       frr_fini();
 }