From: Marko Kreen Date: Tue, 15 Feb 2011 06:51:39 +0000 (+0200) Subject: socket: inet_pton() and inet_ntop() from openbsd X-Git-Url: http://git.postgresql.org/gitweb/static/developers.postgresql.org?a=commitdiff_plain;h=558ee6b56a5497c8e2eb132664cd354eaa83ac0c;p=libusual.git socket: inet_pton() and inet_ntop() from openbsd --- diff --git a/m4/usual.m4 b/m4/usual.m4 index ca3c9c0..19a05eb 100644 --- a/m4/usual.m4 +++ b/m4/usual.m4 @@ -139,7 +139,7 @@ dnl AC_DEFUN([AC_USUAL_FUNCTION_CHECK], [ ### Functions provided if missing AC_CHECK_FUNCS(basename dirname strlcpy strlcat getpeereid sigaction) -AC_CHECK_FUNCS(inet_ntop poll getline memrchr regcomp) +AC_CHECK_FUNCS(inet_ntop inet_pton poll getline memrchr regcomp) AC_CHECK_FUNCS(err errx warn warnx getprogname setprogname) AC_CHECK_FUNCS(posix_memalign memalign valloc) AC_CHECK_FUNCS(fls flsl flsll ffs ffsl ffsll) diff --git a/test/Makefile b/test/Makefile index f90f642..c955f77 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,7 +5,8 @@ SRCS = test_string.c test_crypto.c test_aatree.c test_heap.c \ test_utf8.c test_strpool.c test_pgutil.c test_regex.c \ test_cxalloc.c test_bits.c test_base.c test_netdb.c \ test_cfparser.c test_endian.c test_hashtab.c test_mdict.c \ - test_shlist.c test_time.c test_hashing.c test_fileutil.c + test_shlist.c test_time.c test_hashing.c test_fileutil.c \ + test_socket.c OBJS = $(addprefix obj/, $(SRCS:.c=.o)) HDRS = test_common.h test_config.h tinytest.h tinytest_macros.h LIBS = diff --git a/test/force_compat.sed b/test/force_compat.sed index f49f6bb..3f5fd4e 100644 --- a/test/force_compat.sed +++ b/test/force_compat.sed @@ -6,3 +6,5 @@ /DIRNAME/s,^,//, /REGCOMP/s,^,//, /GETADDRINFO_A/s,^,//, +/INET_NTOP/s,^,//, +/INET_PTON/s,^,//, diff --git a/test/test_common.c b/test/test_common.c index 09d0bfb..dad96ca 100644 --- a/test/test_common.c +++ b/test/test_common.c @@ -20,6 +20,7 @@ struct testgroup_t groups[] = { { "strpool/", strpool_tests }, { "pgutil/", pgutil_tests }, { "regex/", regex_tests }, + { "socket/", socket_tests }, { "netdb/", netdb_tests }, { "cfparser/", cfparser_tests }, { "mdict/", mdict_tests }, diff --git a/test/test_common.h b/test/test_common.h index 338d4dd..df55fc3 100644 --- a/test/test_common.h +++ b/test/test_common.h @@ -30,4 +30,5 @@ extern struct testcase_t shlist_tests[]; extern struct testcase_t time_tests[]; extern struct testcase_t hashing_tests[]; extern struct testcase_t fileutil_tests[]; +extern struct testcase_t socket_tests[]; diff --git a/test/test_socket.c b/test/test_socket.c new file mode 100644 index 0000000..3b139f5 --- /dev/null +++ b/test/test_socket.c @@ -0,0 +1,65 @@ +#include + +#include +#include + +#include "test_common.h" + +static const char *ntop(int af, const void *src) +{ + static char buf[128]; + const char *res; + res = inet_ntop(af, src, buf, sizeof(buf)); + return res ? res : "NULL"; +} + +static void test_ntop(void *z) +{ + static const uint8_t data[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; + str_check(ntop(AF_INET, data), "1.2.3.4"); + str_check(ntop(AF_INET6, data), "102:304:506:708:90a:b0c:d0e:f10"); +end:; +} + +static const char *pton(int af, const char *s) +{ + static char str[128]; + unsigned char buf[128]; + int res; + int len = (af == AF_INET) ? 4 : 16; + + memset(buf, 0xCC, sizeof(buf)); + + res = inet_pton(af, s, buf); + if (res < 0) return "EAFBAD"; + if (res == 0) return "FAIL"; + if (buf[len] != 0xCC || buf[len + 1] != 0xCC) + return "EOVER"; + if (buf[len - 1] == 0xCC || buf[0] == 0xCC) + return "EUNDER"; + + s = inet_ntop(af, buf, str, sizeof(str)); + return s ? s : "NULL"; +} + +static void test_pton(void *z) +{ + str_check(pton(AF_INET, "127.0.0.255"), "127.0.0.255"); + str_check(pton(AF_INET, "127.0.0"), "FAIL"); + str_check(pton(AF_INET, "127.1.1.a"), "FAIL"); + str_check(pton(AF_INET, "127.1.1.300"), "FAIL"); + + str_check(pton(AF_INET6, "0001:0002:ffff:4444:5555:6666:7777:8888"), "1:2:ffff:4444:5555:6666:7777:8888"); + str_check(pton(AF_INET6, "::"), "::"); + str_check(pton(AF_INET6, "F00F::5060"), "f00f::5060"); + str_check(pton(AF_INET6, "F00F::127.0.0.1"), "f00f::7f00:1"); + str_check(pton(AF_INET6, "::1:2:3:4:5:6:7:8"), "FAIL"); +end:; +} + +struct testcase_t socket_tests[] = { + { "inet_ntop", test_ntop }, + { "inet_pton", test_pton }, + END_OF_TESTCASES +}; + diff --git a/usual/base_win32.h b/usual/base_win32.h index a0ab919..058023a 100644 --- a/usual/base_win32.h +++ b/usual/base_win32.h @@ -28,6 +28,10 @@ #undef EAGAIN #define EAGAIN WSAEWOULDBLOCK // WSAEAGAIN +#ifndef EAFNOSUPPORT +#define EAFNOSUPPORT ENOSYS +#endif + /* dummy types / functions */ #define hstrerror strerror #define getuid() (6667) diff --git a/usual/socket.c b/usual/socket.c index 1b9f678..34b31dd 100644 --- a/usual/socket.c +++ b/usual/socket.c @@ -218,34 +218,6 @@ int getpeereid(int fd, uid_t *uid_p, gid_t *gid_p) #endif -#ifndef HAVE_INET_NTOP -const char *inet_ntop(int af, const void *src, char *dst, int dstlen) -{ - const unsigned char *p = src; - if (dstlen < 0) { - errno = EINVAL; - return NULL; - } - switch (af) { - case AF_INET: - snprintf(dst, dstlen, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]); - break; - case AF_INET6: - snprintf(dst, dstlen, - "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:" - "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", - p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], - p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]); - break; - default: - errno = EINVAL; - return NULL; - } - return dst; -} -#endif - - #ifndef HAVE_POLL /* * Emulate poll() with select() diff --git a/usual/socket.h b/usual/socket.h index 5660619..4f7ce5c 100644 --- a/usual/socket.h +++ b/usual/socket.h @@ -104,11 +104,17 @@ bool socket_set_keepalive(int fd, int onoff, int keepidle, int keepintvl, int ke const char *sa2str(const struct sockaddr *sa, char *buf, int buflen); #ifndef HAVE_INET_NTOP -#define inet_ntop(a,b,c,d) compat_inet_ntop(a,b,c,d) +#define inet_ntop(a,b,c,d) usual_inet_ntop(a,b,c,d) /** Compat: inet_ntop() */ const char *inet_ntop(int af, const void *src, char *dst, int cnt); #endif +#ifndef HAVE_INET_PTON +#define inet_pton(a,b,c) usual_inet_pton(a,b,c) +/** Compat: inet_pton() */ +int inet_pton(int af, const char *src, void *dst); +#endif + #ifndef HAVE_GETPEEREID #define getpeereid(a,b,c) compat_getpeereid(a,b,c) /** Get user id of UNIX socket peer */ diff --git a/usual/socket_ntop.c b/usual/socket_ntop.c new file mode 100644 index 0000000..0db6e4a --- /dev/null +++ b/usual/socket_ntop.c @@ -0,0 +1,209 @@ +/* $OpenBSD: inet_ntop.c,v 1.8 2008/12/09 19:38:38 otto Exp $ */ + +/* Copyright (c) 1996 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. + */ + +#include +#include + +#ifndef HAVE_INET_NTOP + +#ifndef INADDRSZ +#define INADDRSZ 4 +#endif +#ifndef IN6ADDRSZ +#define IN6ADDRSZ 16 +#endif +#ifndef INT16SZ +#define INT16SZ 2 +#endif + +typedef unsigned char u_char; +typedef unsigned int u_int; + +/* + * 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 const char *inet_ntop4(const u_char *src, char *dst, int size); +static const char *inet_ntop6(const u_char *src, char *dst, int size); + +/* 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, int size) +{ + if (size < 0) { + errno = ENOSPC; + return NULL; + } + switch (af) { + case AF_INET: + return (inet_ntop4(src, dst, size)); + case AF_INET6: + return (inet_ntop6(src, dst, size)); + default: + errno = EAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address, more or less like inet_ntoa() + * 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, int size) +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; + int l; + + l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); + if (l <= 0 || l >= size) { + errno = ENOSPC; + return (NULL); + } + strlcpy(dst, tmp, size); + return (dst); +} + +/* 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, int 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"]; + char *tp, *ep; + struct { int base, len; } best, cur; + u_int words[IN6ADDRSZ / INT16SZ]; + int i; + int advance; + + /* + * 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 < IN6ADDRSZ; i++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; + cur.base = -1; + for (i = 0; i < (IN6ADDRSZ / 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; + ep = tmp + sizeof(tmp); + for (i = 0; i < (IN6ADDRSZ / INT16SZ) && tp < ep; 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) { + if (tp + 1 >= ep) + return (NULL); + *tp++ = ':'; + } + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) { + if (tp + 1 >= ep) + return (NULL); + *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, (size_t)(ep - tp))) + return (NULL); + tp += strlen(tp); + break; + } + advance = snprintf(tp, ep - tp, "%x", words[i]); + if (advance <= 0 || advance >= ep - tp) + return (NULL); + tp += advance; + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) { + if (tp + 1 >= ep) + return (NULL); + *tp++ = ':'; + } + if (tp + 1 >= ep) + return (NULL); + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((tp - tmp) > size) { + errno = ENOSPC; + return (NULL); + } + strlcpy(dst, tmp, size); + return (dst); +} + +#endif diff --git a/usual/socket_pton.c b/usual/socket_pton.c new file mode 100644 index 0000000..98ee57a --- /dev/null +++ b/usual/socket_pton.c @@ -0,0 +1,223 @@ +/* $OpenBSD: inet_pton.c,v 1.8 2010/05/06 15:47:14 claudio Exp $ */ + +/* Copyright (c) 1996 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. + */ + +#include + +#ifndef HAVE_INET_PTON + +#ifndef INADDRSZ +#define INADDRSZ 4 +#endif +#ifndef IN6ADDRSZ +#define IN6ADDRSZ 16 +#endif +#ifndef INT16SZ +#define INT16SZ 2 +#endif + +typedef unsigned char u_char; +typedef unsigned int u_int; + +/* + * 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, u_char *dst); +static int inet_pton6(const char *src, u_char *dst); + +/* 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 *src, void *dst) +{ + switch (af) { + case AF_INET: + return (inet_pton4(src, dst)); + case AF_INET6: + return (inet_pton6(src, dst)); + default: + errno = EAFNOSUPPORT; + return (-1); + } + /* NOTREACHED */ +} + +/* int + * inet_pton4(src, dst) + * like inet_aton() but without all the hexadecimal 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 *src, u_char *dst) +{ + static const char digits[] = "0123456789"; + int saw_digit, octets, ch; + u_char tmp[INADDRSZ], *tp; + + saw_digit = 0; + octets = 0; + *(tp = tmp) = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr(digits, ch)) != NULL) { + u_int new = *tp * 10 + (pch - digits); + + if (new > 255) + return (0); + if (! saw_digit) { + if (++octets > 4) + return (0); + saw_digit = 1; + } + *tp = new; + } 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, INADDRSZ); + return (1); +} + +/* 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: + * does not touch `dst' unless it's returning 1. + * credit: + * inspired by Mark Andrews. + * author: + * Paul Vixie, 1996. + */ +static int +inet_pton6(const char *src, u_char *dst) +{ + static const char xdigits_l[] = "0123456789abcdef", + xdigits_u[] = "0123456789ABCDEF"; + u_char tmp[IN6ADDRSZ], *tp, *endp, *colonp; + const char *xdigits, *curtok; + int ch, saw_xdigit, count_xdigit; + u_int val; + + memset((tp = tmp), '\0', IN6ADDRSZ); + endp = tp + IN6ADDRSZ; + colonp = NULL; + /* Leading :: requires some special handling. */ + if (*src == ':') + if (*++src != ':') + return (0); + curtok = src; + saw_xdigit = count_xdigit = 0; + val = 0; + while ((ch = *src++) != '\0') { + const char *pch; + + if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL) + pch = strchr((xdigits = xdigits_u), ch); + if (pch != NULL) { + if (count_xdigit >= 4) + return (0); + val <<= 4; + val |= (pch - xdigits); + if (val > 0xffff) + return (0); + saw_xdigit = 1; + count_xdigit++; + continue; + } + if (ch == ':') { + curtok = src; + if (!saw_xdigit) { + if (colonp) + return (0); + colonp = tp; + continue; + } else if (*src == '\0') { + return (0); + } + if (tp + INT16SZ > endp) + return (0); + *tp++ = (u_char) (val >> 8) & 0xff; + *tp++ = (u_char) val & 0xff; + saw_xdigit = 0; + count_xdigit = 0; + val = 0; + continue; + } + if (ch == '.' && ((tp + INADDRSZ) <= endp) && + inet_pton4(curtok, tp) > 0) { + tp += INADDRSZ; + saw_xdigit = 0; + count_xdigit = 0; + break; /* '\0' was seen by inet_pton4(). */ + } + return (0); + } + if (saw_xdigit) { + if (tp + 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, IN6ADDRSZ); + return (1); +} + +#endif