clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-03 15:30:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared: avoid semi-duplicating socket_address_equal()

Browse Source 
Just call socket_address_equal() from socket_address_matches_fd()
instead of implementing similar comparing of addresses.
This commit is contained in:
Michal Schmidt
2015-02-20 03:35:11 +01:00
parent dbafedacba
commit 02233928a5
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/socket-util.c
+1 -17
View File
@@ -464,23 +464,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) {
return false;
}
switch (b.sockaddr.sa.sa_family) {
case AF_INET:
return b.sockaddr.in.sin_port == a->sockaddr.in.sin_port &&
b.sockaddr.in.sin_addr.s_addr == a->sockaddr.in.sin_addr.s_addr;
case AF_INET6:
return b.sockaddr.in6.sin6_port == a->sockaddr.in6.sin6_port &&
memcmp(&b.sockaddr.in6.sin6_addr, &a->sockaddr.in6.sin6_addr, sizeof(struct in6_addr)) == 0;
case AF_UNIX:
return b.sockaddr.size == a->size &&
memcmp(b.sockaddr.un.sun_path, a->sockaddr.un.sun_path, b.size - offsetof(struct sockaddr_un, sun_path)) == 0;
}
return false;
return socket_address_equal(a, &b);
}
int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, char **ret) {