proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 07:37:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Move sin6_masklen to earlier in the file

Browse Source 
I'm going to rearrage the kernel_rtm_ipv4 and v6 functions
so the sin6_masklen needs to be moved a bit earlier.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-12-17 16:28:47 -05:00
parent ca2c70bde0
commit 9ba0e5706c
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
zebra/rt_socket.c
View File

@ -89,6 +89,30 @@ static int kernel_rtm_add_labels(struct mpls_label_stack *nh_label,
} }
#endif #endif
#ifdef SIN6_LEN
/* Calculate sin6_len value for netmask socket value. */
static int sin6_masklen(struct in6_addr mask)
{
struct sockaddr_in6 sin6;
char *p, *lim;
int len;
if (IN6_IS_ADDR_UNSPECIFIED(&mask))
return sizeof(long);
sin6.sin6_addr = mask;
len = sizeof(struct sockaddr_in6);
lim = (char *)&sin6.sin6_addr;
p = lim + sizeof(sin6.sin6_addr);
while (*--p == 0 && p >= lim)
len--;
return len;
}
#endif /* SIN6_LEN */
/* Interface between zebra message and rtm message. */ /* Interface between zebra message and rtm message. */
static int kernel_rtm_ipv4(int cmd, const struct prefix *p, static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
const struct nexthop_group *ng, uint32_t metric) const struct nexthop_group *ng, uint32_t metric)
@ -253,30 +277,6 @@ static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
return 0; /*XXX*/ return 0; /*XXX*/
} }
#ifdef SIN6_LEN
/* Calculate sin6_len value for netmask socket value. */
static int sin6_masklen(struct in6_addr mask)
{
struct sockaddr_in6 sin6;
char *p, *lim;
int len;
if (IN6_IS_ADDR_UNSPECIFIED(&mask))
return sizeof(long);
sin6.sin6_addr = mask;
len = sizeof(struct sockaddr_in6);
lim = (char *)&sin6.sin6_addr;
p = lim + sizeof(sin6.sin6_addr);
while (*--p == 0 && p >= lim)
len--;
return len;
}
#endif /* SIN6_LEN */
/* Interface between zebra message and rtm message. */ /* Interface between zebra message and rtm message. */
static int kernel_rtm_ipv6(int cmd, const struct prefix *p, static int kernel_rtm_ipv6(int cmd, const struct prefix *p,
const struct nexthop_group *ng, uint32_t metric) const struct nexthop_group *ng, uint32_t metric)