mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-06 22:35:46 +00:00
1b0bc4169f
'const fooPtr' is the same as 'foo * const' (the pointer won't change, but it's contents can). But in general, if an interface is trying to be const-correct, it should be using 'const foo *' (the pointer is to data that can't be changed). Fix up offenders in src/util outside of the virnet namespace. Also, make a few virSocketAddr functions const-correct, for easier conversions in future patches. * src/util/virbuffer.h (virBufferError, virBufferUse) (virBufferGetIndent): Use intended type. * src/util/virmacaddr.h (virMacAddrCmp, virMacAddrCmpRaw) (virMacAddrSet, virMcAddrFormat, virMacAddrIsUnicast) (virMacAddrIsMulticast): Likewise. * src/util/virebtables.h (ebtablesAddForwardAllowIn) (ebtablesRemoveForwardAllowIn): Likewise. * src/util/virsocketaddr.h (virSocketAddrSetIPv4Addr): Drop incorrect const. (virMacAddrGetRaw, virSocketAddrFormat, virSocketAddrFormatFull): Make const-correct. (virSocketAddrMask, virSocketAddrMaskByPrefix) (virSocketAddrBroadcast, virSocketAddrBroadcastByPrefix) (virSocketAddrGetNumNetmaskBits, virSocketAddrGetIpPrefix) (virSocketAddrEqual, virSocketAddrIsPrivate) (virSocketAddrIsWildcard): Use intended type. * src/util/virbuffer.c (virBufferError, virBufferUse) (virBufferGetIndent): Fix fallout. * src/util/virmacaddr.c (virMacAddrCmp, virMacAddrCmpRaw) (virMacAddrSet, virMcAddrFormat, virMacAddrIsUnicast) (virMacAddrIsMulticast): Likewise. * src/util/virebtables.c (ebtablesAddForwardAllowIn) (ebtablesRemoveForwardAllowIn): Likewise. * src/util/virsocketaddr.c (virSocketAddrMask, virMacAddrGetRaw) (virSocketAddrMaskByPrefix, virSocketAddrBroadcast) (virSocketAddrBroadcastByPrefix, virSocketAddrGetNumNetmaskBits) (virSocketAddrGetIpPrefix, virSocketAddrEqual) (virSocketAddrIsPrivate, virSocketAddrIsWildcard) (virSocketAddrGetIPv4Addr, virSocketAddrGetIPv6Addr) (virSocketAddrFormat, virSocketAddrFormatFull): Likewise. Signed-off-by: Eric Blake <eblake@redhat.com>
58 lines
2.1 KiB
C
58 lines
2.1 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_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];
|
|
};
|
|
|
|
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);
|
|
int virMacAddrParse(const char* str,
|
|
virMacAddrPtr addr) 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__ */
|