Backport of

inet/if_index.c

inet/inet6_scopeid_pton.c

inet/inet_mkadr.c

inet/tst-inet6_scopeid_pton.c

resolv/inet_pton.c

resolv/tst-inet_pton.c

up to and including this upstream commit on the 2.26 branch:

commit 77db8772bd3f6f2bbad697dcf46861ce310f5b95

Author: Florian Weimer <fweimer@redhat.com>

Date:   Thu Aug 10 16:06:52 2017 +0200

    __inet6_scopeid_pton: Remove attribute_hidden, internal_function

This change makes the inet_pton parser more strict for IPv6 addresses

(upstream bug 16637).  The stricter __inet6_scopeid_pton parser is not

effective yet with this patch because it is not used by the library yet.

diff --git a/include/arpa/inet.h b/include/arpa/inet.h

index 63ece7029aa1d417..c3f28f2baaa2ed66 100644

--- a/include/arpa/inet.h

+++ b/include/arpa/inet.h

@@ -7,6 +7,9 @@ libc_hidden_proto (__inet_aton)

 libc_hidden_proto (inet_aton)

 libc_hidden_proto (inet_ntop)

 libc_hidden_proto (inet_pton)

-libc_hidden_proto (inet_makeaddr)

+extern __typeof (inet_pton) __inet_pton;

+libc_hidden_proto (__inet_pton)

+extern __typeof (inet_makeaddr) __inet_makeaddr;

+libc_hidden_proto (__inet_makeaddr)

 libc_hidden_proto (inet_netof)

 #endif

diff --git a/include/net/if.h b/include/net/if.h

index 1d862260c7e83977..6c4cbc96c3733a01 100644

--- a/include/net/if.h

+++ b/include/net/if.h

@@ -4,9 +4,13 @@

 #ifndef _ISOMAC

 libc_hidden_proto (if_nametoindex)

+extern __typeof (if_nametoindex) __if_nametoindex;

+libc_hidden_proto (__if_nametoindex)

 libc_hidden_proto (if_indextoname)

 libc_hidden_proto (if_nameindex)

 libc_hidden_proto (if_freenameindex)

+extern __typeof (if_freenameindex) __if_freenameindex;

+libc_hidden_proto (__if_freenameindex)

 #endif

 #endif

diff --git a/inet/Makefile b/inet/Makefile

index 768df21b92534a31..4abf2ddf6dfff327 100644

--- a/inet/Makefile

+++ b/inet/Makefile

@@ -45,7 +45,7 @@ routines := htonl htons		\

 	    in6_addr getnameinfo if_index ifaddrs inet6_option \

 	    getipv4sourcefilter setipv4sourcefilter \

 	    getsourcefilter setsourcefilter inet6_opt inet6_rth \

-	    deadline

+	    inet6_scopeid_pton deadline

 aux := check_pf check_native ifreq

@@ -57,6 +57,10 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \

 # internal functions.

 tests-static += tst-deadline

+# tst-inet6_scopeid_pton also needs internal functions but does not

+# need to be linked statically.

+tests += tst-inet6_scopeid_pton

+

 include ../Rules

 ifeq ($(have-thread-library),yes)

diff --git a/inet/Versions b/inet/Versions

index 06507199a92b3c51..157559c44442259e 100644

--- a/inet/Versions

+++ b/inet/Versions

@@ -88,5 +88,8 @@ libc {

     # functions used in other libraries

     __internal_endnetgrent; __internal_getnetgrent_r;

     __internal_setnetgrent;

+

+   # Used from nscd.

+    __inet6_scopeid_pton;

   }

 }

diff --git a/inet/if_index.c b/inet/if_index.c

index 3d706766be62b91b..4604e0a35b890471 100644

--- a/inet/if_index.c

+++ b/inet/if_index.c

@@ -1,4 +1,4 @@

