diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-07-01 17:39:04 +0300 | 
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-07-01 17:41:09 +0300 | 
| commit | f4d81e5507e208b65d8d1fb9c2f2812eedcb7405 (patch) | |
| tree | 30a8796ded6a3d2b13fcd049d43a28e496d18763 /bgpd/bgp_network.c | |
| parent | 3036004116c8d9e9f9504e1b974236d3061f189f (diff) | |
*: Replace IPV6_MAX_PREFIXLEN to IPV6_MAX_BITLEN
Just drop IPV6_MAX_PREFIXLEN at all, no need keeping both.
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'bgpd/bgp_network.c')
| -rw-r--r-- | bgpd/bgp_network.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index a51816116e..1ddf1f4cf7 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -102,8 +102,7 @@ static int bgp_md5_set_socket(int socket, union sockunion *su,  	/* For addresses, use the non-extended signature functionality */  	if ((su2.sa.sa_family == AF_INET && prefixlen == IPV4_MAX_PREFIXLEN) -	    || (su2.sa.sa_family == AF_INET6 -		&& prefixlen == IPV6_MAX_PREFIXLEN)) +	    || (su2.sa.sa_family == AF_INET6 && prefixlen == IPV6_MAX_BITLEN))  		ret = sockopt_tcp_signature(socket, &su2, password);  	else  		ret = sockopt_tcp_signature_ext(socket, &su2, prefixlen, @@ -164,8 +163,8 @@ static int bgp_md5_set_password(struct peer *peer, const char *password)  			    peer->su.sa.sa_family) {  				uint16_t prefixlen =  					peer->su.sa.sa_family == AF_INET -					? IPV4_MAX_PREFIXLEN -					: IPV6_MAX_PREFIXLEN; +						? IPV4_MAX_PREFIXLEN +						: IPV6_MAX_BITLEN;  				/*  				 * if we have stored a BGP vrf instance in the @@ -746,7 +745,7 @@ int bgp_connect(struct peer *peer)  	if (peer->password) {  		uint16_t prefixlen = peer->su.sa.sa_family == AF_INET  					     ? IPV4_MAX_PREFIXLEN -					     : IPV6_MAX_PREFIXLEN; +					     : IPV6_MAX_BITLEN;  		bgp_md5_set_connect(peer->fd, &peer->su, prefixlen,  				    peer->password);  | 
