mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-06 22:35:46 +00:00
e62cb4a9b7
Commit7e62c4cd26(first appearing in libvirt-3.9.0 as a resolution to rhbz #1343919) added a "generated" attribute to virMacAddr that was set whenever a mac address was auto-generated by libvirt. This knowledge was used in a single place - when trying to match a NetDef from the Domain to Delete with user-provided XML. Since the XML parser always auto-generates a MAC address for NetDefs when none is provided, it was previously impossible to make a search where the MAC address isn't significant, but the addition of the "generated" attribute made it possible for the search function to ignore auto-generated MACs. This implementation had a problem though - it was adding a field to a "low level" struct - virMacAddr - which is used in other places with the assumption that it contains exactly a 6 byte MAC address and nothing else. In particular, virNWFilterSnoopEthHdr uses virMacAddr as part of the definition of an ethernet packet header, whose layout must of course match an actual ethernet packet. Adding the extra bools into virNWFilterSnoopEthHdr caused the nwfilter driver's "IP discovery via DHCP packet snooping" functionality to mysteriously stop working. In order to fix that behavior, and prevent potential future similar odd behavior, this patch moves the "generated" member out of virMacAddr (so that it is again really is just a MAC address) into virDomainNetDef, and sets it only when virDomainNetGenerateMAC() is called from virDomainNetDefParseXML() (which is the only time we care about it). Resolves: https://bugzilla.redhat.com/1529338 (It should also be applied to any maintenance branch that applies commit7e62c4cd26and friends to resolve https://bugzilla.redhat.com/1343919) Signed-off-by: Laine Stump <laine@laine.org>
69 lines
2.5 KiB
C
69 lines
2.5 KiB
C
/*
|
|
* virmacaddr.h: MAC address handling
|
|
*
|
|
* Copyright (C) 2006-2013 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library. If not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Authors:
|
|
* Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#ifndef __VIR_MACADDR_H__
|
|
# define __VIR_MACADDR_H__
|
|
|
|
# include "internal.h"
|
|
|
|
# define VIR_MAC_BUFLEN 6
|
|
# define VIR_MAC_HEXLEN (VIR_MAC_BUFLEN * 2)
|
|
# define VIR_MAC_PREFIX_BUFLEN 3
|
|
# define VIR_MAC_STRING_BUFLEN (VIR_MAC_BUFLEN * 3)
|
|
|
|
typedef struct _virMacAddr virMacAddr;
|
|
typedef virMacAddr *virMacAddrPtr;
|
|
|
|
struct _virMacAddr {
|
|
unsigned char addr[VIR_MAC_BUFLEN];
|
|
};
|
|
/* This struct is used as a part of a larger struct that is
|
|
* overlaid on an ethernet packet captured with libpcap, so it
|
|
* must not have any extra members added - it must remain exactly
|
|
* 6 bytes in length.
|
|
*/
|
|
verify(sizeof(struct _virMacAddr) == 6);
|
|
|
|
|
|
int virMacAddrCompare(const char *mac1, const char *mac2);
|
|
int virMacAddrCmp(const virMacAddr *mac1, const virMacAddr *mac2);
|
|
int virMacAddrCmpRaw(const virMacAddr *mac1,
|
|
const unsigned char s[VIR_MAC_BUFLEN]);
|
|
void virMacAddrSet(virMacAddrPtr dst, const virMacAddr *src);
|
|
void virMacAddrSetRaw(virMacAddrPtr dst, const unsigned char s[VIR_MAC_BUFLEN]);
|
|
void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]);
|
|
const char *virMacAddrFormat(const virMacAddr *addr,
|
|
char *str);
|
|
void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN],
|
|
virMacAddrPtr addr) ATTRIBUTE_NOINLINE;
|
|
int virMacAddrParse(const char* str,
|
|
virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK;
|
|
int virMacAddrParseHex(const char* str,
|
|
virMacAddrPtr addr)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
|
|
bool virMacAddrIsUnicast(const virMacAddr *addr);
|
|
bool virMacAddrIsMulticast(const virMacAddr *addr);
|
|
bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]);
|
|
|
|
#endif /* __VIR_MACADDR_H__ */
|