X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=lib%2Fsockaddr.c;fp=lib%2Fsockaddr.c;h=0000000000000000000000000000000000000000;hb=b7a32e2d73e3ab1add8208d3e157f7269a31ef4d;hp=4e5872afe70f696fa30ad8261600fd5b383ba81d;hpb=ac902a8299ff4469b356836f431ead31c3377377;p=innduct.git diff --git a/lib/sockaddr.c b/lib/sockaddr.c deleted file mode 100644 index 4e5872a..0000000 --- a/lib/sockaddr.c +++ /dev/null @@ -1,47 +0,0 @@ -/* $Id: sockaddr.c 5381 2002-03-31 22:35:47Z rra $ -** -** Routines for manipulating sockaddr structs -*/ - -#include "config.h" -#include "clibrary.h" -#include "portable/socket.h" -#include - -#include "libinn.h" - -char *sprint_sockaddr(const struct sockaddr *sa) -{ -#ifdef HAVE_INET6 - static char buff[256]; - const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *) sa; - - *buff = '\0'; - if (sa->sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) { - struct sockaddr_in sin; - memcpy(&sin.sin_addr, sin6->sin6_addr.s6_addr + 12, - sizeof sin.sin_addr); - sin.sin_port = sin6->sin6_port; - sin.sin_family = AF_INET; -#ifdef HAVE_SOCKADDR_LEN - sin.sin_len = sizeof(struct sockaddr_in); -#endif - return inet_ntoa(sin.sin_addr); - } - getnameinfo(sa, SA_LEN(sa), buff, sizeof buff, NULL, 0, NI_NUMERICHOST); - - return buff; -#else - return inet_ntoa(((const struct sockaddr_in *)sa)->sin_addr); -#endif -} - -void make_sin(struct sockaddr_in *s, const struct in_addr *src) -{ - memset(s, 0, sizeof( struct sockaddr_in )); - s->sin_family = AF_INET; -#ifdef HAVE_SOCKADDR_LEN - s->sin_len = sizeof( struct sockaddr_in ); -#endif - s->sin_addr = *src; -}