diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 09:18:14 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-06-13 09:18:14 +0200 |
| commit | 97bd5c48de49f1a25c6fb979f0ca151412fbd61b (patch) | |
| tree | 924b30812e7ae8d9d2f7c897b4ebbbf19802eff8 /pimd/pimd.c | |
| parent | cea34723daeb767a5b92fa5800ebed81e3f690b6 (diff) | |
| parent | ad2e2470f63e3fac228b6cc532dfe36a0794a846 (diff) | |
Merge remote-tracking branch 'frr/master' into pull-624
Diffstat (limited to 'pimd/pimd.c')
| -rw-r--r-- | pimd/pimd.c | 4 |
1 files changed, 1 insertions, 3 deletions
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(); |