Introduce virNetServerClientRemoteAddrStringURI

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.

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index f3cf65d8bba44ad61b84b51500b7e43e10c65160..fd80e46dac2e1a204bb057586c0d13ba3dafadc0 100644 (file)
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -145,6 +145,7 @@ virNetServerClientNew;
 virNetServerClientNewPostExecRestart;
 virNetServerClientPreExecRestart;
 virNetServerClientRemoteAddrString;
+virNetServerClientRemoteAddrStringURI;
 virNetServerClientRemoveFilter;
 virNetServerClientSendMessage;
 virNetServerClientSetAuth;

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 4c4b144ac2718d4a41f78f17d9b805c3b01c5c99..8c8af974b100fece55b1a2268f16382af8acead1 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -243,7 +243,7 @@ int virNetServerAddClient(virNetServerPtr srv,
     if (srv->nclients >= srv->nclients_max) {
         virReportError(VIR_ERR_RPC,
                        _("Too many active clients (%zu), dropping connection from %s"),
-                       srv->nclients_max, virNetServerClientRemoteAddrString(client));
+                       srv->nclients_max, virNetServerClientRemoteAddrStringURI(client));
         goto error;
     }
 

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 2bc058c558c275ede89d484190245d408a35ed47..15715a919bc2a6de5a8b347bc3dd873fd52289ed 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -918,6 +918,12 @@ const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client)
     return virNetSocketRemoteAddrString(client->sock);
 }
 
+const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client)
+{
+    if (!client->sock)
+        return NULL;
+    return virNetSocketRemoteAddrStringURI(client->sock);
+}
 
 void virNetServerClientDispose(void *obj)
 {
@@ -1608,7 +1614,7 @@ virNetServerClientGetInfo(virNetServerClientPtr client,
     virObjectLock(client);
     *readonly = client->readonly;
 
-    if (!(*sock_addr = virNetServerClientRemoteAddrString(client))) {
+    if (!(*sock_addr = virNetServerClientRemoteAddrStringURI(client))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("No network socket associated with client"));
         goto cleanup;

diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index c8b8dc165b04b85eb5ead8232381f07d6fb20436..bb9c937406a2f7fcfb2b2f36f2cfcc1bb29cfbd3 100644 (file)
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -140,6 +140,7 @@ int virNetServerClientStartKeepAlive(virNetServerClientPtr client);
 
 const char *virNetServerClientLocalAddrString(virNetServerClientPtr client);
 const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client);
+const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client);
 
 int virNetServerClientSendMessage(virNetServerClientPtr client,
                                   virNetMessagePtr msg);