-/* Copyright (C) 1997,98,99,2000,02 Free Software Foundation, Inc.

+/* Copyright (C) 1997-2017 Free Software Foundation, Inc.

    This file is part of the GNU C Library.

    The GNU C Library is free software; you can redistribute it and/or

@@ -20,44 +20,41 @@

 #include <stddef.h>

 unsigned int

-if_nametoindex (const char *ifname)

+__if_nametoindex (const char *ifname)

 {

   __set_errno (ENOSYS);

   return 0;

 }

-libc_hidden_def (if_nametoindex)

+libc_hidden_def (__if_nametoindex)

+weak_alias (__if_nametoindex, if_nametoindex)

+libc_hidden_weak (if_nametoindex)

 stub_warning (if_nametoindex)

 char *

-if_indextoname (unsigned int ifindex, char *ifname)

+__if_indextoname (unsigned int ifindex, char *ifname)

 {

   __set_errno (ENOSYS);

   return NULL;

 }

-libc_hidden_def (if_indextoname)

+weak_alias (__if_indextoname, if_indextoname)

+libc_hidden_weak (if_indextoname)

 stub_warning (if_indextoname)

 void

-if_freenameindex (struct if_nameindex *ifn)

+__if_freenameindex (struct if_nameindex *ifn)

 {

 }

+libc_hidden_def (__if_freenameindex)

+weak_alias (__if_freenameindex, if_freenameindex)

+libc_hidden_weak (if_freenameindex)

 stub_warning (if_freenameindex)

 struct if_nameindex *

-if_nameindex (void)

+__if_nameindex (void)

 {

   __set_errno (ENOSYS);

   return NULL;

 }

+weak_alias (__if_nameindex, if_nameindex)

+libc_hidden_weak (if_nameindex)

 stub_warning (if_nameindex)

-

-#if 0

-void

-internal_function

-__protocol_available (int *have_inet, int *have_inet6)

-{

-  /* By default we assume that IPv4 is available, IPv6 not.  */

-  *have_inet = 1;

-  *have_inet6 = 0;

-}

-#endif

diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c

new file mode 100644

index 0000000000000000..cc8803fa108f7bcb

--- /dev/null

+++ b/inet/inet6_scopeid_pton.c

@@ -0,0 +1,64 @@

+/* Convert an IPv6 scope ID from text to the internal representation.

+   Copyright (C) 2016-2017 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Lesser General Public

+   License as published by the Free Software Foundation; either

+   version 2.1 of the License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Lesser General Public License for more details.

+

+   You should have received a copy of the GNU Lesser General Public

+   License along with the GNU C Library; if not, see

+   <http://www.gnu.org/licenses/>.  */

+

+#include <net-internal.h>

+

+#include <ctype.h>

+#include <errno.h>

+#include <locale.h>

+#include <net/if.h>

+#include <stdbool.h>

+#include <stdint.h>

+#include <stdlib.h>

+

+/* Parse SOURCE as a scope ID for ADDRESS.  Return 0 on success and -1

+   on error.  */

+int

+__inet6_scopeid_pton (const struct in6_addr *address, const char *scope,

+                      uint32_t *result)

+{

+  if (IN6_IS_ADDR_LINKLOCAL (address)

+      || IN6_IS_ADDR_MC_NODELOCAL (address)

+      || IN6_IS_ADDR_MC_LINKLOCAL (address))

+    {

+      uint32_t number = __if_nametoindex (scope);

+      if (number != 0)

+        {

+          *result = number;

+          return 0;

+        }

+    }

+

+  if (isdigit_l (scope[0], _nl_C_locobj_ptr))

+    {

+      char *end;

+      unsigned long long number

+        = ____strtoull_l_internal (scope, &end, /*base */ 10, /* group */ 0,

+                                   _nl_C_locobj_ptr);

+      if (*end == '\0' && number <= UINT32_MAX)

+        {

+          *result = number;

+          return 0;

+        }

+    }

+

+  __set_errno (EINVAL);

+  return -1;

+}

