From 6b291ea777418071bb21c20aa7804447d95422bc Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 11 Jan 2015 23:38:21 +0100 Subject: [PATCH] net.c: Combine remote_name() and __get_sock_name(). remote_name() is a simple wrapper, and it is the only caller of __get_sock_name(). This commit gets rid of the wrapper. --- net.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/net.c b/net.c index 7a987444..c28cf096 100644 --- a/net.c +++ b/net.c @@ -622,11 +622,9 @@ int generic_max_transport_msg_size(int sockfd) } /** - * Look up the local or remote side of a connected socket structure. + * Look up the remote side of a connected socket structure. * * \param fd The socket descriptor of the connected socket. - * \param getname Either \p getsockname() for local, or \p getpeername() for - * remote side. * * \return A static character string identifying hostname and port of the * chosen side in numeric host:port format. @@ -634,7 +632,7 @@ int generic_max_transport_msg_size(int sockfd) * \sa getsockname(2), getpeername(2), parse_url(), getnameinfo(3), * services(5), nsswitch.conf(5). */ -static char *__get_sock_name(int fd, typeof(getsockname) getname) +char *remote_name(int fd) { struct sockaddr_storage ss; const struct sockaddr *sa; @@ -643,7 +641,7 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname) static char output[sizeof(hbuf) + sizeof(sbuf) + 4]; int ret; - if (getname(fd, (struct sockaddr *)&ss, &sslen) < 0) { + if (getpeername(fd, (struct sockaddr *)&ss, &sslen) < 0) { PARA_ERROR_LOG("can not determine address from fd %d: %s\n", fd, strerror(errno)); snprintf(output, sizeof(output), "(unknown)"); @@ -663,19 +661,6 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname) return output; } -/** - * Look up the remote side of a connected socket structure. - * - * \param sockfd The file descriptor of the socket. - * - * \return A pointer to a static buffer containing hostname an port. This - * buffer must not be freed by the caller. - */ -char *remote_name(int sockfd) -{ - return __get_sock_name(sockfd, getpeername); -} - /** * Extract IPv4 or IPv6-mapped-IPv4 address from sockaddr_storage. * -- 2.39.5