diff options
| author | anuradhak <anuradhak@cumulusnetworks.com> | 2017-03-21 18:12:30 +0100 |
|---|---|---|
| committer | anuradhak <anuradhak@cumulusnetworks.com> | 2017-03-23 17:48:04 +0100 |
| commit | d2772e7b65a9967f7698a86c6e70e79bbdae944d (patch) | |
| tree | a515b67d7019fdfff7651597a999557ba6c4c8d4 /pimd/pim_mroute.c | |
| parent | pimd: Allow SSM groups to co-exist with ASM groups. (diff) | |
| download | frr-d2772e7b65a9967f7698a86c6e70e79bbdae944d.tar.xz frr-d2772e7b65a9967f7698a86c6e70e79bbdae944d.zip | |
pimd: Remove interface type SSM.
Interface type has been replaced with the SSM range config. And SSM
groups can now co-exists with ASM groups. I have left the pim ssm
per-interface cli control hidden. It now enables pim-sm with a warning.
Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-15344
Testing Done: pim-smoke
Diffstat (limited to 'pimd/pim_mroute.c')
| -rw-r--r-- | pimd/pim_mroute.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 56f9f62ef..90e30ea3d 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -128,8 +128,7 @@ pim_mroute_msg_nocache (int fd, struct interface *ifp, const struct igmpmsg *msg */ if ((pim_rpf_addr_is_inaddr_none (rpg)) || (!pim_ifp) || - (!(PIM_I_am_DR(pim_ifp))) || - (pim_ifp->itype == PIM_INTERFACE_SSM)) + (!(PIM_I_am_DR(pim_ifp)))) { if (PIM_DEBUG_MROUTE_DETAIL) zlog_debug ("%s: Interface is not configured correctly to handle incoming packet: Could be !DR, !pim_ifp, !SM, !RP", @@ -214,8 +213,7 @@ pim_mroute_msg_wholepkt (int fd, struct interface *ifp, const char *buf) if ((pim_rpf_addr_is_inaddr_none (rpg)) || (!pim_ifp) || - (!(PIM_I_am_DR(pim_ifp))) || - (pim_ifp->itype == PIM_INTERFACE_SSM)) { + (!(PIM_I_am_DR(pim_ifp)))) { if (PIM_DEBUG_MROUTE) { zlog_debug("%s: Failed Check send packet", __PRETTY_FUNCTION__); } |