Revert "virnetsocket: Provide socket address format in a more standard form"

This partially reverts commit 9b45c9f049a7e9b6c1abfa6988b63b760714e169.

It changed the default format of socket address from the one SASL
requires, but did not adjust all the callers.

It also removed the test coverage for it.

Revert most of the changes except the virSocketAddrFormatFull support
for URI-formatted strings.

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1345743 while
reverting the format used by virt-admin's client-info command from
the URI one to the SASL one.

https://bugzilla.redhat.com/show_bug.cgi?id=1345743

diff --git a/daemon/remote.c b/daemon/remote.c
index 4e2aff87b48cde1d7955e04fbb7fbc33935597bc..ea4753fb72370a7703b78e9999abfb20d9df0e84 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -3016,8 +3016,6 @@ remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED,
     virNetSASLSessionPtr sasl = NULL;
     struct daemonClientPrivate *priv =
         virNetServerClientGetPrivateData(client);
-    char *localAddr = NULL;
-    char *remoteAddr = NULL;
 
     virMutexLock(&priv->lock);
 
@@ -3028,17 +3026,10 @@ remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED,
         goto authfail;
     }
 
-    localAddr = virNetServerClientLocalAddrFormatSASL(client);
-    remoteAddr = virNetServerClientRemoteAddrFormatSASL(client);
-
     sasl = virNetSASLSessionNewServer(saslCtxt,
                                       "libvirt",
-                                      localAddr,
-                                      remoteAddr);
-
-    VIR_FREE(localAddr);
-    VIR_FREE(remoteAddr);
-
+                                      virNetServerClientLocalAddrString(client),
+                                      virNetServerClientRemoteAddrString(client));
     if (!sasl)
         goto authfail;
 

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 3f9d812fc98889269d3802353b7b1fa112c1b0ff..b11bfe03d4ff1a10a3f5faf950c9dd57a2c4f3c7 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -3809,8 +3809,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
     sasl_callback_t *saslcb = NULL;
     int ret = -1;
     const char *mechlist;
-    char *localAddr = NULL;
-    char *remoteAddr = NULL;
     virNetSASLContextPtr saslCtxt;
     virNetSASLSessionPtr sasl = NULL;
     struct remoteAuthInteractState state;
@@ -3829,9 +3827,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
         saslcb = NULL;
     }
 
