diff options
Diffstat (limited to 'src/basic')
-rw-r--r-- | src/basic/socket-util.c | 5 | ||||
-rw-r--r-- | src/basic/socket-util.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 4ebf106109..16f9bbc940 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -480,7 +480,7 @@ bool socket_address_matches_fd(const SocketAddress *a, int fd) { return socket_address_equal(a, &b); } -int sockaddr_port(const struct sockaddr *_sa) { +int sockaddr_port(const struct sockaddr *_sa, unsigned *port) { union sockaddr_union *sa = (union sockaddr_union*) _sa; assert(sa); @@ -488,7 +488,8 @@ int sockaddr_port(const struct sockaddr *_sa) { if (!IN_SET(sa->sa.sa_family, AF_INET, AF_INET6)) return -EAFNOSUPPORT; - return be16toh(sa->sa.sa_family == AF_INET6 ? sa->in6.sin6_port : sa->in.sin_port); + *port = be16toh(sa->sa.sa_family == AF_INET6 ? sa->in6.sin6_port : sa->in.sin_port); + return 0; } int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret) { diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h index 2ef572badb..482055fafa 100644 --- a/src/basic/socket-util.h +++ b/src/basic/socket-util.h @@ -100,7 +100,7 @@ const char* socket_address_get_path(const SocketAddress *a); bool socket_ipv6_is_supported(void); -int sockaddr_port(const struct sockaddr *_sa) _pure_; +int sockaddr_port(const struct sockaddr *_sa, unsigned *port) _pure_; int sockaddr_pretty(const struct sockaddr *_sa, socklen_t salen, bool translate_ipv6, bool include_port, char **ret); int getpeername_pretty(int fd, bool include_port, char **ret); |