X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=5d7c3fef7d15a5c2c58d380f5f0412bb493deb4a;hp=e21f40293e591831dfcc64c7f4b236010e6e60b3;hb=35bbbf736c75f13c2bf9f6d6bdc2feecd42072cb;hpb=bbea823f656bff170f190a094b8e3da0cdca2c46 diff --git a/net.c b/net.c index e21f4029..5d7c3fef 100644 --- a/net.c +++ b/net.c @@ -268,7 +268,7 @@ int para_listen(unsigned l3type, unsigned l4type, unsigned short port) * * \sa getnameinfo(3). */ -char *host_and_port(struct sockaddr *sa, socklen_t len) +static char *host_and_port(struct sockaddr *sa, socklen_t len) { static char output[NI_MAXHOST + NI_MAXSERV + 2]; char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; @@ -276,12 +276,12 @@ char *host_and_port(struct sockaddr *sa, socklen_t len) ret = getnameinfo(sa, len, hbuf, sizeof(hbuf), sbuf, sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV); - if (ret) { - PARA_WARNING_LOG("hostname lookup error (%s).\n", gai_strerror(ret)); + if (ret) { + PARA_WARNING_LOG("hostname lookup error (%s).\n", + gai_strerror(ret)); sprintf(output, "(unknown)"); - } else { + } else sprintf(output, "%s#%s", hbuf, sbuf); - } return output; } @@ -312,7 +312,7 @@ static char *__get_sock_name(int fd, int (*getname)(int, struct sockaddr*, return host_and_port((struct sockaddr *)&ss, sslen); } -char *local_name(int sockfd) +char *local_name(int sockfd) { return __get_sock_name(sockfd, getsockname); }