On 12/22/2010 11:58 AM, Laine Stump wrote: > virSocketPrefixToNetmask: Given a 'prefix', which is the number of 1 > bits in a netmask, fill in a virSocketAddr object with a netmask as an > IP address (IPv6 or IPv4). > > virSocketAddrMask: Mask off the host bits in one virSocketAddr > according to the netmask in another virSocketAddr. > > virSocketAddrMaskByPrefix, Mask off the host bits in a virSocketAddr > according to a prefix (number of 1 bits in netmask). > > VIR_SOCKET_FAMILY: return the family of a virSocketAddr
ACK after you fix one bug:
> + } else if (family == AF_INET6) {
> + int ii = 0;
> +
> + if (prefix > 128)
> + goto error;
> +
> + while (prefix >= 8) {
> + /* do as much as possible an entire byte at a time */
> + netmask->data.inet6.sin6_addr.s6_addr[ii++] = 0xff;
> + prefix -= 8;
> + }
> + if (prefix > 0) {
> + /* final partial byte */
> + netmask->data.inet6.sin6_addr.s6_addr[ii++]
> + = ~((1 << (8 - prefix)) -1);
> + }
> + ii++;
Delete this line. You already incremented it if prefix was nonzero in
the lines above, and don't want to increment it if prefix is a multiple
of 8, so that you don't skip a byte.
--
Eric Blake [email protected] +1-801-349-2682
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/libvir-list
