shared/socket-util: do not print empty CID
That's just ugly.
This commit is contained in:
parent
39e73acb9b
commit
3a48499153
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user