External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup to network socket init

Browse Source 
* daemon/libvirtd.c: Change qemudNetworkInit() so that it doesn't try
to free its argument, leaving the caller todo cleanup as is normal
practice. Add missing policykit cleanup to qemudCleanup, and remove
server watch if set. Remove duplicated call to listen() on TCP sockets
This commit is contained in:
Daniel P. Berrange 2009-10-16 11:24:01 +01:00
parent 46992453b9
commit 0264e1678c
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
daemon/libvirtd.c
View File

@ -593,13 +593,7 @@ remoteMakeSockets (int *fds, int max_fds, int *nfds_r, const char *node, const c
return -1;
}
close (fds[*nfds_r]);
}
else {
if (listen (fds[*nfds_r], SOMAXCONN) == -1) {
VIR_ERROR(_("listen: %s"),
virStrerror (errno, ebuf, sizeof ebuf));
return -1;
}
} else {
++*nfds_r;
}
runp = runp->ai_next;
@ -867,8 +861,7 @@ static struct qemud_server *qemudInitialize(int sigread) {
return server;
}
static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
struct qemud_socket *sock;
static int qemudNetworkInit(struct qemud_server *server) {
char sockname[PATH_MAX];
char roSockname[PATH_MAX];
#if HAVE_SASL
@ -935,6 +928,7 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
#ifdef HAVE_AVAHI
if (server->privileged && mdns_adv) {
struct libvirtd_mdns_group *group;
struct qemud_socket *sock;
int port = 0;
server->mdns = libvirtd_mdns_new();
@ -980,25 +974,13 @@ static struct qemud_server *qemudNetworkInit(struct qemud_server *server) {
}
#endif
return server;
return 0;
cleanup:
if (server) {
sock = server->sockets;
while (sock) {
close(sock->fd);
sock = sock->next;
}
#if HAVE_POLKIT0
if (server->sysbus)
dbus_connection_unref(server->sysbus);
#endif
free(server);
}
return NULL;
return -1;
}
static gnutls_session_t
remoteInitializeTLSSession (void)
{
@ -2309,6 +2291,8 @@ static void qemudCleanup(struct qemud_server *server) {
sock = server->sockets;
while (sock) {
struct qemud_socket *next = sock->next;
if (sock->watch)
virEventRemoveHandleImpl(sock->watch);
close(sock->fd);
free(sock);
sock = next;
@ -2326,6 +2310,11 @@ static void qemudCleanup(struct qemud_server *server) {
}
#endif
#if HAVE_POLKIT0
if (server->sysbus)
dbus_connection_unref(server->sysbus);
#endif
virStateCleanup();
if (virCondDestroy(&server->job) < 0) {
@ -3016,7 +3005,7 @@ int main(int argc, char **argv) {
goto error2;
}
if (!(server = qemudNetworkInit(server))) {
if (qemudNetworkInit(server) < 0) {
ret = 2;
goto error2;
}