Consistently use AF_UNIX over AF_LOCAL
As these constants have the same value 1, let's use and print only one
of them, e.g. AF_UNIX.
* xlat/addrfams.in (AF_LOCAL): Remove.
* tests/net-accept-connect.c (main): Replace AF_LOCAL with AF_UNIX.
* tests/net-y-unix.c: Likewise.
* tests/net-yy-unix.c: Likewise.
* tests/netlink_unix_diag.c: Likewise.
diff --git a/tests/net-y-unix.c b/tests/net-y-unix.c
index 28212a3..499ae8e 100644
--- a/tests/net-y-unix.c
+++ b/tests/net-y-unix.c
@@ -54,17 +54,17 @@
if (*len > sizeof(addr))
*len = sizeof(addr);
- int listen_fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+ int listen_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (listen_fd < 0)
perror_msg_and_skip("socket");
unsigned long listen_inode = inode_of_sockfd(listen_fd);
- printf("socket(AF_LOCAL, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
+ printf("socket(AF_UNIX, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
listen_fd, listen_inode);
(void) unlink(av[1]);
if (bind(listen_fd, listen_sa, *len))
perror_msg_and_skip("bind");
- printf("bind(%d<socket:[%lu]>, {sa_family=AF_LOCAL, sun_path=\"%s\"}"
+ printf("bind(%d<socket:[%lu]>, {sa_family=AF_UNIX, sun_path=\"%s\"}"
", %u) = 0\n", listen_fd, listen_inode, av[1], (unsigned) *len);
if (listen(listen_fd, 1))
@@ -83,20 +83,20 @@
*len = sizeof(addr);
if (getsockname(listen_fd, listen_sa, len))
perror_msg_and_fail("getsockname");
- printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, [%u]) = 0\n", listen_fd, listen_inode,
av[1], (unsigned) *len);
- int connect_fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+ int connect_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (connect_fd < 0)
perror_msg_and_fail("socket");
unsigned long connect_inode = inode_of_sockfd(connect_fd);
- printf("socket(AF_LOCAL, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
+ printf("socket(AF_UNIX, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
connect_fd, connect_inode);
if (connect(connect_fd, listen_sa, *len))
perror_msg_and_fail("connect");
- printf("connect(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("connect(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, %u) = 0\n",
connect_fd, connect_inode, av[1], (unsigned) *len);
@@ -107,7 +107,7 @@
if (accept_fd < 0)
perror_msg_and_fail("accept");
unsigned long accept_inode = inode_of_sockfd(accept_fd);
- printf("accept(%d<socket:[%lu]>, {sa_family=AF_LOCAL, NULL}"
+ printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX, NULL}"
", [%u]) = %d<socket:[%lu]>\n",
listen_fd, listen_inode, (unsigned) *len,
accept_fd, accept_inode);
@@ -116,7 +116,7 @@
*len = sizeof(addr);
if (getpeername(connect_fd, listen_sa, len))
perror_msg_and_fail("getpeername");
- printf("getpeername(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("getpeername(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, [%u]) = 0\n", connect_fd, connect_inode,
av[1], (unsigned) *len);
@@ -141,11 +141,11 @@
assert(close(accept_fd) == 0);
printf("close(%d<socket:[%lu]>) = 0\n", accept_fd, accept_inode);
- connect_fd = socket(AF_LOCAL, SOCK_STREAM, 0);
+ connect_fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (connect_fd < 0)
perror_msg_and_fail("socket");
connect_inode = inode_of_sockfd(connect_fd);
- printf("socket(AF_LOCAL, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
+ printf("socket(AF_UNIX, SOCK_STREAM, 0) = %d<socket:[%lu]>\n",
connect_fd, connect_inode);
*optval = 1;
@@ -160,13 +160,13 @@
*len = sizeof(addr);
if (getsockname(listen_fd, listen_sa, len))
perror_msg_and_fail("getsockname");
- printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, [%u]) = 0\n",
listen_fd, listen_inode, av[1], (unsigned) *len);
if (connect(connect_fd, listen_sa, *len))
perror_msg_and_fail("connect");
- printf("connect(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("connect(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, %u) = 0\n",
connect_fd, connect_inode, av[1], (unsigned) *len);
@@ -178,7 +178,7 @@
accept_inode = inode_of_sockfd(accept_fd);
const char * const sun_path1 =
((struct sockaddr_un *) accept_sa) -> sun_path + 1;
- printf("accept(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("accept(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=@\"%s\"}, [%u]) = %d<socket:[%lu]>\n",
listen_fd, listen_inode, sun_path1, (unsigned) *len,
accept_fd, accept_inode);
@@ -187,7 +187,7 @@
*len = sizeof(addr);
if (getpeername(connect_fd, listen_sa, len))
perror_msg_and_fail("getpeername");
- printf("getpeername(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("getpeername(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=\"%s\"}, [%u]) = 0\n",
connect_fd, connect_inode, av[1], (unsigned) *len);
@@ -195,7 +195,7 @@
*len = sizeof(addr);
if (getsockname(connect_fd, accept_sa, len))
perror_msg_and_fail("getsockname");
- printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_LOCAL"
+ printf("getsockname(%d<socket:[%lu]>, {sa_family=AF_UNIX"
", sun_path=@\"%s\"}, [%u]) = 0\n",
connect_fd, connect_inode, sun_path1, (unsigned) *len);