-    localAddr = virNetClientLocalAddrFormatSASL(priv->client);
-    remoteAddr = virNetClientRemoteAddrFormatSASL(priv->client);
-
     /* Setup a handle for being a client */
     if (!(sasl = virNetSASLSessionNewClient(saslCtxt,
                                             "libvirt",
@@ -4019,8 +4014,6 @@ remoteAuthSASL(virConnectPtr conn, struct private_data *priv,
 
  cleanup:
     VIR_FREE(serverin);
-    VIR_FREE(localAddr);
-    VIR_FREE(remoteAddr);
 
     remoteAuthInteractStateClear(&state, true);
     VIR_FREE(saslcb);

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 3d599903ec58632e3b5203ae9002bb2c97166bc4..9c0d190d3693606278d92c0a4328ea0eb3fb64f5 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -954,16 +954,6 @@ const char *virNetClientRemoteAddrString(virNetClientPtr client)
     return virNetSocketRemoteAddrString(client->sock);
 }
 
-char *virNetClientLocalAddrFormatSASL(virNetClientPtr client)
-{
-    return virNetSocketLocalAddrFormatSASL(client->sock);
-}
-
-char *virNetClientRemoteAddrFormatSASL(virNetClientPtr client)
-{
-    return virNetSocketRemoteAddrFormatSASL(client->sock);
-}
-
 #if WITH_GNUTLS
 int virNetClientGetTLSKeySize(virNetClientPtr client)
 {

diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 4b786775cb22d2e8949515efd9232b4fc5812130..38f929ca558353b859e278cd46f0cedb20f90abc 100644 (file)
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -123,8 +123,6 @@ bool virNetClientIsOpen(virNetClientPtr client);
 
 const char *virNetClientLocalAddrString(virNetClientPtr client);
 const char *virNetClientRemoteAddrString(virNetClientPtr client);
-char *virNetClientLocalAddrFormatSASL(virNetClientPtr client);
-char *virNetClientRemoteAddrFormatSASL(virNetClientPtr client);
 
 # ifdef WITH_GNUTLS
 int virNetClientGetTLSKeySize(virNetClientPtr client);

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index ef835072c15d26a9097a07468b6a370ee0471d04..2bc058c558c275ede89d484190245d408a35ed47 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -918,19 +918,6 @@ const char *virNetServerClientRemoteAddrString(virNetServerClientPtr client)
     return virNetSocketRemoteAddrString(client->sock);
 }
 
-char *virNetServerClientLocalAddrFormatSASL(virNetServerClientPtr client)
-{
-    if (!client->sock)
-        return NULL;
-    return virNetSocketLocalAddrFormatSASL(client->sock);
-}
-
-char *virNetServerClientRemoteAddrFormatSASL(virNetServerClientPtr client)
-{
-    if (!client->sock)
-        return NULL;
-    return virNetSocketRemoteAddrFormatSASL(client->sock);
-}
 
 void virNetServerClientDispose(void *obj)
 {

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

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index a90cc55ada3a16e887c60a3024b81afddc08aadc..d909b94d0fb5e437c15a0082245fbd13115adf28 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -262,11 +262,11 @@ static virNetSocketPtr virNetSocketNew(virSocketAddrPtr localAddr,
 
 
     if (localAddr &&
-        !(sock->localAddrStr = virSocketAddrFormatFull(localAddr, true, NULL)))
+        !(sock->localAddrStr = virSocketAddrFormatFull(localAddr, true, ";")))
         goto error;
 
     if (remoteAddr &&
-        !(sock->remoteAddrStr = virSocketAddrFormatFull(remoteAddr, true, NULL)))
+        !(sock->remoteAddrStr = virSocketAddrFormatFull(remoteAddr, true, ";")))
         goto error;
 
     sock->client = isClient;
@@ -1465,19 +1465,6 @@ const char *virNetSocketRemoteAddrString(virNetSocketPtr sock)
     return sock->remoteAddrStr;
 }
 
-/* These helper functions return a SASL-formatted socket addr string,
- * caller is responsible for freeing the string.
- */
-char *virNetSocketLocalAddrFormatSASL(virNetSocketPtr sock)
-{
-    return virSocketAddrFormatFull(&sock->localAddr, true, ";");
-}
-
-char *virNetSocketRemoteAddrFormatSASL(virNetSocketPtr sock)
-{
-    return virSocketAddrFormatFull(&sock->remoteAddr, true, ";");
-}
-
 
 #if WITH_GNUTLS
 static ssize_t virNetSocketTLSSessionWrite(const char *buf,

diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 4eb7187b2306b727469a03013f496ae59a805e71..5de3d926315ddb8fc1e2ee6799965eda1175cafc 100644 (file)
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -150,8 +150,6 @@ bool virNetSocketHasPendingData(virNetSocketPtr sock);
 
 const char *virNetSocketLocalAddrString(virNetSocketPtr sock);
 const char *virNetSocketRemoteAddrString(virNetSocketPtr sock);
-char *virNetSocketLocalAddrFormatSASL(virNetSocketPtr sock);
-char *virNetSocketRemoteAddrFormatSASL(virNetSocketPtr sock);
 
 int virNetSocketListen(virNetSocketPtr sock, int backlog);
 int virNetSocketAccept(virNetSocketPtr sock,

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index bbecb3cfea9282cf58553feb000bb3ac0a222111..9df90a9e60f0a0d68645637ef77ce5bc985ef4bb 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -249,7 +249,7 @@ 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(virNetSocketLocalAddrString(lsock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local 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(virNetSocketLocalAddrString(csock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
 
-    if (STRNEQ(virNetSocketRemoteAddrString(csock), "127.0.0.1:0")) {
+    if (STRNEQ(virNetSocketRemoteAddrString(csock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
@@ -282,12 +282,12 @@ static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
     }
 
 
-    if (STRNEQ(virNetSocketLocalAddrString(ssock), "127.0.0.1:0")) {
+    if (STRNEQ(virNetSocketLocalAddrString(ssock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }
 
-    if (STRNEQ(virNetSocketRemoteAddrString(ssock), "127.0.0.1:0")) {
+    if (STRNEQ(virNetSocketRemoteAddrString(ssock), "127.0.0.1;0")) {
         VIR_DEBUG("Unexpected local address");
         goto cleanup;
     }