diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-07-23 06:06:55 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-22 02:26:03 +0100 |
| commit | ad410c6c7ba5121c87c95da28f6c68e960b4374d (patch) | |
| tree | 2cf15adff57b8b490304ad991c36649ab8a1a433 | |
| parent | pimd: More conversion of struct prefix *sg (diff) | |
| download | frr-ad410c6c7ba5121c87c95da28f6c68e960b4374d.tar.xz frr-ad410c6c7ba5121c87c95da28f6c68e960b4374d.zip | |
pimd: SwitchToSptDesired now uses struct prefix *sg.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | pimd/pim_register.c | 4 | ||||
| -rw-r--r-- | pimd/pim_upstream.c | 2 | ||||
| -rw-r--r-- | pimd/pim_upstream.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 608b1bf30..c1a78b722 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -331,14 +331,14 @@ pim_register_recv (struct interface *ifp, } if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) || - ((SwitchToSptDesired(source, group)) && + ((SwitchToSptDesired(&sg)) && (inherited_olist(source, group) == NULL))) { pim_register_stop_send (ifp, source, group, src_addr); sentRegisterStop = 1; } if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) || - (SwitchToSptDesired(source, group))) { + (SwitchToSptDesired(&sg))) { if (sentRegisterStop) { pim_upstream_keep_alive_timer_start (upstream, PIM_RP_KEEPALIVE_PERIOD); } else { diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 85f45566a..4931c6c66 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -749,7 +749,7 @@ pim_upstream_keep_alive_timer_start (struct pim_upstream *up, * received for the source and group. */ int -pim_upstream_switch_to_spt_desired (struct in_addr source, struct in_addr group) +pim_upstream_switch_to_spt_desired (struct prefix *sg) { return 0; } diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index 7783cc4bc..3bfddd7d0 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -146,8 +146,8 @@ void pim_upstream_update_my_assert_metric(struct pim_upstream *up); void pim_upstream_keep_alive_timer_start (struct pim_upstream *up, uint32_t time); -int pim_upstream_switch_to_spt_desired (struct in_addr source, struct in_addr group); -#define SwitchToSptDesired(S,G) pim_upstream_switch_to_spt_desired ((S), (G)) +int pim_upstream_switch_to_spt_desired (struct prefix *sg); +#define SwitchToSptDesired(sg) pim_upstream_switch_to_spt_desired (sg) void pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_register); |