picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-daemon: use sockaddr_port() helper

Browse source
This commit is contained in:
Lennart Poettering 2017-12-26 13:36:07 +01:00
parent f6aac5bf1b
commit dfde7e8c5b
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libsystemd/sd-daemon/sd-daemon.c
View file

@ -306,17 +306,13 @@ _public_ int sd_is_socket_inet(int fd, int family, int type, int listening, uint
return 0;
if (port > 0) {
if (sockaddr.sa.sa_family == AF_INET) {
if (l < sizeof(struct sockaddr_in))
return -EINVAL;
unsigned sa_port;
return htobe16(port) == sockaddr.in.sin_port;
} else {
if (l < sizeof(struct sockaddr_in6))
return -EINVAL;
r = sockaddr_port(&sockaddr.sa, &sa_port);
if (r < 0)
return r;
return htobe16(port) == sockaddr.in6.sin6_port;
}
return port == sa_port;
}
return 1;