diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | MODULES.html.sh | 1 | ||||
| -rw-r--r-- | lib/ChangeLog | 6 | ||||
| -rw-r--r-- | lib/inet_ntop.c | 209 | ||||
| -rw-r--r-- | lib/inet_ntop.h | 38 | ||||
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/inet_ntop.m4 | 16 | ||||
| -rw-r--r-- | modules/inet_ntop | 25 |
8 files changed, 307 insertions, 0 deletions
@@ -1,3 +1,10 @@ +2005-05-09 Yoann Vandoorselaere <yoann.v@prelude-ids.com> + Bruno Haible <bruno@clisp.org> + + * modules/inet_ntop: New file. + * MODULES.html.sh (Support for systems lacking POSIX:2001): Add + inet_ntop. + 2005-05-06 Paul Eggert <eggert@cs.ucla.edu> * modules/argmatch (Depends-on): Add stdbool. diff --git a/MODULES.html.sh b/MODULES.html.sh index 7e3f504522..14eac52f68 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1749,6 +1749,7 @@ func_all_modules () func_module gethostname func_module getsubopt func_module gettimeofday + func_module inet_ntop func_module mkdir func_module mkstemp func_module mkdtemp diff --git a/lib/ChangeLog b/lib/ChangeLog index d8ea5162f7..db3bf18849 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-05-09 Yoann Vandoorselaere <yoann.v@prelude-ids.com> + Bruno Haible <bruno@clisp.org> + + * inet_ntop.h: New file. + * inet_ntop.c: New file, from glibc with modifications. + 2005-05-08 Jim Meyering <jim@meyering.net> * classpath.c (PATH_SEPARATOR): Remove insignificant trailing blank. diff --git a/lib/inet_ntop.c b/lib/inet_ntop.c new file mode 100644 index 0000000000..c5d2eb0030 --- /dev/null +++ b/lib/inet_ntop.c @@ -0,0 +1,209 @@ +/* + * Copyright (c) 1996-1999 by Internet Software Consortium. + * Copyright (c) 2005 Free Software Foundation, Inc. + * + * 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 INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM 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. + */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +/* Specification. */ +#include "inet_ntop.h" + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#define NS_IN6ADDRSZ 16 +#define NS_INT16SZ 2 + +/* + * 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. + */ +typedef int verify_int_size[2 * sizeof(int) - 7]; + +#if HAVE_IPV4 +static const char *inet_ntop4 (const unsigned char *src, char *dst, socklen_t size); +#endif +#if HAVE_IPV6 +static const char *inet_ntop6 (const unsigned char *src, char *dst, socklen_t size); +#endif + + +/* 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(af, src, dst, size) + int af; + const void *src; + char *dst; + socklen_t size; +{ + switch (af) { + +#if HAVE_IPV4 + case AF_INET: + return (inet_ntop4(src, dst, size)); +#endif + +#if HAVE_IPV6 + case AF_INET6: + return (inet_ntop6(src, dst, size)); +#endif + default: + errno = EAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +#if HAVE_IPV4 + +/* 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(src, dst, size) + const unsigned char *src; + char *dst; + socklen_t size; +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; + + if (sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) > size) { + errno = ENOSPC; + return (NULL); + } + return strcpy(dst, tmp); +} + +#endif + +#if HAVE_IPV6 + +/* const char * + * inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop6(src, dst, size) + const unsigned 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; + unsigned 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 += 2) + words[i / 2] = (src[i] << 8) | src[i + 1]; + best.base = -1; + cur.base = -1; + 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 == 5 && words[5] == 0xffff))) { + if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) + 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); + } + return strcpy(dst, tmp); +} + +#endif diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h new file mode 100644 index 0000000000..d38d7737ee --- /dev/null +++ b/lib/inet_ntop.h @@ -0,0 +1,38 @@ +/* Convert internet address from internal to printable, presentable format. + Copyright (C) 2005 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> + +/* Converts an internet address from internal format to a printable, + presentable format. + AF is an internet address family, such as AF_INET or AF_INET6. + SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr' + (for AF_INET6). + DST points to a buffer having room for CNT bytes. + The printable representation of the address (in numeric form, not + surrounded by [...], no reverse DNS is done) is placed in DST, and + DST is returned. If an error occurs, the return value is NULL and + errno is set. If CNT bytes are not sufficient to hold the result, + the return value is NULL and errno is set to ENOSPC. A good value + for CNT is 46. */ + +#if !HAVE_INET_NTOP /* not already defined and declared in <arpa/inet.h> ? */ +extern const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); +#endif diff --git a/m4/ChangeLog b/m4/ChangeLog index 2368995d5d..2c7f7378ba 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-05-09 Yoann Vandoorselaere <yoann.v@prelude-ids.com> + Bruno Haible <bruno@clisp.org> + + * inet_ntop.m4: New file. + 2005-05-05 Paul Eggert <eggert@cs.ucla.edu> * getopt.m4 (gl_GETOPT): Check for Solaris 10 getopt, and avoid diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 new file mode 100644 index 0000000000..fea429e74b --- /dev/null +++ b/m4/inet_ntop.m4 @@ -0,0 +1,16 @@ +# inet_ntop.m4 serial 1 +dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_INET_NTOP], +[ + AC_REPLACE_FUNCS(inet_ntop) + gl_PREREQ_INET_NTOP +]) + +# Prerequisites of lib/inet_ntop.h and lib/inet_ntop.c. +AC_DEFUN([gl_PREREQ_INET_NTOP], [ + AC_REQUIRE([gl_SOCKET_FAMILIES]) +]) diff --git a/modules/inet_ntop b/modules/inet_ntop new file mode 100644 index 0000000000..1b793e85c1 --- /dev/null +++ b/modules/inet_ntop @@ -0,0 +1,25 @@ +Description: +Convert internet address from internal to printable, presentable format. + +Files: +lib/inet_ntop.h +lib/inet_ntop.c +m4/inet_ntop.m4 +m4/sockpfaf.m4 + +Depends-on: + +configure.ac: +gl_INET_NTOP + +Makefile.am: +lib_SOURCES += inet_ntop.h + +License: +LGPL + +Include: +"inet_ntop.h" + +Maintainer: +Yoann Vandoorselaere, glibc |