diff options
| author | anuradhak <anuradhak@cumulusnetworks.com> | 2017-03-09 09:52:59 -0800 |
|---|---|---|
| committer | anuradhak <anuradhak@cumulusnetworks.com> | 2017-03-10 10:48:41 -0800 |
| commit | 0c2ebf00a628772c09ec97f970ae34b8076e9976 (patch) | |
| tree | b27d05fed05a6a17d49323e0915b52438f3af9c4 /pimd/pim_mroute.c | |
| parent | e0e127b00953ba68da8f51c927ca251cea4a3773 (diff) | |
pimd: add new/distinct enumeration for pim register state
With the separation of register-state and upstream-join-state we no
longer need an enumeration that covers both states. This commit includes
the following -
1. Defined new enumeration for reg state (this 1:1 with RFC4601).
2. Dropped JOIN_PENDING enum value from upstream join state. RFC4601
only define two values NOT_JOINED and JOINED for this state.
Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-14700
Testing Done: Verified register setup manually and ran pim-smoke
Diffstat (limited to 'pimd/pim_mroute.c')
| -rw-r--r-- | pimd/pim_mroute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 3f483a25ad..9401475813 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -189,7 +189,7 @@ pim_mroute_msg_nocache (int fd, struct interface *ifp, const struct igmpmsg *msg up->channel_oil->cc.pktcnt++; PIM_UPSTREAM_FLAG_SET_FHR(up->flags); pim_channel_add_oif (up->channel_oil, pim_regiface, PIM_OIF_FLAG_PROTO_PIM); - up->reg_state = PIM_UPSTREAM_JOINED; + up->reg_state = PIM_REG_JOIN; return 0; } @@ -453,7 +453,7 @@ pim_mroute_msg_wrvifwhole (int fd, struct interface *ifp, const char *buf) up->channel_oil = oil; up->channel_oil->cc.pktcnt++; pim_channel_add_oif (up->channel_oil, pim_regiface, PIM_OIF_FLAG_PROTO_PIM); - up->reg_state = PIM_UPSTREAM_JOINED; + up->reg_state = PIM_REG_JOIN; pim_upstream_inherited_olist (up); // Send the packet to the RP |