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

bgpd, lib: few more prefixlen updated

Browse Source 
* Cast when assigning should be to uint16_t
* Restored comment documenting strange behavior
* Further increased PREFIX_STRLEN to 80 chars

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-10-25 20:24:25 +00:00
parent f93eee447e
commit 61be6e94ab
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_attr_evpn.c
View File

@ -267,13 +267,13 @@ extern int bgp_build_evpn_prefix(int evpn_type, uint32_t eth_tag,
memcpy(&p_evpn_p->prefix_addr.ip.ipaddr_v4, memcpy(&p_evpn_p->prefix_addr.ip.ipaddr_v4,
&src->u.prefix4, &src->u.prefix4,
sizeof(struct in_addr)); sizeof(struct in_addr));
dst->prefixlen = (uint8_t)PREFIX_LEN_ROUTE_TYPE_5_IPV4; dst->prefixlen = (uint16_t)PREFIX_LEN_ROUTE_TYPE_5_IPV4;
} else { } else {
SET_IPADDR_V6(&p_evpn_p->prefix_addr.ip); SET_IPADDR_V6(&p_evpn_p->prefix_addr.ip);
memcpy(&p_evpn_p->prefix_addr.ip.ipaddr_v6, memcpy(&p_evpn_p->prefix_addr.ip.ipaddr_v6,
&src->u.prefix6, &src->u.prefix6,
sizeof(struct in6_addr)); sizeof(struct in6_addr));
dst->prefixlen = (uint8_t)PREFIX_LEN_ROUTE_TYPE_5_IPV6; dst->prefixlen = (uint16_t)PREFIX_LEN_ROUTE_TYPE_5_IPV6;
} }
} else } else
return -1; return -1;

4
lib/prefix.c
View File

@ -971,6 +971,10 @@ uint8_t ip_masklen(struct in_addr netmask)
{ {
uint32_t tmp = ~ntohl(netmask.s_addr); uint32_t tmp = ~ntohl(netmask.s_addr);
/*
* clz: count leading zeroes. sadly, the behaviour of this builtin is
* undefined for a 0 argument, even though most CPUs give 32
*/
return tmp ? __builtin_clz(tmp) : 32; return tmp ? __builtin_clz(tmp) : 32;
} }

5
lib/prefix.h
View File

@ -304,9 +304,8 @@ union prefixconstptr {
#define INET6_BUFSIZ 53 #define INET6_BUFSIZ 53
#endif /* INET6_BUFSIZ */ #endif /* INET6_BUFSIZ */
/* Maximum prefix string length (IPv6) */ /* Maximum string length of the result of prefix2str */
/* dead:beef:dead:beef:dead:beef:dead:beef:255.255.255.255 + / + 65535 + \0 */ #define PREFIX_STRLEN 80
#define PREFIX_STRLEN 53
/* Max bit/byte length of IPv4 address. */ /* Max bit/byte length of IPv4 address. */
#define IPV4_MAX_BYTELEN 4 #define IPV4_MAX_BYTELEN 4