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

Remove both addrToString methods

Browse Source 
The addrToString functionality is now available via the
virSocketFormatAddrFull method.

* daemon/remote.c, src/remote/remote_driver.c: Remove
  addrToString methods
This commit is contained in:
Daniel P. Berrange 2010-10-20 17:29:56 +01:00
parent 179c4be0e1
commit 640c5f1984
2 changed files with 18 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
daemon/remote.c
View File

@ -58,6 +58,7 @@
#include "util.h" #include "util.h"
#include "stream.h" #include "stream.h"
#include "uuid.h" #include "uuid.h"
#include "network.h"
#include "virtaudit.h" #include "virtaudit.h"
#include "libvirt/libvirt-qemu.h" #include "libvirt/libvirt-qemu.h"
@ -3631,43 +3632,6 @@ remoteDispatchAuthList (struct qemud_server *server,
#if HAVE_SASL #if HAVE_SASL
/*
* NB, keep in sync with similar method in src/remote/remote_driver.c
*/
static char *addrToString(remote_error *rerr,
struct sockaddr_storage *ss, socklen_t salen) {
char host[NI_MAXHOST], port[NI_MAXSERV];
char *addr;
int err;
struct sockaddr *sa = (struct sockaddr *)ss;
if (sa->sa_family == AF_UNIX) {
if (!(addr = strdup("127.0.0.1;0"))) {
virReportOOMError();
return NULL;
}
return addr;
}
if ((err = getnameinfo(sa, salen,
host, sizeof(host),
port, sizeof(port),
NI_NUMERICHOST | NI_NUMERICSERV)) != 0) {
remoteDispatchFormatError(rerr,
_("Cannot convert socket address to string: %s"),
gai_strerror(err));
return NULL;
}
if (virAsprintf(&addr, "%s;%s", host, port) == -1) {
virReportOOMError();
return NULL;
}
return addr;
}
/* /*
* Initializes the SASL session in prepare for authentication * Initializes the SASL session in prepare for authentication
* and gives the client a list of allowed mechanisms to choose * and gives the client a list of allowed mechanisms to choose
@ -3677,7 +3641,7 @@ static char *addrToString(remote_error *rerr,
static int static int
remoteDispatchAuthSaslInit (struct qemud_server *server, remoteDispatchAuthSaslInit (struct qemud_server *server,
struct qemud_client *client, struct qemud_client *client,
virConnectPtr conn ATTRIBUTE_UNUSED, virConnectPtr conn,
remote_message_header *hdr ATTRIBUTE_UNUSED, remote_message_header *hdr ATTRIBUTE_UNUSED,
remote_error *rerr, remote_error *rerr,
void *args ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED,
@ -3686,8 +3650,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server,
const char *mechlist = NULL; const char *mechlist = NULL;
sasl_security_properties_t secprops; sasl_security_properties_t secprops;
int err; int err;
struct sockaddr_storage sa; virSocketAddr sa;
socklen_t salen;
char *localAddr, *remoteAddr; char *localAddr, *remoteAddr;
virMutexLock(&server->lock); virMutexLock(&server->lock);
@ -3702,29 +3665,31 @@ remoteDispatchAuthSaslInit (struct qemud_server *server,
} }
/* Get local address in form IPADDR:PORT */ /* Get local address in form IPADDR:PORT */
salen = sizeof(sa); sa.len = sizeof(sa.data.stor);
if (getsockname(client->fd, (struct sockaddr*)&sa, &salen) < 0) { if (getsockname(client->fd, &sa.data.sa, &sa.len) < 0) {
char ebuf[1024]; char ebuf[1024];
remoteDispatchFormatError(rerr, remoteDispatchFormatError(rerr,
_("failed to get sock address: %s"), _("failed to get sock address: %s"),
virStrerror(errno, ebuf, sizeof ebuf)); virStrerror(errno, ebuf, sizeof ebuf));
goto error; goto error;
} }
if ((localAddr = addrToString(rerr, &sa, salen)) == NULL) { if ((localAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL) {
remoteDispatchConnError(rerr, conn);
goto error; goto error;
} }
/* Get remote address in form IPADDR:PORT */ /* Get remote address in form IPADDR:PORT */
salen = sizeof(sa); sa.len = sizeof(sa.data.stor);
if (getpeername(client->fd, (struct sockaddr*)&sa, &salen) < 0) { if (getpeername(client->fd, &sa.data.sa, &sa.len) < 0) {
char ebuf[1024]; char ebuf[1024];
remoteDispatchFormatError(rerr, _("failed to get peer address: %s"), remoteDispatchFormatError(rerr, _("failed to get peer address: %s"),
virStrerror(errno, ebuf, sizeof ebuf)); virStrerror(errno, ebuf, sizeof ebuf));
VIR_FREE(localAddr); VIR_FREE(localAddr);
goto error; goto error;
} }
if ((remoteAddr = addrToString(rerr, &sa, salen)) == NULL) { if ((localAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL) {
VIR_FREE(localAddr); VIR_FREE(localAddr);
remoteDispatchConnError(rerr, conn);
goto error; goto error;
} }

52
src/remote/remote_driver.c
View File

@ -6888,43 +6888,6 @@ remoteAuthenticate (virConnectPtr conn, struct private_data *priv,
#if HAVE_SASL #if HAVE_SASL
/*
* NB, keep in sync with similar method in daemon/remote.c
*/
static char *addrToString(struct sockaddr_storage *ss, socklen_t salen)
{
char host[NI_MAXHOST], port[NI_MAXSERV];
char *addr;
int err;
struct sockaddr *sa = (struct sockaddr *)ss;
if (sa->sa_family == AF_UNIX) {
if (!(addr = strdup("127.0.0.1;0"))) {
virReportOOMError();
return NULL;
}
return addr;
}
if ((err = getnameinfo(sa, salen,
host, sizeof(host),
port, sizeof(port),
NI_NUMERICHOST | NI_NUMERICSERV)) != 0) {
remoteError(VIR_ERR_UNKNOWN_HOST,
_("Cannot convert socket address to string: %s"),
gai_strerror(err));
return NULL;
}
if (virAsprintf(&addr, "%s;%s", host, port) == -1) {
virReportOOMError();
return NULL;
}
return addr;
}
static int remoteAuthCredVir2SASL(int vircred) static int remoteAuthCredVir2SASL(int vircred)
{ {
switch (vircred) { switch (vircred) {
@ -7105,8 +7068,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open,
unsigned int clientoutlen, serverinlen; unsigned int clientoutlen, serverinlen;
const char *mech; const char *mech;
int err, complete; int err, complete;
struct sockaddr_storage sa; virSocketAddr sa;
socklen_t salen;
char *localAddr = NULL, *remoteAddr = NULL; char *localAddr = NULL, *remoteAddr = NULL;
const void *val; const void *val;
sasl_ssf_t ssf; sasl_ssf_t ssf;
@ -7128,23 +7090,23 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open,
} }
/* Get local address in form IPADDR:PORT */ /* Get local address in form IPADDR:PORT */
salen = sizeof(sa); sa.len = sizeof(sa.data.stor);
if (getsockname(priv->sock, (struct sockaddr*)&sa, &salen) < 0) { if (getsockname(priv->sock, &sa.data.sa, &sa.len) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to get sock address")); _("failed to get sock address"));
goto cleanup; goto cleanup;
} }
if ((localAddr = addrToString(&sa, salen)) == NULL) if ((localAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL)
goto cleanup; goto cleanup;
/* Get remote address in form IPADDR:PORT */ /* Get remote address in form IPADDR:PORT */
salen = sizeof(sa); sa.len = sizeof(sa.data.stor);
if (getpeername(priv->sock, (struct sockaddr*)&sa, &salen) < 0) { if (getpeername(priv->sock, &sa.data.sa, &sa.len) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("failed to get peer address")); _("failed to get peer address"));
goto cleanup; goto cleanup;
} }
if ((remoteAddr = addrToString(&sa, salen)) == NULL) if ((remoteAddr = virSocketFormatAddrFull(&sa, true, ";")) == NULL)
goto cleanup; goto cleanup;
if (auth) { if (auth) {