Add SASL to virNetSocket{Local,Remote}AddrString

Rename them to virNetSocket{Local,Remote}AddrStringSASL
to make their format more obvious.

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index fd80e46dac2e1a204bb057586c0d13ba3dafadc0..3858f4de8914e62e074ef8955499688dadad4609 100644 (file)
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -212,7 +212,7 @@ virNetSocketHasPassFD;
 virNetSocketHasPendingData;
 virNetSocketIsLocal;
 virNetSocketListen;
-virNetSocketLocalAddrString;
+virNetSocketLocalAddrStringSASL;
 virNetSocketNewConnectCommand;
 virNetSocketNewConnectExternal;
 virNetSocketNewConnectLibSSH2;
@@ -227,7 +227,7 @@ virNetSocketNewPostExecRestart;
 virNetSocketPreExecRestart;
 virNetSocketRead;
 virNetSocketRecvFD;
-virNetSocketRemoteAddrString;
+virNetSocketRemoteAddrStringSASL;
 virNetSocketRemoteAddrStringURI;
 virNetSocketRemoveIOCallback;
 virNetSocketSendFD;

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 9c0d190d3693606278d92c0a4328ea0eb3fb64f5..c43cd08869519fb04a548fcd8ea8f0fb4dd50d04 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -946,12 +946,12 @@ void virNetClientRemoveStream(virNetClientPtr client,
 
 const char *virNetClientLocalAddrString(virNetClientPtr client)
 {
-    return virNetSocketLocalAddrString(client->sock);
+    return virNetSocketLocalAddrStringSASL(client->sock);
 }
 
 const char *virNetClientRemoteAddrString(virNetClientPtr client)
 {
-    return virNetSocketRemoteAddrString(client->sock);
+    return virNetSocketRemoteAddrStringSASL(client->sock);
 }
 
 #if WITH_GNUTLS

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 15715a919bc2a6de5a8b347bc3dd873fd52289ed..5aa7634866f5b8c68b6687a4938a5c781df6916c 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -907,7 +907,7 @@ const char *virNetServerClientLocalAddrString(virNetServerClientPtr client)
 {
     if (!client->sock)
         return NULL;
-    return virNetSocketLocalAddrString(client->sock);
+    return virNetSocketLocalAddrStringSASL(client->sock);
 }
 
 
@@ -915,7 +915,7 @@ const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client)
 {
     if (!client->sock)
         return NULL;
-    return virNetSocketRemoteAddrString(client->sock);
+    return virNetSocketRemoteAddrStringSASL(client->sock);
 }
 
 const char *virNetServerClientRemoteAddrStringURI(virNetServerClientPtr client)

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 00dc4172f3258ee371fc80f095a73bdb4d0f1674..405f5ba30e41b5d617b77715bdca184944ed5ac9 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -1461,12 +1461,12 @@ int virNetSocketSetBlocking(virNetSocketPtr sock,
 }
 
 
-const char *virNetSocketLocalAddrString(virNetSocketPtr sock)
+const char *virNetSocketLocalAddrStringSASL(virNetSocketPtr sock)
 {
     return sock->localAddrStrSASL;
 }
 
-const char *virNetSocketRemoteAddrString(virNetSocketPtr sock)
+const char *virNetSocketRemoteAddrStringSASL(virNetSocketPtr sock)
 {
     return sock->remoteAddrStrSASL;
 }

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 25ca14eb3ff0a19ce0de9c1c2f5513f86a0f6248..ec064bbb2eb7b64d6b1b5073ff4296b8b2245aea 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -148,8 +148,8 @@ void virNetSocketSetSASLSession(virNetSocketPtr sock,
 bool virNetSocketHasCachedData(virNetSocketPtr sock);
 bool virNetSocketHasPendingData(virNetSocketPtr sock);
 
-const char *virNetSocketLocalAddrString(virNetSocketPtr sock);
-const char *virNetSocketRemoteAddrString(virNetSocketPtr sock);
+const char *virNetSocketLocalAddrStringSASL(virNetSocketPtr sock);
+const char *virNetSocketRemoteAddrStringSASL(virNetSocketPtr sock);
 const char *virNetSocketRemoteAddrStringURI(virNetSocketPtr sock);
 
 int virNetSocketListen(virNetSocketPtr sock, int backlog);

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 4d78d272a02566dd736f05cb6f7aa19b50cbe8b8..cafdca997de84dd280e614caa6352da2f5814e22 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -249,12 +249,12 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
     if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0)
         goto cleanup;
 
-    if (STRNEQ(virNetSocketLocalAddrString(lsock), "127.0.0.1;0")) {
+    if (STRNEQ(virNetSocketLocalAddrStringSASL(lsock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
 
-    if (virNetSocketRemoteAddrString(lsock) != NULL) {
+    if (virNetSocketRemoteAddrStringSASL(lsock) != NULL) {
         VIR_DEBUG("Unexpected remote address");
         goto cleanup;
     }
@@ -265,12 +265,12 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
     if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
         goto cleanup;
 
-    if (STRNEQ(virNetSocketLocalAddrString(csock), "127.0.0.1;0")) {
+    if (STRNEQ(virNetSocketLocalAddrStringSASL(csock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
 
-    if (STRNEQ(virNetSocketRemoteAddrString(csock), "127.0.0.1;0")) {
+    if (STRNEQ(virNetSocketRemoteAddrStringSASL(csock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected remote address");
         goto cleanup;
     }
@@ -287,12 +287,12 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
     }
 
 
-    if (STRNEQ(virNetSocketLocalAddrString(ssock), "127.0.0.1;0")) {
+    if (STRNEQ(virNetSocketLocalAddrStringSASL(ssock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
 
-    if (STRNEQ(virNetSocketRemoteAddrString(ssock), "127.0.0.1;0")) {
+    if (STRNEQ(virNetSocketRemoteAddrStringSASL(ssock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected remote address");
         goto cleanup;
     }