From e39285b0306f17978a0316ad68bd7b3fb63906fa Mon Sep 17 00:00:00 2001 From: Stephen Heumann Date: Sun, 31 May 2015 21:39:51 -0500 Subject: [PATCH] Add missing inet_ntop function --- Makefile.common | 6 +- libtelnet/inet_ntop.c | 204 ++++++++++++++++++++++++++++++++++++++++++ libtelnet/inet_ntop.h | 1 + telnet/commands.c | 1 + 4 files changed, 211 insertions(+), 1 deletion(-) create mode 100644 libtelnet/inet_ntop.c create mode 100644 libtelnet/inet_ntop.h diff --git a/Makefile.common b/Makefile.common index 522fad7..b7605a9 100644 --- a/Makefile.common +++ b/Makefile.common @@ -13,7 +13,8 @@ LIBTELNET_SRCS = \ libtelnet/sra.c \ libtelnet/getaddrinfo.c \ libtelnet/strlcpy.c \ - libtelnet/vasprintf.c + libtelnet/vasprintf.c \ + libtelnet/inet_ntop.c # libtelnet/pk.c TELNET_SRCS = \ @@ -48,6 +49,9 @@ HEADERS = \ libtelnet/misc.h \ libtelnet/pk.h \ libtelnet/getaddrinfo.h \ + libtelnet/strlcpy.h \ + libtelnet/vasprintf.h \ + libtelnet/inet_ntop.h \ telnet/baud.h \ telnet/defines.h \ telnet/externs.h \ diff --git a/libtelnet/inet_ntop.c b/libtelnet/inet_ntop.c new file mode 100644 index 0000000..83c99b4 --- /dev/null +++ b/libtelnet/inet_ntop.c @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 1996-1999 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifdef __GNO__ + +#if defined(LIBC_SCCS) && !defined(lint) +static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $"; +#endif /* LIBC_SCCS and not lint */ +#include + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include "libtelnet/strlcpy.h" + +typedef int socklen_t; + +static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size); +#ifdef INET6 +static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size); +#endif + +/* const char * + * inet_ntop(af, src, dst, size) + * convert a network format address to presentation format. + * return: + * pointer to presentation format address (`dst'), or NULL (see errno). + * author: + * Paul Vixie, 1996. + */ +const char * +inet_ntop(int af, const void * src, char * dst, socklen_t size) +{ + switch (af) { + case AF_INET: + return (inet_ntop4(src, dst, size)); +#ifdef INET6 + case AF_INET6: + return (inet_ntop6(src, dst, size)); +#endif + default: + errno = EAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address + * return: + * `dst' (as a const) + * notes: + * (1) uses no statics + * (2) takes a u_char* not an in_addr as input + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop4(const u_char *src, char *dst, socklen_t size) +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[16 /*sizeof "255.255.255.255"*/]; + int l; + + l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); + if (l <= 0 || (socklen_t) l >= size) { + errno = ENOSPC; + return (NULL); + } + strlcpy(dst, tmp, size); + return (dst); +} + +#ifdef INET6 +/*% + * WARNING: Don't even consider trying to compile this on a system where + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. + */ + +/* const char * + * inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop6(const u_char *src, char *dst, socklen_t size) +{ + /* + * Note that int32_t and int16_t need only be "at least" large enough + * to contain a value of the specified size. On some systems, like + * Crays, there is no such thing as an integer variable with 16 bits. + * Keep this in mind if you think this function should have been coded + * to use pointer overlays. All the world's not a VAX. + */ + char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; + struct { int base, len; } best, cur; + u_int words[NS_IN6ADDRSZ / NS_INT16SZ]; + int i; + + /* + * Preprocess: + * Copy the input (bytewise) array into a wordwise array. + * Find the longest run of 0x00's in src[] for :: shorthanding. + */ + memset(words, '\0', sizeof words); + for (i = 0; i < NS_IN6ADDRSZ; i++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; + best.len = 0; + cur.base = -1; + cur.len = 0; + for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { + if (words[i] == 0) { + if (cur.base == -1) + cur.base = i, cur.len = 1; + else + cur.len++; + } else { + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + cur.base = -1; + } + } + } + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + } + if (best.base != -1 && best.len < 2) + best.base = -1; + + /* + * Format the result. + */ + tp = tmp; + for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) { + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && + i < (best.base + best.len)) { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 && (best.len == 6 || + (best.len == 7 && words[7] != 0x0001) || + (best.len == 5 && words[5] == 0xffff))) { + if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) { + errno = ENOSPC; + return (NULL); + } + tp += strlen(tp); + break; + } + tp += sprintf(tp, "%x", words[i]); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == + (NS_IN6ADDRSZ / NS_INT16SZ)) + *tp++ = ':'; + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((socklen_t)(tp - tmp) > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} +#endif + +#endif \ No newline at end of file diff --git a/libtelnet/inet_ntop.h b/libtelnet/inet_ntop.h new file mode 100644 index 0000000..26db41c --- /dev/null +++ b/libtelnet/inet_ntop.h @@ -0,0 +1 @@ +const char *inet_ntop(int af, const void * src, char * dst, int size); diff --git a/telnet/commands.c b/telnet/commands.c index c8fe8c1..1c91407 100644 --- a/telnet/commands.c +++ b/telnet/commands.c @@ -53,6 +53,7 @@ static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #include #ifdef __GNO__ # include "libtelnet/getaddrinfo.h" +# include "libtelnet/inet_ntop.h" #endif #include #include