mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: common: mask conversion

Browse Source 
Add function which converts network mask from bit length form
to struct in*_addr form.
This commit is contained in:
Thierry Fournier 2016-02-17 17:12:14 +01:00 committed by Willy Tarreau
parent e726b14d23
commit 70473a5f8c
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/common/standard.h
View File

@ -832,6 +832,16 @@ static inline int set_host_port(struct sockaddr_storage *addr, int port)
return 0;
}
/* Convert mask from bit length form to in_addr form.
* This function never fails.
*/
void len2mask4(int len, struct in_addr *addr);
/* Convert mask from bit length form to in6_addr form.
* This function never fails.
*/
void len2mask6(int len, struct in6_addr *addr);
/* Return true if IPv4 address is part of the network */
extern int in_net_ipv4(struct in_addr *addr, struct in_addr *mask, struct in_addr *net);

31
src/standard.c
View File

@ -1002,6 +1002,37 @@ int cidr2dotted(int cidr, struct in_addr *mask) {
return 1;
}
/* Convert mask from bit length form to in_addr form.
* This function never fails.
*/
void len2mask4(int len, struct in_addr *addr)
{
if (len >= 32) {
addr->s_addr = 0xffffffff;
return;
}
if (len <= 0) {
addr->s_addr = 0x00000000;
return;
}
addr->s_addr = 0xffffffff << (32 - len);
addr->s_addr = htonl(addr->s_addr);
}
/* Convert mask from bit length form to in6_addr form.
* This function never fails.
*/
void len2mask6(int len, struct in6_addr *addr)
{
len2mask4(len, (struct in_addr *)&addr->s6_addr[0]); /* msb */
len -= 32;
len2mask4(len, (struct in_addr *)&addr->s6_addr[4]);
len -= 32;
len2mask4(len, (struct in_addr *)&addr->s6_addr[8]);
len -= 32;
len2mask4(len, (struct in_addr *)&addr->s6_addr[12]); /* lsb */
}
/*
* converts <str> to two struct in_addr* which must be pre-allocated.
* The format is "addr[/mask]", where "addr" cannot be empty, and mask