+

+libc_hidden_def (__inet6_scopeid_pton)

diff --git a/inet/inet_mkadr.c b/inet/inet_mkadr.c

index d8d92da768b2ede0..88faef74cf50b722 100644

--- a/inet/inet_mkadr.c

+++ b/inet/inet_mkadr.c

@@ -27,10 +27,6 @@

  * SUCH DAMAGE.

  */

-#if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";

-#endif /* LIBC_SCCS and not lint */

-

 #include <sys/param.h>

 #include <netinet/in.h>

 #include <arpa/inet.h>

@@ -40,8 +36,7 @@ static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";

  * building addresses stored in the ifnet structure.

  */

 struct in_addr

-inet_makeaddr(net, host)

-	in_addr_t net, host;

+__inet_makeaddr (in_addr_t net, in_addr_t host)

 {

 	struct in_addr in;

@@ -56,4 +51,5 @@ inet_makeaddr(net, host)

 	in.s_addr = htonl(in.s_addr);

 	return in;

 }

-libc_hidden_def (inet_makeaddr)

+libc_hidden_def (__inet_makeaddr)

+weak_alias (__inet_makeaddr, inet_makeaddr)

diff --git a/inet/net-internal.h b/inet/net-internal.h

index 58349f54ea126698..6c666752493811be 100644

--- a/inet/net-internal.h

+++ b/inet/net-internal.h

@@ -19,10 +19,15 @@

 #ifndef _NET_INTERNAL_H

 #define _NET_INTERNAL_H 1

+#include <arpa/inet.h>

 #include <stdbool.h>

 #include <stdint.h>

 #include <sys/time.h>

+int __inet6_scopeid_pton (const struct in6_addr *address,

+                          const char *scope, uint32_t *result);

+libc_hidden_proto (__inet6_scopeid_pton)

+

 /* Deadline handling for enforcing timeouts.

    Code should call __deadline_current_time to obtain the current time

diff --git a/inet/tst-inet6_scopeid_pton.c b/inet/tst-inet6_scopeid_pton.c

new file mode 100644

index 0000000000000000..8225b3b80abe6331

--- /dev/null

+++ b/inet/tst-inet6_scopeid_pton.c

@@ -0,0 +1,230 @@

+/* Tests for __inet6_scopeid_pton and IPv6 scopes in getaddrinfo.

+   Copyright (C) 2016-2017 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Lesser General Public

+   License as published by the Free Software Foundation; either

+   version 2.1 of the License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Lesser General Public License for more details.

+

+   You should have received a copy of the GNU Lesser General Public

+   License along with the GNU C Library; if not, see

+   <http://www.gnu.org/licenses/>.  */

+

+#include <arpa/inet.h>

+#include <inttypes.h>

+#include <net-internal.h>

+#include <net/if.h>

+#include <netdb.h>

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include <support/check.h>

+#include <support/support.h>

+#include <support/test-driver.h>

+

+/* An interface which is known to the system.  */

+static const char *interface_name;

+static uint32_t interface_index;

+

+/* Initiale the variables above.  */

+static void

+setup_interface (void)

+{

+  struct if_nameindex *list = if_nameindex ();

+  if (list != NULL && list[0].if_index != 0 && list[0].if_name[0] != '\0')

+    {

+      interface_name = list[0].if_name;

+      interface_index = list[0].if_index;

+    }

+}

+

+/* Convert ADDRESS to struct in6_addr.  */

+static struct in6_addr

+from_string (const char *address)

+{

+  struct in6_addr addr;

+  if (inet_pton (AF_INET6, address, &addr) != 1)

+    FAIL_EXIT1 ("inet_pton (\"%s\")", address);

+  return addr;

+}

+

+/* Invoke getaddrinfo to parse ADDRESS%SCOPE.  Return true if

+   getaddrinfo was successful.  */

+static bool

+call_gai (int family, const char *address, const char *scope,

+          struct sockaddr_in6 *result)

