diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-04 10:44:51 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-06-02 13:44:37 -0400 |
| commit | 7656e7fc468b89dec8399a8034c18064f7ddf71b (patch) | |
| tree | b9f48c2e503a658dd65637a6f83668a8e2c1e167 | |
| parent | 9ce0f6a5df11f50da67c035b2f4eae3838f72106 (diff) | |
pimd: Remove qpim_inaddr_any
In prep for switching over to having PIM understand VRF
remove the qpim_inaddr_any global variable and just
use INADDR_ANY directly.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | pimd/pim_iface.c | 2 | ||||
| -rw-r--r-- | pimd/pim_ifchannel.c | 8 | ||||
| -rw-r--r-- | pimd/pimd.c | 4 | ||||
| -rw-r--r-- | pimd/pimd.h | 1 |
4 files changed, 7 insertions, 8 deletions
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index f36a9b3cbb..afaa951724 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -297,7 +297,7 @@ static int detect_primary_address_change(struct interface *ifp, int changed; if (force_prim_as_any) - new_prim_addr = qpim_inaddr_any; + new_prim_addr.s_addr = INADDR_ANY; else new_prim_addr = pim_find_primary_addr(ifp); diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 9b79c032c8..6dc607e1bc 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -387,12 +387,14 @@ const char *pim_ifchannel_ifassert_name(enum pim_ifassert_state ifassert_state) */ void reset_ifassert_state(struct pim_ifchannel *ch) { + struct in_addr any = { .s_addr = INADDR_ANY }; + THREAD_OFF(ch->t_ifassert_timer); pim_ifassert_winner_set(ch, - PIM_IFASSERT_NOINFO, - qpim_inaddr_any, - qpim_infinite_assert_metric); + PIM_IFASSERT_NOINFO, + any, + qpim_infinite_assert_metric); } struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, diff --git a/pimd/pimd.c b/pimd/pimd.c index 51a0833cd5..c31d2a99a1 100644 --- a/pimd/pimd.c +++ b/pimd/pimd.c @@ -61,7 +61,6 @@ 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 in_addr qpim_inaddr_any; struct list *qpim_ssmpingd_list = NULL; struct in_addr qpim_ssmpingd_group_addr; int64_t qpim_scan_oil_events = 0; @@ -293,7 +292,6 @@ void pim_init() pim_mroute_socket_enable(); - qpim_inaddr_any.s_addr = PIM_NET_INADDR_ANY; /* RFC 4601: 4.6.3. Assert Metrics @@ -306,7 +304,7 @@ void pim_init() qpim_infinite_assert_metric.rpt_bit_flag = 1; qpim_infinite_assert_metric.metric_preference = PIM_ASSERT_METRIC_PREFERENCE_MAX; qpim_infinite_assert_metric.route_metric = PIM_ASSERT_ROUTE_METRIC_MAX; - qpim_infinite_assert_metric.ip_address = qpim_inaddr_any; + qpim_infinite_assert_metric.ip_address.s_addr = INADDR_ANY; pim_if_init(); pim_cmd_init(); diff --git a/pimd/pimd.h b/pimd/pimd.h index ec98c5bfd1..18520f57e1 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -140,7 +140,6 @@ struct thread *qpim_rpf_cache_refresher; int64_t qpim_rpf_cache_refresh_requests; int64_t qpim_rpf_cache_refresh_events; int64_t qpim_rpf_cache_refresh_last; -struct in_addr qpim_inaddr_any; struct list *qpim_ssmpingd_list; /* list of struct ssmpingd_sock */ struct in_addr qpim_ssmpingd_group_addr; int64_t qpim_scan_oil_events; |