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

pimd: Handle pim join/prune recv flow for ipv6

Browse source 
Making the code changes to handle both ipv4 and ipv6 in the same code

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
This commit is contained in:
Mobashshera Rasool 2022-01-17 02:07:39 -08:00
parent ee95029ac4
commit 17280eee1f
2 changed files with 16 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
pimd/pim_join.c
View file

@ -148,8 +148,7 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh,
} }
int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
struct in_addr src_addr, uint8_t *tlv_buf, pim_addr src_addr, uint8_t *tlv_buf, int tlv_buf_size)
int tlv_buf_size)
{ {
pim_addr msg_upstream_addr; pim_addr msg_upstream_addr;
bool wrong_af = false; bool wrong_af = false;
@ -174,10 +173,8 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
addr_offset = pim_parse_addr_ucast(&msg_upstream_addr, buf, addr_offset = pim_parse_addr_ucast(&msg_upstream_addr, buf,
pastend - buf, &wrong_af); pastend - buf, &wrong_af);
if (addr_offset < 1) { if (addr_offset < 1) {
char src_str[INET_ADDRSTRLEN]; zlog_warn("%s: pim_parse_addr_ucast() failure: from %pPA on %s",
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str)); __func__, &src_addr, ifp->name);
zlog_warn("%s: pim_parse_addr_ucast() failure: from %s on %s",
__func__, src_str, ifp->name);
return -1; return -1;
} }
buf += addr_offset; buf += addr_offset;
@ -186,21 +183,17 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
Check upstream address family Check upstream address family
*/ */
if (wrong_af) { if (wrong_af) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
zlog_warn( zlog_warn(
"%s: ignoring join/prune directed to unexpected addr family from %s on %s", "%s: ignoring join/prune directed to unexpected addr family from %pPA on %s",
__func__, src_str, ifp->name); __func__, &src_addr, ifp->name);
return -2; return -2;
} }
remain = pastend - buf; remain = pastend - buf;
if (remain < 4) { if (remain < 4) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
zlog_warn( zlog_warn(
"%s: short join/prune message buffer for group list: size=%d minimum=%d from %s on %s", "%s: short join/prune message buffer for group list: size=%d minimum=%d from %pPA on %s",
__func__, remain, 4, src_str, ifp->name); __func__, remain, 4, &src_addr, ifp->name);
return -4; return -4;
} }
@ -211,14 +204,11 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
++buf; ++buf;
++buf; ++buf;
if (PIM_DEBUG_PIM_J_P) { if (PIM_DEBUG_PIM_J_P)
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str));
zlog_debug( zlog_debug(
"%s: join/prune upstream=%pPAs groups=%d holdtime=%d from %s on %s", "%s: join/prune upstream=%pPAs groups=%d holdtime=%d from %pPA on %s",
__func__, &msg_upstream_addr, msg_num_groups, __func__, &msg_upstream_addr, msg_num_groups,
msg_holdtime, src_str, ifp->name); msg_holdtime, &src_addr, ifp->name);
}
/* Scan groups */ /* Scan groups */
for (group = 0; group < msg_num_groups; ++group) { for (group = 0; group < msg_num_groups; ++group) {
@ -239,12 +229,9 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
remain = pastend - buf; remain = pastend - buf;
if (remain < 4) { if (remain < 4) {
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str,
sizeof(src_str));
zlog_warn( zlog_warn(
"%s: short join/prune buffer for source list: size=%d minimum=%d from %s on %s", "%s: short join/prune buffer for source list: size=%d minimum=%d from %pPA on %s",
__func__, remain, 4, src_str, ifp->name); __func__, remain, 4, &src_addr, ifp->name);
return -6; return -6;
} }
@ -253,16 +240,12 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
msg_num_pruned_sources = ntohs(*(const uint16_t *)buf); msg_num_pruned_sources = ntohs(*(const uint16_t *)buf);
buf += 2; buf += 2;
if (PIM_DEBUG_PIM_J_P) { if (PIM_DEBUG_PIM_J_P)
char src_str[INET_ADDRSTRLEN];
pim_inet4_dump("<src?>", src_addr, src_str,
sizeof(src_str));
zlog_debug( zlog_debug(
"%s: join/prune upstream=%pPAs group=%pPA/32 join_src=%d prune_src=%d from %s on %s", "%s: join/prune upstream=%pPAs group=%pPA/32 join_src=%d prune_src=%d from %pPA on %s",
__func__, &msg_upstream_addr, &sg.grp, __func__, &msg_upstream_addr, &sg.grp,
msg_num_joined_sources, msg_num_pruned_sources, msg_num_joined_sources, msg_num_pruned_sources,
src_str, ifp->name); &src_addr, ifp->name);
}
/* boundary check */ /* boundary check */
filtered = pim_is_group_filtered(pim_ifp, &sg.grp); filtered = pim_is_group_filtered(pim_ifp, &sg.grp);

3
pimd/pim_join.h
View file

@ -27,8 +27,7 @@
#include "pim_neighbor.h" #include "pim_neighbor.h"
int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
struct in_addr src_addr, uint8_t *tlv_buf, pim_addr src_addr, uint8_t *tlv_buf, int tlv_buf_size);
int tlv_buf_size);
int pim_joinprune_send(struct pim_rpf *nexthop, struct list *groups); int pim_joinprune_send(struct pim_rpf *nexthop, struct list *groups);