matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: fix IGMP receive handling

Browse source 
IGMP packets received from a source that does not match the subnet
of any configured addresses on the receive interface should be
ignored.
Also, find and use the correct IGMP socket object for the received
IGMP packet.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
Nathan Bahr 2020-08-19 14:26:41 -05:00 committed by Jafar Al-Gharaibeh
parent cd8ce25a70
commit efe6f18590
3 changed files with 28 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pimd/pim_iface.c
View file

@ -1504,14 +1504,14 @@ void pim_if_create_pimreg(struct pim_instance *pim)
} }
} }
int pim_if_connected_to_source(struct interface *ifp, struct in_addr src) struct prefix *pim_if_connected_to_source(struct interface *ifp, struct in_addr src)
{ {
struct listnode *cnode; struct listnode *cnode;
struct connected *c; struct connected *c;
struct prefix p; struct prefix p;
if (!ifp) if (!ifp)
return 0; return NULL;
p.family = AF_INET; p.family = AF_INET;
p.u.prefix4 = src; p.u.prefix4 = src;
@ -1520,11 +1520,11 @@ int pim_if_connected_to_source(struct interface *ifp, struct in_addr src)
for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) { for (ALL_LIST_ELEMENTS_RO(ifp->connected, cnode, c)) {
if ((c->address->family == AF_INET) if ((c->address->family == AF_INET)
&& prefix_match(CONNECTED_PREFIX(c), &p)) { && prefix_match(CONNECTED_PREFIX(c), &p)) {
return 1; return CONNECTED_PREFIX(c);
} }
} }
return 0; return NULL;
} }
bool pim_if_is_vrf_device(struct interface *ifp) bool pim_if_is_vrf_device(struct interface *ifp)

2
pimd/pim_iface.h
View file

@ -223,7 +223,7 @@ void pim_if_update_assert_tracking_desired(struct interface *ifp);
void pim_if_create_pimreg(struct pim_instance *pim); void pim_if_create_pimreg(struct pim_instance *pim);
int pim_if_connected_to_source(struct interface *ifp, struct in_addr src); struct prefix *pim_if_connected_to_source(struct interface *ifp, struct in_addr src);
int pim_update_source_set(struct interface *ifp, struct in_addr source); int pim_update_source_set(struct interface *ifp, struct in_addr source);
bool pim_if_is_vrf_device(struct interface *ifp); bool pim_if_is_vrf_device(struct interface *ifp);

50
pimd/pim_mroute.c
View file

@ -592,12 +592,9 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
struct pim_interface *pim_ifp; struct pim_interface *pim_ifp;
const struct ip *ip_hdr; const struct ip *ip_hdr;
const struct igmpmsg *msg; const struct igmpmsg *msg;
char ip_src_str[INET_ADDRSTRLEN] = "";
char ip_dst_str[INET_ADDRSTRLEN] = "";
char src_str[INET_ADDRSTRLEN] = "<src?>";
char grp_str[INET_ADDRSTRLEN] = "<grp?>";
struct in_addr ifaddr; struct in_addr ifaddr;
struct igmp_sock *igmp; struct igmp_sock *igmp;
const struct prefix *connected_src;
if (buf_size < (int)sizeof(struct ip)) if (buf_size < (int)sizeof(struct ip))
return 0; return 0;
@ -617,34 +614,37 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
if (!ifp || !ifp->info) if (!ifp || !ifp->info)
return 0; return 0;
connected_src = pim_if_connected_to_source(ifp, ip_hdr->ip_src);
if (!connected_src) {
if (PIM_DEBUG_IGMP_PACKETS) {
zlog_debug("Recv IGMP packet on interface: %s from a non-connected source: %pI4",
ifp->name, &ip_hdr->ip_src);
}
return 0;
}
pim_ifp = ifp->info; pim_ifp = ifp->info;
ifaddr = pim_find_primary_addr(ifp); ifaddr = connected_src->u.prefix4;
igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->igmp_socket_list, igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->igmp_socket_list, ifaddr);
ifaddr);
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
pim_inet4_dump("<src?>", ip_hdr->ip_src, ip_src_str,
sizeof(ip_src_str));
pim_inet4_dump("<dst?>", ip_hdr->ip_dst, ip_dst_str,
sizeof(ip_dst_str));
zlog_debug( zlog_debug(
"%s(%s): igmp kernel upcall on %s(%p) for %s -> %s", "%s(%s): igmp kernel upcall on %s(%p) for %pI4 -> %pI4",
__func__, pim->vrf->name, ifp->name, igmp, __func__, pim->vrf->name, ifp->name, igmp,
ip_src_str, ip_dst_str); &ip_hdr->ip_src, &ip_hdr->ip_dst);
} }
if (igmp) if (igmp)
pim_igmp_packet(igmp, (char *)buf, buf_size); pim_igmp_packet(igmp, (char *)buf, buf_size);
else if (PIM_DEBUG_IGMP_PACKETS) {
zlog_debug("No IGMP socket on interface: %s with connected source: %pFX",
ifp->name, connected_src);
}
} else if (ip_hdr->ip_p) { } else if (ip_hdr->ip_p) {
if (PIM_DEBUG_MROUTE_DETAIL) { if (PIM_DEBUG_MROUTE_DETAIL) {
pim_inet4_dump("<src?>", ip_hdr->ip_src, src_str,
sizeof(src_str));
pim_inet4_dump("<grp?>", ip_hdr->ip_dst, grp_str,
sizeof(grp_str));
zlog_debug( zlog_debug(
"%s: no kernel upcall proto=%d src: %s dst: %s msg_size=%d", "%s: no kernel upcall proto=%d src: %pI4 dst: %pI4 msg_size=%d",
__func__, ip_hdr->ip_p, src_str, grp_str, __func__, ip_hdr->ip_p, &ip_hdr->ip_src, &ip_hdr->ip_dst,
buf_size); buf_size);
} }
@ -656,15 +656,11 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
if (!ifp) if (!ifp)
return 0; return 0;
if (PIM_DEBUG_MROUTE) { if (PIM_DEBUG_MROUTE) {
pim_inet4_dump("<src?>", msg->im_src, src_str,
sizeof(src_str));
pim_inet4_dump("<grp?>", msg->im_dst, grp_str,
sizeof(grp_str));
zlog_debug( zlog_debug(
"%s: pim kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%s,%s) on %s vifi=%d size=%d", "%s: pim kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%pI4,%pI4) on %s vifi=%d size=%d",
__func__, igmpmsgtype2str[msg->im_msgtype], __func__, igmpmsgtype2str[msg->im_msgtype],
msg->im_msgtype, ip_hdr->ip_p, msg->im_msgtype, ip_hdr->ip_p,
pim->mroute_socket, src_str, grp_str, ifp->name, pim->mroute_socket, &msg->im_src, &msg->im_dst, ifp->name,
msg->im_vif, buf_size); msg->im_vif, buf_size);
} }