+{

+  struct addrinfo hints =

+    {

+      .ai_family = family,

+      .ai_flags = AI_NUMERICHOST,

+      .ai_socktype = SOCK_DGRAM,

+      .ai_protocol = IPPROTO_UDP,

+    };

+  char *fulladdr = xasprintf ("%s%%%s", address, scope);

+  struct addrinfo *ai = NULL;

+  int ret = getaddrinfo (fulladdr, NULL, &hints, &ai;;

+  if (ret == EAI_ADDRFAMILY || ret == EAI_NONAME)

+    {

+      if (test_verbose > 0)

+        printf ("info: getaddrinfo (\"%s\"): %s (%d)\n",

+                fulladdr, gai_strerror (ret), ret);

+      free (fulladdr);

+      return false;

+    }

+  if (ret != 0)

+    FAIL_EXIT1 ("getaddrinfo (\"%s\"): %s (%d)\n",

+                fulladdr, gai_strerror (ret), ret);

+  TEST_VERIFY_EXIT (ai != NULL);

+  TEST_VERIFY_EXIT (ai->ai_addrlen == sizeof (*result));

+  TEST_VERIFY (ai->ai_family == AF_INET6);

+  TEST_VERIFY (ai->ai_next == NULL);

+  memcpy (result, ai->ai_addr, sizeof (*result));

+  free (fulladdr);

+  freeaddrinfo (ai);

+  return true;

+}

+

+/* Verify that a successful call to getaddrinfo returned the expected

+   scope data.  */

+static void

+check_ai (const char *what, const char *addr_string, const char *scope_string,

+          const struct sockaddr_in6 *sa,

+          const struct in6_addr *addr, uint32_t scope)

+{

+  if (memcmp (addr, &sa->sin6_addr, sizeof (*addr)) != 0)

+    {

+      support_record_failure ();

+      printf ("error: getaddrinfo %s address mismatch for %s%%%s\n",

+              what, addr_string, scope_string);

+    }

+  if (sa->sin6_scope_id != scope)

+    {

+      support_record_failure ();

+      printf ("error: getaddrinfo %s scope mismatch for %s%%%s\n"

+              "  expected: %" PRIu32 "\n"

+              "  actual:   %" PRIu32 "\n",

+              what, addr_string, scope_string, scope, sa->sin6_scope_id);

+    }

+}

+

+/* Check a single address were we expected a failure.  */

+static void

+expect_failure (const char *address, const char *scope)

+{

+  if (test_verbose > 0)

+    printf ("info: expecting failure for %s%%%s\n", address, scope);

+  struct in6_addr addr = from_string (address);

+  uint32_t result = 1234;

+  if (__inet6_scopeid_pton (&addr, scope, &result) == 0)

+    {

+      support_record_failure ();

+      printf ("error: unexpected success for %s%%%s\n",

+              address, scope);

+    }

+  if (result != 1234)

+    {

+      support_record_failure ();

+      printf ("error: unexpected result update for %s%%%s\n",

+              address, scope);

+    }

+

+  struct sockaddr_in6 sa;

+  if (call_gai (AF_UNSPEC, address, scope, &sa))

+    {

+      support_record_failure ();

+      printf ("error: unexpected getaddrinfo success for %s%%%s (AF_UNSPEC)\n",

+              address, scope);

+    }

+  if (call_gai (AF_INET6, address, scope, &sa))

+    {

+      support_record_failure ();

+      printf ("error: unexpected getaddrinfo success for %s%%%s (AF_INET6)\n",

+              address, scope);

+    }

+}

+

+/* Check a single address were we expected a success.  */

+static void

+expect_success (const char *address, const char *scope, uint32_t expected)

+{

+  if (test_verbose > 0)

+    printf ("info: expecting success for %s%%%s\n", address, scope);

+  struct in6_addr addr = from_string (address);

+  uint32_t actual = expected + 1;

+  if (__inet6_scopeid_pton (&addr, scope, &actual) != 0)

+    {

+      support_record_failure ();

+      printf ("error: unexpected failure for %s%%%s\n",

+              address, scope);

+    }

+  if (actual != expected)

+    {

+      support_record_failure ();

+      printf ("error: unexpected result for for %s%%%s\n",

+              address, scope);

+      printf ("  expected: %" PRIu32 "\n", expected);

+      printf ("  actual:   %" PRIu32 "\n", actual);

+    }

+

+  struct sockaddr_in6 sa;

+  memset (&sa, 0xc0, sizeof (sa));

+  if (call_gai (AF_UNSPEC, address, scope, &sa))

+    check_ai ("AF_UNSPEC", address, scope, &sa, &addr, expected);

+  else

+    {

+      support_record_failure ();

+      printf ("error: unexpected getaddrinfo failure for %s%%%s (AF_UNSPEC)\n",

+              address, scope);

+    }

+  memset (&sa, 0xc0, sizeof (sa));

+  if (call_gai (AF_INET6, address, scope, &sa))

+    check_ai ("AF_INET6", address, scope, &sa, &addr, expected);

+  else

+    {

+      support_record_failure ();

+      printf ("error: unexpected getaddrinfo failure for %s%%%s (AF_INET6)\n",

+              address, scope);

+    }

+}

+

+static int

+do_test (void)

+{

+  setup_interface ();

+

+  static const char *test_addresses[]

+    = { "::", "::1", "2001:db8::1", NULL };

+  for (int i = 0; test_addresses[i] != NULL; ++i)

+    {

+      expect_success (test_addresses[i], "0", 0);

+      expect_success (test_addresses[i], "5555", 5555);

+

+      expect_failure (test_addresses[i], "");

+      expect_failure (test_addresses[i], "-1");

+      expect_failure (test_addresses[i], "-99");

+      expect_failure (test_addresses[i], "037777777777");

+      expect_failure (test_addresses[i], "0x");

+      expect_failure (test_addresses[i], "0x1");

+    }

+

+  if (interface_name != NULL)

+    {

+      expect_success ("fe80::1", interface_name, interface_index);

+      expect_success ("ff02::1", interface_name, interface_index);

+      expect_success ("ff01::1", interface_name, interface_index);

+      expect_failure ("::", interface_name);

+      expect_failure ("::1", interface_name);

+      expect_failure ("2001:db8::1", interface_name);

+    }

+

+  return 0;

+}

+

+#include <support/test-driver.c>

diff --git a/resolv/Makefile b/resolv/Makefile

index a86646d4ef61b77d..3f525bcc75ee83ae 100644

--- a/resolv/Makefile

+++ b/resolv/Makefile

@@ -29,7 +29,7 @@ headers	:= resolv.h \

 routines := herror inet_addr inet_ntop inet_pton nsap_addr res_init \

 	    res_hconf res_libc res-state

-tests = tst-aton tst-leaks tst-inet_ntop

+tests = tst-aton tst-leaks tst-inet_ntop tst-inet_pton

 xtests = tst-leaks2

 generate := mtrace-tst-leaks tst-leaks.mtrace tst-leaks2.mtrace

diff --git a/resolv/Versions b/resolv/Versions

index 152ef3f68f9a8b48..24b07ef770ed3915 100644

--- a/resolv/Versions

+++ b/resolv/Versions

@@ -29,6 +29,7 @@ libc {

     __h_errno; __resp;

     __res_maybe_init; __res_iclose;

+    __inet_pton_length;

   }

 }

