NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Introduce virNetServerClientRemoteAddrStringURI

Browse Source 
Use it in virNetServerClientGetInfo to switch back to using
the URI-format (separated by ':') instead of the SASL format
(separated by ';').

Also use it in the error message reported by virNetServerAddClient.
This commit is contained in:
Ján Tomko 2016-06-20 15:51:18 +02:00
parent 2da6a13e5f
commit 23b6559d65
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libvirt_remote.syms
View File

@ -145,6 +145,7 @@ virNetServerClientNew;
virNetServerClientNewPostExecRestart; virNetServerClientNewPostExecRestart;
virNetServerClientPreExecRestart; virNetServerClientPreExecRestart;
virNetServerClientRemoteAddrString; virNetServerClientRemoteAddrString;
virNetServerClientRemoteAddrStringURI;
virNetServerClientRemoveFilter; virNetServerClientRemoveFilter;
virNetServerClientSendMessage; virNetServerClientSendMessage;
virNetServerClientSetAuth; virNetServerClientSetAuth;

2
src/rpc/virnetserver.c
View File

@ -243,7 +243,7 @@ int virNetServerAddClient(virNetServerPtr srv,
if (srv->nclients >= srv->nclients_max) { if (srv->nclients >= srv->nclients_max) {
virReportError(VIR_ERR_RPC, virReportError(VIR_ERR_RPC,
_("Too many active clients (%zu), dropping connection from %s"), _("Too many active clients (%zu), dropping connection from %s"),
srv->nclients_max, virNetServerClientRemoteAddrString(client)); srv->nclients_max, virNetServerClientRemoteAddrStringURI(client));
goto error; goto error;
} }

8
src/rpc/virnetserverclient.c
View File

@ -918,6 +918,12 @@ const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client)
return virNetSocketRemoteAddrString(client->sock); return virNetSocketRemoteAddrString(client->sock);
} }
const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client)
{
if (!client->sock)
return NULL;
return virNetSocketRemoteAddrStringURI(client->sock);
}
void virNetServerClientDispose(void *obj) void virNetServerClientDispose(void *obj)
{ {
@ -1608,7 +1614,7 @@ virNetServerClientGetInfo(virNetServerClientPtr client,
virObjectLock(client); virObjectLock(client);
*readonly = client->readonly; *readonly = client->readonly;
if (!(*sock_addr = virNetServerClientRemoteAddrString(client))) { if (!(*sock_addr = virNetServerClientRemoteAddrStringURI(client))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("No network socket associated with client")); _("No network socket associated with client"));
goto cleanup; goto cleanup;

1
src/rpc/virnetserverclient.h
View File

@ -140,6 +140,7 @@ int virNetServerClientStartKeepAlive(virNetServerClientPtr client);
const char *virNetServerClientLocalAddrString(virNetServerClientPtr client); const char *virNetServerClientLocalAddrString(virNetServerClientPtr client);
const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client); const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client);
const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client);
int virNetServerClientSendMessage(virNetServerClientPtr client, int virNetServerClientSendMessage(virNetServerClientPtr client,
virNetMessagePtr msg); virNetMessagePtr msg);