Rename virNetClient*AddrString

Add SASL at the end to make the format obvious.

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index a6192ef86a8b56928967a3319761c75a6e73a354..ca1f3ac8641d9494ec96831e1f55f836c864254a 100644 (file)
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -17,7 +17,7 @@ virNetClientIsOpen;
 virNetClientKeepAliveIsSupported;
 virNetClientKeepAliveStart;
 virNetClientKeepAliveStop;
-virNetClientLocalAddrString;
+virNetClientLocalAddrStringSASL;
 virNetClientNewExternal;
 virNetClientNewLibSSH2;
 virNetClientNewSSH;
@@ -25,7 +25,7 @@ virNetClientNewTCP;
 virNetClientNewUNIX;
 virNetClientRegisterAsyncIO;
 virNetClientRegisterKeepAlive;
-virNetClientRemoteAddrString;
+virNetClientRemoteAddrStringSASL;
 virNetClientRemoveStream;
 virNetClientSendNonBlock;
 virNetClientSendNoReply;

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index b11bfe03d4ff1a10a3f5faf950c9dd57a2c4f3c7..1f81f03b9e30f77094a2722e40ab70f9c0b815e3 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3831,8 +3831,8 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
     if (!(sasl = virNetSASLSessionNewClient(saslCtxt,
                                             "libvirt",
                                             priv->hostname,
-                                            virNetClientLocalAddrString(priv->client),
-                                            virNetClientRemoteAddrString(priv->client),
+                                            virNetClientLocalAddrStringSASL(priv->client),
+                                            virNetClientRemoteAddrStringSASL(priv->client),
                                             saslcb)))
         goto cleanup;
     /* saslcb is now owned by sasl */

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index c43cd08869519fb04a548fcd8ea8f0fb4dd50d04..361dc1adfc5b5a02c210a72f597220b99a8386c0 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -944,12 +944,12 @@ void virNetClientRemoveStream(virNetClientPtr client,
 }
 
 
-const char *virNetClientLocalAddrString(virNetClientPtr client)
+const char *virNetClientLocalAddrStringSASL(virNetClientPtr client)
 {
     return virNetSocketLocalAddrStringSASL(client->sock);
 }
 
-const char *virNetClientRemoteAddrString(virNetClientPtr client)
+const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client)
 {
     return virNetSocketRemoteAddrStringSASL(client->sock);
 }

diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 38f929ca558353b859e278cd46f0cedb20f90abc..c772d0bca68735e3d2bdf578c78dca09d145ab20 100644 (file)
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -121,8 +121,8 @@ int virNetClientSetTLSSession(virNetClientPtr client,
 bool virNetClientIsEncrypted(virNetClientPtr client);
 bool virNetClientIsOpen(virNetClientPtr client);
 
-const char *virNetClientLocalAddrString(virNetClientPtr client);
-const char *virNetClientRemoteAddrString(virNetClientPtr client);
+const char *virNetClientLocalAddrStringSASL(virNetClientPtr client);
+const char *virNetClientRemoteAddrStringSASL(virNetClientPtr client);
 
 # ifdef WITH_GNUTLS
 int virNetClientGetTLSKeySize(virNetClientPtr client);