[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
arpa_inet_h: new module, replaces inet_ntop
From: |
Simon Josefsson |
Subject: |
arpa_inet_h: new module, replaces inet_ntop |
Date: |
Fri, 16 Jun 2006 17:52:46 +0200 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) Emacs/22.0.50 (gnu/linux) |
Here is a module to provide an arpa/inet.h header file, which is
useful for mingw. Incidentally, mingw lack both inet_ntop and
inet_pon. What do you think about this? It would replace the
inet_ntop module, and lib/inet_ntop.h would be removed.
With this, files only need to #include <arpa/inet.h> for inet_ntop or
inet_pton, just like it should be.
I've tested this on i686-debian and i686-mingw.
/Simon
Index: lib/arpa_inet_.h
===================================================================
RCS file: lib/arpa_inet_.h
diff -N lib/arpa_inet_.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/arpa_inet_.h 16 Jun 2006 15:49:26 -0000
@@ -0,0 +1,62 @@
+/* Provide a arpa/inet.h header file for systems lacking it (e.g., Mingw).
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ Written by Simon Josefsson.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#ifndef _ARPA_INET_H
+#define _ARPA_INET_H
+
+/* This file is supposed to be used on platforms that lack
+ arpa/inet.h. It is intended to provide definitions and prototypes
+ needed by an application. */
+
+#include <sys/types.h>
+
+/* Get socklen_t. Also gets ntohl, htonl, etc on mingw, which should
+ be declared by this header file, since our sys/socket.h replacement
+ includes winsock2.h. */
+#include <sys/socket.h>
+
+/* The inet_ntop and inet_pton functions aren't universally available,
+ in particular Mingw doesn't have it. Declare them. */
+
+#if !HAVE_DECL_INET_NTOP
+/* 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.
+
+ For more details, see the POSIX:2001 specification
+ <http://www.opengroup.org/susv3xsh/inet_ntop.html>. */
+extern const char *inet_ntop (int af, const void *restrict src,
+ char *restrict dst, socklen_t cnt);
+#endif
+
+
+#if !HAVE_DECL_INET_PTON
+extern int inet_pton (int af, const char *restrict src,
+ void *restrict dst);
+#endif
+
+#endif /* _ARPA_INET_H */
Index: lib/inet_ntop.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/inet_ntop.c,v
retrieving revision 1.3
diff -u -p -r1.3 inet_ntop.c
--- lib/inet_ntop.c 28 Oct 2005 13:53:31 -0000 1.3
+++ lib/inet_ntop.c 16 Jun 2006 15:49:26 -0000
@@ -1,5 +1,5 @@
/* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
- Copyright (c) 2005 Free Software Foundation, Inc.
+ Copyright (c) 2005, 2006 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
@@ -37,7 +37,7 @@
#endif
/* Specification. */
-#include "inet_ntop.h"
+#include <arpa/inet.h>
#include <stdio.h>
#include <string.h>
@@ -56,9 +56,7 @@
*/
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
@@ -78,10 +76,8 @@ inet_ntop (int af, const void *restrict
{
switch (af)
{
-#if HAVE_IPV4
case AF_INET:
return (inet_ntop4 (src, dst, cnt));
-#endif
#if HAVE_IPV6
case AF_INET6:
@@ -95,8 +91,6 @@ inet_ntop (int af, const void *restrict
/* NOTREACHED */
}
-#if HAVE_IPV4
-
/* const char *
* inet_ntop4(src, dst, size)
* format an IPv4 address
@@ -127,8 +121,6 @@ inet_ntop4 (const unsigned char *src, ch
return strcpy (dst, tmp);
}
-#endif
-
#if HAVE_IPV6
/* const char *
Index: lib/inet_pton.c
===================================================================
RCS file: lib/inet_pton.c
diff -N lib/inet_pton.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/inet_pton.c 16 Jun 2006 15:49:26 -0000
@@ -0,0 +1,259 @@
+/* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
+ Copyright (c) 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+/*
+ * 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 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification. */
+#include <arpa/inet.h>
+
+#include <ctype.h>
+#include <string.h>
+#include <errno.h>
+
+#ifndef EAFNOSUPPORT
+# define EAFNOSUPPORT EINVAL
+#endif
+
+#define NS_INADDRSZ 4
+#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.
+ */
+
+static int inet_pton4 (const char *src, unsigned char *dst);
+#if HAVE_IPV6
+static int inet_pton6 (const char *src, unsigned char *dst);
+#endif
+
+/* int
+ * inet_pton(af, src, dst)
+ * convert from presentation format (which usually means ASCII printable)
+ * to network format (which is usually some kind of binary format).
+ * return:
+ * 1 if the address was valid for the specified address family
+ * 0 if the address wasn't valid (`dst' is untouched in this case)
+ * -1 if some other error occurred (`dst' is untouched in this case, too)
+ * author:
+ * Paul Vixie, 1996.
+ */
+int
+inet_pton (int af, const char *restrict src, void *restrict dst)
+{
+ switch (af)
+ {
+ case AF_INET:
+ return (inet_pton4 (src, dst));
+
+#if HAVE_IPV4
+ case AF_INET6:
+ return (inet_pton6 (src, dst));
+#endif
+
+ default:
+ errno = EAFNOSUPPORT;
+ return (-1);
+ }
+ /* NOTREACHED */
+}
+
+/* int
+ * inet_pton4(src, dst)
+ * like inet_aton() but without all the hexadecimal, octal (with the
+ * exception of 0) and shorthand.
+ * return:
+ * 1 if `src' is a valid dotted quad, else 0.
+ * notice:
+ * does not touch `dst' unless it's returning 1.
+ * author:
+ * Paul Vixie, 1996.
+ */
+static int
+inet_pton4 (const char *restrict src, unsigned char *restrict dst)
+{
+ int saw_digit, octets, ch;
+ unsigned char tmp[NS_INADDRSZ], *tp;
+
+ saw_digit = 0;
+ octets = 0;
+ *(tp = tmp) = 0;
+ while ((ch = *src++) != '\0')
+ {
+
+ if (ch >= '0' && ch <= '9')
+ {
+ unsigned new = *tp * 10 + (ch - '0');
+
+ if (saw_digit && *tp == 0)
+ return (0);
+ if (new > 255)
+ return (0);
+ *tp = new;
+ if (!saw_digit)
+ {
+ if (++octets > 4)
+ return (0);
+ saw_digit = 1;
+ }
+ }
+ else if (ch == '.' && saw_digit)
+ {
+ if (octets == 4)
+ return (0);
+ *++tp = 0;
+ saw_digit = 0;
+ }
+ else
+ return (0);
+ }
+ if (octets < 4)
+ return (0);
+ memcpy (dst, tmp, NS_INADDRSZ);
+ return (1);
+}
+
+#if HAVE_IPV6
+
+/* int
+ * inet_pton6(src, dst)
+ * convert presentation level address to network order binary form.
+ * return:
+ * 1 if `src' is a valid [RFC1884 2.2] address, else 0.
+ * notice:
+ * (1) does not touch `dst' unless it's returning 1.
+ * (2) :: in a full address is silently ignored.
+ * credit:
+ * inspired by Mark Andrews.
+ * author:
+ * Paul Vixie, 1996.
+ */
+static int
+inet_pton6 (const char *restrict src, unsigned char *restrict dst)
+{
+ static const char xdigits[] = "0123456789abcdef";
+ unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
+ const char *curtok;
+ int ch, saw_xdigit;
+ unsigned val;
+
+ tp = memset (tmp, '\0', NS_IN6ADDRSZ);
+ endp = tp + NS_IN6ADDRSZ;
+ colonp = NULL;
+ /* Leading :: requires some special handling. */
+ if (*src == ':')
+ if (*++src != ':')
+ return (0);
+ curtok = src;
+ saw_xdigit = 0;
+ val = 0;
+ while ((ch = tolower (*src++)) != '\0')
+ {
+ const char *pch;
+
+ pch = strchr (xdigits, ch);
+ if (pch != NULL)
+ {
+ val <<= 4;
+ val |= (pch - xdigits);
+ if (val > 0xffff)
+ return (0);
+ saw_xdigit = 1;
+ continue;
+ }
+ if (ch == ':')
+ {
+ curtok = src;
+ if (!saw_xdigit)
+ {
+ if (colonp)
+ return (0);
+ colonp = tp;
+ continue;
+ }
+ else if (*src == '\0')
+ {
+ return (0);
+ }
+ if (tp + NS_INT16SZ > endp)
+ return (0);
+ *tp++ = (u_char) (val >> 8) & 0xff;
+ *tp++ = (u_char) val & 0xff;
+ saw_xdigit = 0;
+ val = 0;
+ continue;
+ }
+ if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
+ inet_pton4 (curtok, tp) > 0)
+ {
+ tp += NS_INADDRSZ;
+ saw_xdigit = 0;
+ break; /* '\0' was seen by inet_pton4(). */
+ }
+ return (0);
+ }
+ if (saw_xdigit)
+ {
+ if (tp + NS_INT16SZ > endp)
+ return (0);
+ *tp++ = (u_char) (val >> 8) & 0xff;
+ *tp++ = (u_char) val & 0xff;
+ }
+ if (colonp != NULL)
+ {
+ /*
+ * Since some memmove()'s erroneously fail to handle
+ * overlapping regions, we'll do the shift by hand.
+ */
+ const int n = tp - colonp;
+ int i;
+
+ if (tp == endp)
+ return (0);
+ for (i = 1; i <= n; i++)
+ {
+ endp[-i] = colonp[n - i];
+ colonp[n - i] = 0;
+ }
+ tp = endp;
+ }
+ if (tp != endp)
+ return (0);
+ memcpy (dst, tmp, NS_IN6ADDRSZ);
+ return (1);
+}
+#endif
Index: m4/arpa_inet_h.m4
===================================================================
RCS file: m4/arpa_inet_h.m4
diff -N m4/arpa_inet_h.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ m4/arpa_inet_h.m4 16 Jun 2006 15:49:26 -0000
@@ -0,0 +1,45 @@
+# arpa_inet_h.m4 serial 1
+dnl Copyright (C) 2006 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.
+
+dnl From Simon Josefsson.
+
+AC_DEFUN([gl_HEADER_ARPA_INET],
+[
+ # Do we need to create the arpa/inet.h file?
+ AC_CHECK_HEADERS_ONCE([arpa/inet.h])
+ if test $ac_cv_header_arpa_inet_h = yes; then
+ ARPA_INET_H=''
+ else
+ dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
+ dnl the check for those headers unconditional; yet cygwin reports
+ dnl that the headers are present but cannot be compiled (since on
+ dnl cygwin, all socket information should come from sys/socket.h).
+ AC_CHECK_HEADERS([ws2tcpip.h])
+ ARPA_INET_H='arpa/inet.h'
+ gl_PREREQ_ARPA_INET
+ fi
+ AC_SUBST(ARPA_INET_H)
+
+ # Do we need to provide our own inet_ntop and inet_pton too?
+ AC_REPLACE_FUNCS(inet_ntop)
+ AC_REPLACE_FUNCS(inet_pton)
+ if test $ac_cv_func_inet_ntop = no -o $ac_cv_func_inet_pton = no; then
+ gl_PREREQ_INET_NTOP
+ fi
+])
+
+# Prerequisites of arpa/inet.h.
+AC_DEFUN([gl_PREREQ_ARPA_INET], [
+ AC_CHECK_DECLS([inet_ntop, inet_pton],,,[
+#include <sys/types.h>
+#include <sys/socket.h>])
+])
+
+# Prerequisites of lib/inet_ntop.c and lib/inet_pton.c.
+AC_DEFUN([gl_PREREQ_INET_NTOP], [
+ AC_REQUIRE([gl_SOCKET_FAMILIES])
+ :
+])
Index: modules/arpa_inet
===================================================================
RCS file: modules/arpa_inet
diff -N modules/arpa_inet
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/arpa_inet 16 Jun 2006 15:49:26 -0000
@@ -0,0 +1,41 @@
+Description:
+A <arpa/inet.h> for systems lacking it (e.g., Mingw), and related functions.
+
+Files:
+lib/arpa_inet_.h
+lib/inet_ntop.c
+lib/inet_pton.c
+m4/arpa_inet_h.m4
+m4/sockpfaf.m4
+
+Depends-on:
+restrict
+socklen
+sys_socket
+
+configure.ac:
+gl_HEADER_ARPA_INET
+
+Makefile.am:
+BUILT_SOURCES += $(ARPA_INET_H)
+EXTRA_DIST += arpa_inet_.h
+
+# We need the following in order to create <sys/socket.h> when the system
+# doesn't have one that works with the given compiler.
+arpa/inet.h: arpa_inet_.h
+ test -d arpa || mkdir arpa
+ cp $(srcdir)/arpa_inet_.h address@hidden
+ mv address@hidden $@
+MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
+
+mostlyclean-local:
+ -rmdir arpa 2>/dev/null
+
+Include:
+#include <arpa/inet.h>
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson, Yoann Vandoorselaere, glibc
- arpa_inet_h: new module, replaces inet_ntop,
Simon Josefsson <=