shared/socket-util: do not print empty CID

That's just ugly.

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index a1565665112d15f7b7837a7bb2a08c87651917a6..d94bac42878caf910ea9a4742b402fd53eeac74a 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -672,12 +672,12 @@ int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_
                 break;
 
         case AF_VSOCK:
-                if (include_port)
-                        r = asprintf(&p,
-                                     "vsock:%u:%u",
-                                     sa->vm.svm_cid,
-                                     sa->vm.svm_port);
-                else
+                if (include_port) {
+                        if (sa->vm.svm_cid == VMADDR_CID_ANY)
+                                r = asprintf(&p, "vsock::%u", sa->vm.svm_port);
+                        else
+                                r = asprintf(&p, "vsock:%u:%u", sa->vm.svm_cid, sa->vm.svm_port);
+                } else
                         r = asprintf(&p, "vsock:%u", sa->vm.svm_cid);
                 if (r < 0)
                         return -ENOMEM;

diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c
index 24dd7018082dbd8589f3372ab5111befc7de6d5d..687caf83bedd8d704c4218cf057de4feed09cedd 100644 (file)
--- a/src/test/test-socket-util.c
+++ b/src/test/test-socket-util.c
@@ -98,7 +98,7 @@ static void test_socket_address_parse(void) {
         test_socket_address_parse_one("@abstract", 0, AF_UNIX, NULL);
 
         test_socket_address_parse_one("vsock:2:1234", 0, AF_VSOCK, NULL);
-        test_socket_address_parse_one("vsock::1234", 0, AF_VSOCK, "vsock:4294967295:1234");
+        test_socket_address_parse_one("vsock::1234", 0, AF_VSOCK, NULL);
         test_socket_address_parse_one("vsock:2:1234x", -EINVAL, 0, NULL);
         test_socket_address_parse_one("vsock:2x:1234", -EINVAL, 0, NULL);
         test_socket_address_parse_one("vsock:2", -EINVAL, 0, NULL);