proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-27 05:30:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: The mask and sin_mask are a bit redundant for kernel_rtm

Browse Source 
The test we were using to ensure that a mask was sent in
is a bit redundant, let's just always send it in.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-17 18:31:09 -05:00
parent 86afd5292f
commit 18d10d8854
1 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zebra/rt_socket.c
View File

@ -118,7 +118,6 @@ static int kernel_rtm(int cmd, const struct prefix *p,
const struct nexthop_group *ng, uint32_t metric)
{
union sockunion *mask = NULL;
union sockunion sin_dest, sin_mask, sin_gate;
#ifdef __OpenBSD__
struct sockaddr_mpls smpls;
@ -237,32 +236,20 @@ static int kernel_rtm(int cmd, const struct prefix *p,
switch (p->family) {
case AF_INET:
if (gate && p->prefixlen == 32)
mask = NULL;
else {
masklen2ip(p->prefixlen,
&sin_mask.sin.sin_addr);
sin_mask.sin.sin_family = AF_INET;
masklen2ip(p->prefixlen, &sin_mask.sin.sin_addr);
sin_mask.sin.sin_family = AF_INET;
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
sin_mask.sin.sin_len = sin_masklen(
sin_mask.sin.sin_addr);
sin_mask.sin.sin_len = sin_masklen(
sin_mask.sin.sin_addr);
#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
mask = &sin_mask;
}
break;
case AF_INET6:
if (gate && p->prefixlen == 128)
mask = NULL;
else {
masklen2ip6(p->prefixlen,
&sin_mask.sin6.sin6_addr);
sin_mask.sin6.sin6_family = AF_INET6;
masklen2ip6(p->prefixlen, &sin_mask.sin6.sin6_addr);
sin_mask.sin6.sin6_family = AF_INET6;
#ifdef SIN6_LEN
sin_mask.sin6.sin6_len = sin6_masklen(
sin_mask.sin6.sin6_addr);
sin_mask.sin6.sin6_len = sin6_masklen(
sin_mask.sin6.sin6_addr);
#endif /* SIN6_LEN */
mask = &sin_mask;
}
break;
}
@ -272,7 +259,7 @@ static int kernel_rtm(int cmd, const struct prefix *p,
continue;
smplsp = (union sockunion *)&smpls;
#endif
error = rtm_write(cmd, &sin_dest, mask,
error = rtm_write(cmd, &sin_dest, &sin_mask,
gate ? &sin_gate : NULL, smplsp,
ifindex, bh_type, metric);