mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-06 04:55:22 +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>
191 lines
6.9 KiB
C
191 lines
6.9 KiB
C
/*
|
|
* virnetsocket.h: generic network socket handling
|
|
*
|
|
* Copyright (C) 2006-2011 Red Hat, Inc.
|
|
* Copyright (C) 2006 Daniel P. Berrange
|
|
*
|
|
* 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/>.
|
|
*
|
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
|
*/
|
|
|
|
#ifndef __VIR_NET_SOCKET_H__
|
|
# define __VIR_NET_SOCKET_H__
|
|
|
|
# include "virsocketaddr.h"
|
|
# include "vircommand.h"
|
|
# ifdef WITH_GNUTLS
|
|
# include "virnettlscontext.h"
|
|
# endif
|
|
# include "virobject.h"
|
|
# ifdef WITH_SASL
|
|
# include "virnetsaslcontext.h"
|
|
# endif
|
|
# include "virjson.h"
|
|
# include "viruri.h"
|
|
|
|
typedef struct _virNetSocket virNetSocket;
|
|
typedef virNetSocket *virNetSocketPtr;
|
|
|
|
|
|
typedef void (*virNetSocketIOFunc)(virNetSocketPtr sock,
|
|
int events,
|
|
void *opaque);
|
|
|
|
|
|
int virNetSocketCheckProtocols(bool *hasIPv4,
|
|
bool *hasIPv6);
|
|
|
|
int virNetSocketNewListenTCP(const char *nodename,
|
|
const char *service,
|
|
int family,
|
|
virNetSocketPtr **addrs,
|
|
size_t *naddrs);
|
|
|
|
int virNetSocketNewListenUNIX(const char *path,
|
|
mode_t mask,
|
|
uid_t user,
|
|
gid_t grp,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewListenFD(int fd,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewConnectTCP(const char *nodename,
|
|
const char *service,
|
|
int family,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewConnectUNIX(const char *path,
|
|
bool spawnDaemon,
|
|
const char *binary,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewConnectCommand(virCommandPtr cmd,
|
|
virNetSocketPtr *retsock);
|
|
|
|
int virNetSocketNewConnectSSH(const char *nodename,
|
|
const char *service,
|
|
const char *binary,
|
|
const char *username,
|
|
bool noTTY,
|
|
bool noVerify,
|
|
const char *netcat,
|
|
const char *keyfile,
|
|
const char *path,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewConnectLibSSH2(const char *host,
|
|
const char *port,
|
|
int family,
|
|
const char *username,
|
|
const char *privkey,
|
|
const char *knownHosts,
|
|
const char *knownHostsVerify,
|
|
const char *authMethods,
|
|
const char *command,
|
|
virConnectAuthPtr auth,
|
|
virURIPtr uri,
|
|
virNetSocketPtr *retsock);
|
|
|
|
int virNetSocketNewConnectLibssh(const char *host,
|
|
const char *port,
|
|
int family,
|
|
const char *username,
|
|
const char *privkey,
|
|
const char *knownHosts,
|
|
const char *knownHostsVerify,
|
|
const char *authMethods,
|
|
const char *command,
|
|
virConnectAuthPtr auth,
|
|
virURIPtr uri,
|
|
virNetSocketPtr *retsock);
|
|
|
|
int virNetSocketNewConnectExternal(const char **cmdargv,
|
|
virNetSocketPtr *addr);
|
|
|
|
int virNetSocketNewConnectSockFD(int sockfd,
|
|
virNetSocketPtr *retsock);
|
|
|
|
virNetSocketPtr virNetSocketNewPostExecRestart(virJSONValuePtr object);
|
|
|
|
virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock);
|
|
|
|
int virNetSocketGetFD(virNetSocketPtr sock);
|
|
int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec);
|
|
|
|
bool virNetSocketIsLocal(virNetSocketPtr sock);
|
|
|
|
bool virNetSocketHasPassFD(virNetSocketPtr sock);
|
|
|
|
int virNetSocketGetPort(virNetSocketPtr sock);
|
|
|
|
int virNetSocketGetUNIXIdentity(virNetSocketPtr sock,
|
|
uid_t *uid,
|
|
gid_t *gid,
|
|
pid_t *pid,
|
|
unsigned long long *timestamp)
|
|
ATTRIBUTE_NOINLINE;
|
|
int virNetSocketGetSELinuxContext(virNetSocketPtr sock,
|
|
char **context)
|
|
ATTRIBUTE_NOINLINE;
|
|
|
|
int virNetSocketSetBlocking(virNetSocketPtr sock,
|
|
bool blocking);
|
|
|
|
void virNetSocketSetQuietEOF(virNetSocketPtr sock);
|
|
|
|
ssize_t virNetSocketRead(virNetSocketPtr sock, char *buf, size_t len);
|
|
ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len);
|
|
|
|
int virNetSocketSendFD(virNetSocketPtr sock, int fd);
|
|
int virNetSocketRecvFD(virNetSocketPtr sock, int *fd);
|
|
|
|
# ifdef WITH_GNUTLS
|
|
void virNetSocketSetTLSSession(virNetSocketPtr sock,
|
|
virNetTLSSessionPtr sess);
|
|
# endif
|
|
|
|
# ifdef WITH_SASL
|
|
void virNetSocketSetSASLSession(virNetSocketPtr sock,
|
|
virNetSASLSessionPtr sess);
|
|
# endif
|
|
bool virNetSocketHasCachedData(virNetSocketPtr sock);
|
|
bool virNetSocketHasPendingData(virNetSocketPtr sock);
|
|
|
|
const char *virNetSocketLocalAddrStringSASL(virNetSocketPtr sock);
|
|
const char *virNetSocketRemoteAddrStringSASL(virNetSocketPtr sock);
|
|
const char *virNetSocketRemoteAddrStringURI(virNetSocketPtr sock);
|
|
|
|
int virNetSocketListen(virNetSocketPtr sock, int backlog);
|
|
int virNetSocketAccept(virNetSocketPtr sock,
|
|
virNetSocketPtr *clientsock);
|
|
|
|
int virNetSocketAddIOCallback(virNetSocketPtr sock,
|
|
int events,
|
|
virNetSocketIOFunc func,
|
|
void *opaque,
|
|
virFreeCallback ff);
|
|
|
|
void virNetSocketUpdateIOCallback(virNetSocketPtr sock,
|
|
int events);
|
|
|
|
void virNetSocketRemoveIOCallback(virNetSocketPtr sock);
|
|
|
|
void virNetSocketClose(virNetSocketPtr sock);
|
|
|
|
|
|
#endif /* __VIR_NET_SOCKET_H__ */
|