diff --git a/resolv/inet_pton.c b/resolv/inet_pton.c

index c507013e4ea9a90b..16ee33e0c0dfb015 100644

--- a/resolv/inet_pton.c

+++ b/resolv/inet_pton.c

@@ -1,3 +1,20 @@

+/* Copyright (C) 1996-2017 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.

+

+   The GNU C Library is free software; you can redistribute it and/or

+   modify it under the terms of the GNU Lesser General Public

+   License as published by the Free Software Foundation; either

+   version 2.1 of the License, or (at your option) any later version.

+

+   The GNU C Library 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

+   Lesser General Public License for more details.

+

+   You should have received a copy of the GNU Lesser General Public

+   License along with the GNU C Library; if not, see

+   <http://www.gnu.org/licenses/>.  */

+

 /*

  * Copyright (c) 1996,1999 by Internet Software Consortium.

  *

@@ -15,207 +32,203 @@

  * SOFTWARE.

  */

-#if defined(LIBC_SCCS) && !defined(lint)

-static const char rcsid[] = "$BINDId: inet_pton.c,v 1.7 1999/10/13 16:39:28 vixie Exp $";

-#endif /* LIBC_SCCS and not lint */

-

-#include <sys/param.h>

-#include <sys/types.h>

-#include <sys/socket.h>

