External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-30 17:45:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: Fix mask for 172.16.0.0 private address range

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=905708

Only the first 12 bits should be set in the mask for this range. All
addresses between 172.16.0.0 and 172.31.255.255 are private.
(cherry picked from commit 6405713f2a)
This commit is contained in:
Jiri Denemark 2013-01-30 12:01:01 +01:00 committed by Laine Stump
parent 50a1a57e4c
commit 96a49bd8bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/virsocketaddr.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2009-2012 Red Hat, Inc. * Copyright (C) 2009-2013 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -199,7 +199,7 @@ virSocketAddrEqual(const virSocketAddrPtr s1, const virSocketAddrPtr s2)
* *
* Return true if this address is in its family's defined * Return true if this address is in its family's defined
* "private/local" address space. For IPv4, private addresses are in * "private/local" address space. For IPv4, private addresses are in
* the range of 192.168.0.0/16, 172.16.0.0/16, or 10.0.0.0/8. For * the range of 192.168.0.0/16, 172.16.0.0/12, or 10.0.0.0/8. For
* IPv6, local addresses are in the range of FC00::/7 or FEC0::/10 * IPv6, local addresses are in the range of FC00::/7 or FEC0::/10
* (that last one is deprecated, but still in use). * (that last one is deprecated, but still in use).
* *
@ -215,7 +215,7 @@ virSocketAddrIsPrivate(const virSocketAddrPtr addr)
val = ntohl(addr->data.inet4.sin_addr.s_addr); val = ntohl(addr->data.inet4.sin_addr.s_addr);
return ((val & 0xFFFF0000) == ((192L << 24) + (168 << 16)) || return ((val & 0xFFFF0000) == ((192L << 24) + (168 << 16)) ||
(val & 0xFFFF0000) == ((172L << 24) + (16 << 16)) || (val & 0xFFF00000) == ((172L << 24) + (16 << 16)) ||
(val & 0xFF000000) == ((10L << 24))); (val & 0xFF000000) == ((10L << 24)));
case AF_INET6: case AF_INET6: