From: Donald Sharp Date: Mon, 12 Sep 2016 16:50:30 +0000 (+0000) Subject: pimd: Allow flags to know if this is a FHR or not X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~230 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=69ff3706d4be66227db1ea3f506b1df529219ab3;p=mirror%2Ffrr.git pimd: Allow flags to know if this is a FHR or not Start the switch of storing if the upstream (S,G) is located on the FHR or not. Signed-off-by: Donald Sharp --- diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index 35cd8dc014..26a0cd0a7c 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -29,15 +29,19 @@ #define PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED (1 << 0) #define PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED (2 << 0) +#define PIM_UPSTREAM_FLAG_MASK_FHR (3 << 0) #define PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED(flags) ((flags) & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED) #define PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED_UPDATED(flags) ((flags) & PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED) +#define PIM_UPSTREAM_FLAG_TEST_FHR(flags) ((flags) & PIM_UPSTREAM_FLAG_MASK_FHR) #define PIM_UPSTREAM_FLAG_SET_DR_JOIN_DESIRED(flags) ((flags) |= PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED) #define PIM_UPSTREAM_FLAG_SET_DR_JOIN_DESIRED_UPDATED(flags) ((flags) |= PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED) +#define PIM_UPSTREAM_FLAG_SET_FHR(flags) ((flags) |= PIM_UPSTREAM_FLAG_MASK_FHR) #define PIM_UPSTREAM_FLAG_UNSET_DR_JOIN_DESIRED(flags) ((flags) &= ~PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED) #define PIM_UPSTREAM_FLAG_UNSET_DR_JOIN_DESIRED_UPDATED(flags) ((flags) &= ~PIM_UPSTREAM_FLAG_MASK_DR_JOIN_DESIRED_UPDATED) +#define PIM_UPSTREAM_FLAG_UNSET_FHR(flags) ((flags) &= ~PIM_UPSTREAM_FLAG_MASK_FHR) enum pim_upstream_state { PIM_UPSTREAM_NOTJOINED,