mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-25 15:15:25 +00:00
407a281a8e
This reverts commit e4b980c853.
When a binary links against a .a archive (as opposed to a shared library),
any symbols which are marked as 'weak' get silently dropped. As a result
when the binary later runs, those 'weak' functions have an address of
0x0 and thus crash when run.
This happened with virtlogd and virtlockd because they don't link to
libvirt.so, but instead just libvirt_util.a and libvirt_rpc.a. The
virRandomBits symbols was weak and so left out of the virtlogd &
virtlockd binaries, despite being required by virHashTable functions.
Various other binaries like libvirt_lxc, libvirt_iohelper, etc also
link directly to .a files instead of libvirt.so, so are potentially
at risk of dropping symbols leading to a later runtime crash.
This is normal linker behaviour because a weak symbol is not treated
as undefined, so nothing forces it to be pulled in from the .a You
have to force the linker to pull in weak symbols using -u$SYMNAME
which is not a practical approach.
This risk is silent bad linkage that affects runtime behaviour is
not acceptable for a fix that was merely trying to fix the test
suite. So stop using __weak__ again.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
101 lines
4.0 KiB
C
101 lines
4.0 KiB
C
/*
|
|
* Copyright (C) 2007-2016 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:
|
|
* Mark McLoughlin <markmc@redhat.com>
|
|
* Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#ifndef __VIR_NETDEVIP_H__
|
|
# define __VIR_NETDEVIP_H__
|
|
|
|
# include "virsocketaddr.h"
|
|
|
|
typedef struct _virNetDevIPAddr virNetDevIPAddr;
|
|
typedef virNetDevIPAddr *virNetDevIPAddrPtr;
|
|
struct _virNetDevIPAddr {
|
|
virSocketAddr address; /* ipv4 or ipv6 address */
|
|
virSocketAddr peer; /* ipv4 or ipv6 address of peer */
|
|
unsigned int prefix; /* number of 1 bits in the netmask */
|
|
};
|
|
|
|
typedef struct _virNetDevIPRoute virNetDevIPRoute;
|
|
typedef virNetDevIPRoute *virNetDevIPRoutePtr;
|
|
struct _virNetDevIPRoute {
|
|
char *family; /* ipv4 or ipv6 - default is ipv4 */
|
|
virSocketAddr address; /* Routed Network IP address */
|
|
|
|
/* One or the other of the following two will be used for a given
|
|
* Network address, but never both. The parser guarantees this.
|
|
* The virSocketAddrGetIPPrefix() can be used to get a
|
|
* valid prefix.
|
|
*/
|
|
virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */
|
|
unsigned int prefix; /* ipv6 - only prefix allowed */
|
|
bool has_prefix; /* prefix= was specified */
|
|
unsigned int metric; /* value for metric (defaults to 1) */
|
|
bool has_metric; /* metric= was specified */
|
|
virSocketAddr gateway; /* gateway IP address for ip-route */
|
|
};
|
|
|
|
/* A full set of all IP config info for a network device */
|
|
typedef struct _virNetDevIPInfo virNetDevIPInfo;
|
|
typedef virNetDevIPInfo *virNetDevIPInfoPtr;
|
|
struct _virNetDevIPInfo {
|
|
size_t nips;
|
|
virNetDevIPAddrPtr *ips;
|
|
size_t nroutes;
|
|
virNetDevIPRoutePtr *routes;
|
|
};
|
|
|
|
/* manipulating/querying the netdev */
|
|
int virNetDevIPAddrAdd(const char *ifname,
|
|
virSocketAddr *addr,
|
|
virSocketAddr *peer,
|
|
unsigned int prefix)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE;
|
|
int virNetDevIPRouteAdd(const char *ifname,
|
|
virSocketAddrPtr addr,
|
|
unsigned int prefix,
|
|
virSocketAddrPtr gateway,
|
|
unsigned int metric)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4)
|
|
ATTRIBUTE_RETURN_CHECK;
|
|
int virNetDevIPAddrDel(const char *ifname,
|
|
virSocketAddr *addr,
|
|
unsigned int prefix)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
|
|
int virNetDevIPAddrGet(const char *ifname, virSocketAddrPtr addr)
|
|
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
|
|
int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count)
|
|
ATTRIBUTE_NONNULL(1);
|
|
bool virNetDevIPCheckIPv6Forwarding(void);
|
|
|
|
/* virNetDevIPRoute object */
|
|
void virNetDevIPRouteFree(virNetDevIPRoutePtr def);
|
|
virSocketAddrPtr virNetDevIPRouteGetAddress(virNetDevIPRoutePtr def);
|
|
int virNetDevIPRouteGetPrefix(virNetDevIPRoutePtr def);
|
|
unsigned int virNetDevIPRouteGetMetric(virNetDevIPRoutePtr def);
|
|
virSocketAddrPtr virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def);
|
|
|
|
/* virNetDevIPInfo object */
|
|
void virNetDevIPInfoClear(virNetDevIPInfoPtr ip);
|
|
int virNetDevIPInfoAddToDev(const char *ifname,
|
|
virNetDevIPInfo const *ipInfo);
|
|
|
|
#endif /* __VIR_NETDEVIP_H__ */
|