diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-17 18:31:09 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-12-19 08:58:33 -0500 |
| commit | 18d10d885461eaf44fba87ed57a347b565e94f55 (patch) | |
| tree | 5aa9ede17971aa3abadea65afdf3bcc338f04167 /zebra/rt_socket.c | |
| parent | 86afd5292f1769c6c1c1db7a1e65f09fed27b87d (diff) | |
zebra: The mask and sin_mask are a bit redundant for kernel_rtm
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>
Diffstat (limited to 'zebra/rt_socket.c')
| -rw-r--r-- | zebra/rt_socket.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c index 0336d79ee4..539370a498 100644 --- a/zebra/rt_socket.c +++ b/zebra/rt_socket.c @@ -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); |