|
 |
17b0f1 |
From ea81ddfdc0eadfb62e28ed998d33c5e1d3b3abab Mon Sep 17 00:00:00 2001
|
|
|
17b0f1 |
From: Michal Schmidt <mschmidt@redhat.com>
|
|
|
17b0f1 |
Date: Fri, 20 Feb 2015 02:13:03 +0100
|
|
|
17b0f1 |
Subject: [PATCH] shared: avoid semi-duplicating socket_address_equal()
|
|
|
17b0f1 |
|
|
|
17b0f1 |
Just call socket_address_equal() from socket_address_matches_fd()
|
|
|
17b0f1 |
instead of implementing similar comparing of addresses.
|
|
|
17b0f1 |
|
|
|
17b0f1 |
(cherry picked from commit 02233928a502e46fc125118dba7234ba3e48dc15)
|
|
|
17b0f1 |
---
|
|
|
17b0f1 |
src/shared/socket-util.c | 18 +-----------------
|
|
|
17b0f1 |
1 file changed, 1 insertion(+), 17 deletions(-)
|
|
|
17b0f1 |
|
|
|
17b0f1 |
diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
|
|
|
17b0f1 |
index c31f60ec7e..deecce8a80 100644
|
|
|
17b0f1 |
--- a/src/shared/socket-util.c
|
|
|
17b0f1 |
+++ b/src/shared/socket-util.c
|
|
|
17b0f1 |
@@ -464,23 +464,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) {
|
|
|
17b0f1 |
return false;
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
- switch (b.sockaddr.sa.sa_family) {
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- case AF_INET:
|
|
|
17b0f1 |
- return b.sockaddr.in.sin_port == a->sockaddr.in.sin_port &&
|
|
|
17b0f1 |
- b.sockaddr.in.sin_addr.s_addr == a->sockaddr.in.sin_addr.s_addr;
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- case AF_INET6:
|
|
|
17b0f1 |
- return b.sockaddr.in6.sin6_port == a->sockaddr.in6.sin6_port &&
|
|
|
17b0f1 |
- memcmp(&b.sockaddr.in6.sin6_addr, &a->sockaddr.in6.sin6_addr, sizeof(struct in6_addr)) == 0;
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- case AF_UNIX:
|
|
|
17b0f1 |
- return b.sockaddr.size == a->size &&
|
|
|
17b0f1 |
- memcmp(b.sockaddr.un.sun_path, a->sockaddr.un.sun_path, b.size - offsetof(struct sockaddr_un, sun_path)) == 0;
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- }
|
|
|
17b0f1 |
-
|
|
|
17b0f1 |
- return false;
|
|
|
17b0f1 |
+ return socket_address_equal(a, &b);
|
|
|
17b0f1 |
}
|
|
|
17b0f1 |
|
|
|
17b0f1 |
int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, char **ret) {
|