-#include <netinet/in.h>

 #include <arpa/inet.h>

 #include <arpa/nameser.h>

 #include <ctype.h>

-#include <string.h>

 #include <errno.h>

+#include <netinet/in.h>

+#include <resolv/resolv-internal.h>

+#include <string.h>

+#include <sys/socket.h>

+#include <sys/types.h>

-/*

- * 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, const char *src_end, u_char *dst);

+static int inet_pton6 (const char *src, const char *src_end, u_char *dst);

-static int inet_pton4 (const char *src, u_char *dst) internal_function;

-static int inet_pton6 (const char *src, u_char *dst) internal_function;

-

-/* 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(af, src, dst)

-	int af;

-	const char *src;

-	void *dst;

+__inet_pton_length (int af, const char *src, size_t srclen, void *dst)

 {

-	switch (af) {

-	case AF_INET:

-		return (inet_pton4(src, dst));

-	case AF_INET6:

-		return (inet_pton6(src, dst));

-	default:

-		__set_errno (EAFNOSUPPORT);

-		return (-1);

-	}

-	/* NOTREACHED */

+  switch (af)

+    {

+    case AF_INET:

+      return inet_pton4 (src, src + srclen, dst);

+    case AF_INET6:

+      return inet_pton6 (src, src + srclen, dst);

+    default:

+      __set_errno (EAFNOSUPPORT);

+      return -1;

+    }

 }

-libc_hidden_def (inet_pton)

-

-/* 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.

- */

+libc_hidden_def (__inet_pton_length)

+

+/* Like __inet_pton_length, but use strlen (SRC) as the length of

+   SRC.  */

+int

+__inet_pton (int af, const char *src, void *dst)

+{

+  return __inet_pton_length (af, src, strlen (src), dst);

+}

+libc_hidden_def (__inet_pton)

+weak_alias (__inet_pton, inet_pton)

+libc_hidden_weak (inet_pton)

+

+/* Like inet_aton but without all the hexadecimal, octal and shorthand

+   (and trailing garbage is not ignored).  Return 1 if SRC is a valid

+   dotted quad, else 0.  This function does not touch DST unless it's

+   returning 1.

+   Author: Paul Vixie, 1996.  */

 static int

-internal_function

-inet_pton4(src, dst)

-	const char *src;

-	u_char *dst;

+inet_pton4 (const char *src, const char *end, unsigned char *dst)

 {

-	int saw_digit, octets, ch;

-	u_char tmp[NS_INADDRSZ], *tp;

-

-	saw_digit = 0;

-	octets = 0;

-	*(tp = tmp) = 0;

-	while ((ch = *src++) != '\0') {

-

-		if (ch >= '0' && ch <= '9') {

-			u_int 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);

+  int saw_digit, octets, ch;

+  unsigned char tmp[NS_INADDRSZ], *tp;

+

+  saw_digit = 0;

+  octets = 0;

+  *(tp = tmp) = 0;

+  while (src < end)

+    {