diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-10 14:29:52 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:33 +0200 |
| commit | ff673f452527e67f260ec779698044fabe134e79 (patch) | |
| tree | 07681cbb346e5cdba63181eda49a93023afb7ad3 /pimd/pimd.c | |
| parent | pimd: Cleanup use of VRF_DEFAULT to pimg->vrf_id (diff) | |
| download | frr-ff673f452527e67f260ec779698044fabe134e79.tar.xz frr-ff673f452527e67f260ec779698044fabe134e79.zip | |
pimd: Start conversion of socket and counters for VRF
Convert the socket fd to be owned by the pimg pointer as
well as the counters associated with the fd. This will
allow us to future proof our code.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pimd.c')
| -rw-r--r-- | pimd/pimd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pimd.c b/pimd/pimd.c index 89b235bed..0db82073a 100644 --- a/pimd/pimd.c +++ b/pimd/pimd.c @@ -52,8 +52,6 @@ const char *const PIM_ALL_IGMP_ROUTERS = MCAST_ALL_IGMP_ROUTERS; struct thread_master *master = NULL; uint32_t qpim_debugs = 0; -int qpim_mroute_socket_fd = -1; -int64_t qpim_mroute_socket_creation = 0; /* timestamp of creation */ int qpim_t_periodic = PIM_DEFAULT_T_PERIODIC; /* Period between Join/Prune Messages */ struct pim_assert_metric qpim_infinite_assert_metric; @@ -66,10 +64,6 @@ 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; -int64_t qpim_mroute_add_events = 0; -int64_t qpim_mroute_add_last = 0; -int64_t qpim_mroute_del_events = 0; -int64_t qpim_mroute_del_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; @@ -114,6 +108,8 @@ static int pim_vrf_enable(struct vrf *vrf) exit(1); } + pimg->mroute_socket = -1; + pimg->send_v6_secondary = 1; } return 0; |