daandemeyer / rpms / systemd

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