X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=net.c;h=139071022df39290c34bd56df88ec37808258c47;hp=8a190ddaa05100190761a7eecd918d78a546bb4d;hb=6ceaf430c5d331db83b591ae02d9eef5c87a31df;hpb=015183e5aa7858d2988ff0c0fb9c997aadeeca0c diff --git a/net.c b/net.c index 8a190dda..13907102 100644 --- a/net.c +++ b/net.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Andre Noll + * Copyright (C) 2005 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -48,7 +48,7 @@ * \param netmask Value of the netmask part in \a cidr or the * default of 32 if not specified. * - * \return Pointer to \a addr if succesful, NULL on error. + * \return Pointer to \a addr if successful, NULL on error. * \sa RFC 4632 */ char *parse_cidr(const char *cidr, @@ -208,7 +208,7 @@ const char *stringify_port(int port, const char *transport) struct servent *se = getservbyport(htons(port), transport); if (se == NULL) - snprintf(service, sizeof(service), "%u", port); + snprintf(service, sizeof(service), "%d", port); else snprintf(service, sizeof(service), "%s", se->s_name); } @@ -601,7 +601,7 @@ static inline int estimated_header_overhead(const int af_type) * * \param sockfd The socket file descriptor. * - * The socket must be connected. See RFC 1122, 3.3.3. If the protocol familiy + * The socket must be connected. See RFC 1122, 3.3.3. If the protocol family * could not be determined, \p AF_INET is assumed. * * \return The maximum message size of the address family type. @@ -664,29 +664,12 @@ static char *__get_sock_name(int fd, typeof(getsockname) getname) } /** - * Look up the local side of a connected socket structure. + * 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. - * - * \sa remote_name(). - */ -char *local_name(int sockfd) -{ - return __get_sock_name(sockfd, getsockname); -} - -/** - * Look up the remote side of a connected socket structure. - * - * \param sockfd The file descriptor of the socket. - * - * \return Analogous to the return value of \ref local_name() but for the - * remote side. - * - * \sa local_name(). */ char *remote_name(int sockfd) {