mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 00:35:33 +00:00
Code Issues Releases Wiki Activity

packets: Add more utility functions for IPv4 and IPv6 addresses.

Browse Source 
We had these functions scattered around the source tree anyway.  packets.h
is a good place to centralize them.

I do plan to introduce some additional callers.
This commit is contained in:
Ben Pfaff
2011-08-17 10:55:15 -07:00
parent e7ed3a3a5f
commit aad29cd1a1
7 changed files with 119 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/packets.c
View File

@@ -99,6 +99,30 @@ eth_push_vlan(struct ofpbuf *packet, ovs_be16 tci)
packet->l2 = packet->data;
}
/* Given the IP netmask 'netmask', returns the number of bits of the IP address
* that it specifies, that is, the number of 1-bits in 'netmask'. 'netmask'
* must be a CIDR netmask (see ip_is_cidr()). */
int
ip_count_cidr_bits(ovs_be32 netmask)
{
assert(ip_is_cidr(netmask));
return 32 - ctz(ntohl(netmask));
}
void
ip_format_masked(ovs_be32 ip, ovs_be32 mask, struct ds *s)
{
ds_put_format(s, IP_FMT, IP_ARGS(&ip));
if (mask != htonl(UINT32_MAX)) {
if (ip_is_cidr(mask)) {
ds_put_format(s, "/%d", ip_count_cidr_bits(mask));
} else {
ds_put_format(s, "/"IP_FMT, IP_ARGS(&mask));
}
}
}
/* Stores the string representation of the IPv6 address 'addr' into the
* character array 'addr_str', which must be at least INET6_ADDRSTRLEN
* bytes long. */
@@ -111,10 +135,29 @@ format_ipv6_addr(char *addr_str, const struct in6_addr *addr)
void
print_ipv6_addr(struct ds *string, const struct in6_addr *addr)
{
char addr_str[INET6_ADDRSTRLEN];
char *dst;
format_ipv6_addr(addr_str, addr);
ds_put_format(string, "%s", addr_str);
ds_reserve(string, string->length + INET6_ADDRSTRLEN);
dst = string->string + string->length;
format_ipv6_addr(dst, addr);
string->length += strlen(dst);
}
void
print_ipv6_masked(struct ds *s, const struct in6_addr *addr,
const struct in6_addr *mask)
{
print_ipv6_addr(s, addr);
if (mask && !ipv6_mask_is_exact(mask)) {
if (ipv6_is_cidr(mask)) {
int cidr_bits = ipv6_count_cidr_bits(mask);
ds_put_format(s, "/%d", cidr_bits);
} else {
ds_put_char(s, '/');
print_ipv6_addr(s, mask);
}
}
}
struct in6_addr ipv6_addr_bitand(const struct in6_addr *a,
@@ -158,9 +201,9 @@ ipv6_create_mask(int mask)
return netmask;
}
/* Given the IPv6 netmask 'netmask', returns the number of bits of the
* IPv6 address that it wildcards. 'netmask' must be a CIDR netmask (see
* ipv6_is_cidr()). */
/* Given the IPv6 netmask 'netmask', returns the number of bits of the IPv6
* address that it specifies, that is, the number of 1-bits in 'netmask'.
* 'netmask' must be a CIDR netmask (see ipv6_is_cidr()). */
int
ipv6_count_cidr_bits(const struct in6_addr *netmask)
{