diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 09:45:57 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 09:45:57 -0400 |
| commit | ac139b5fb6f0a9f14ced54b9b7dcee9d2e98558e (patch) | |
| tree | 049c46521cea65946eb15b198f5ea0da9c015212 /pimd/pim_igmp.c | |
| parent | 25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b (diff) | |
| parent | 69b174d4ec7d347054761d4ddcddba096c9c4ece (diff) | |
Merge remote-tracking branch 'origin/master' into pim_crash_a_boo
Diffstat (limited to 'pimd/pim_igmp.c')
| -rw-r--r-- | pimd/pim_igmp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 76ec812b3f..c883a2c8bb 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -38,6 +38,7 @@ #include "pim_zebra.h" static void group_timer_off(struct igmp_group *group); +static int pim_igmp_general_query(struct thread *t); /* This socket is used for TXing IGMP packets only, IGMP RX happens * in pim_mroute_msg() @@ -168,8 +169,11 @@ static int pim_igmp_other_querier_expire(struct thread *t) /* We are the current querier, then re-start sending general queries. + RFC 2236 - sec 7 Other Querier + present timer expired (Send General + Query, Set Gen. Query. timer) */ - pim_igmp_general_query_on(igmp); + pim_igmp_general_query(t); return 0; } @@ -490,8 +494,6 @@ int pim_igmp_packet(struct igmp_sock *igmp, char *buf, size_t len) return -1; } -static int pim_igmp_general_query(struct thread *t); - void pim_igmp_general_query_on(struct igmp_sock *igmp) { struct pim_interface *pim_ifp; |