From f5ebc40e02e60ed83dbff4d457121094336eaa46 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 4 Apr 2014 16:36:02 +0200 Subject: [PATCH] MinGW compatibility fixes --- Makefile.in | 2 - configure.ac | 14 ++- src/compat/inet_ntop.c | 200 ------------------------------------- src/compat/inet_ntop.h | 40 -------- src/compat/inet_pton.c | 222 ----------------------------------------- src/compat/inet_pton.h | 41 -------- src/config_win32.h | 5 +- src/rtp/net_udp.c | 2 - 8 files changed, 9 insertions(+), 517 deletions(-) delete mode 100644 src/compat/inet_ntop.c delete mode 100644 src/compat/inet_ntop.h delete mode 100644 src/compat/inet_pton.c delete mode 100644 src/compat/inet_pton.h diff --git a/Makefile.in b/Makefile.in index 17087de70..704aa7bdc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,8 +90,6 @@ OBJS = @OBJS@ \ src/capture_filter/scale.o \ src/compat/drand48.o \ src/compat/gettimeofday.o \ - src/compat/inet_ntop.o \ - src/compat/inet_pton.o \ src/compat/platform_semaphore.o \ src/compat/platform_spin.o \ src/compat/platform_time.o \ diff --git a/configure.ac b/configure.ac index a618d90ef..ea1b2caa7 100644 --- a/configure.ac +++ b/configure.ac @@ -356,8 +356,6 @@ AC_CHECK_LIB(rt, timer_create) AC_CHECK_FUNC(sin, MATHLIBS="", MATHLIBS="-lm") AC_CHECK_LIB(ieee, main, [MATHLIBS="-lieee $MATHLIBS"]) -AC_CHECK_FUNCS(inet_ntop) -AC_CHECK_FUNCS(inet_pton) AC_SUBST(MATHLIBS) # ------------------------------------------------------------------------------------------------- @@ -1831,23 +1829,23 @@ AC_PATH_PROG(NVCC, nvcc, [], [$PATH$PATH_SEPARATOR$CUDA_PATH/bin]dnl if test -n "$NVCC" then - CUDA_PATH=`dirname $NVCC` - CUDA_PATH=`dirname $CUDA_PATH` + CUDA_PATH=`dirname "$NVCC"` + CUDA_PATH=`dirname "$CUDA_PATH"` if test $system = Windows; then AC_CHECK_PROG([CL], [cl], [cl], []) - if test -n $CL; then + if test -n "$CL"; then FOUND_CUDA=yes fi else FOUND_CUDA=yes fi AC_MSG_CHECKING([CUDA Toolkit version - major]) - nvcc_major=`$NVCC --version |grep release|sed 's/^.*release \(@<:@0-9@:>@@<:@0-9@:>@*\).*$/\1/'` + nvcc_major=`"$NVCC" --version |grep release|sed 's/^.*release \(@<:@0-9@:>@@<:@0-9@:>@*\).*$/\1/'` AC_MSG_RESULT($nvcc_major) AC_MSG_CHECKING([CUDA Toolkit version - minor]) - nvcc_minor=`$NVCC --version |grep release|sed 's/^.*release @<:@0-9@:>@@<:@0-9@:>@*\.\(@<:@0-9@:>@@<:@0-9@:>@*\).*$/\1/'` + nvcc_minor=`"$NVCC" --version |grep release|sed 's/^.*release @<:@0-9@:>@@<:@0-9@:>@*\.\(@<:@0-9@:>@@<:@0-9@:>@*\).*$/\1/'` AC_MSG_RESULT($nvcc_minor) CUDA_INC=-I$CUDA_PATH/include @@ -1859,7 +1857,7 @@ then CUDA_LIB_PATH="$CUDA_PATH/lib" fi - CUDA_LIB="-L$CUDA_LIB_PATH -lcudart" + CUDA_LIB="-L\"$CUDA_LIB_PATH\" -lcudart" fi AC_SUBST(NVCC) diff --git a/src/compat/inet_ntop.c b/src/compat/inet_ntop.c deleted file mode 100644 index 7b9a840b5..000000000 --- a/src/compat/inet_ntop.c +++ /dev/null @@ -1,200 +0,0 @@ -/* - * 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. - * - * This is from the BIND 4.9.4 release, modified to compile by itself - * - * $Revision: 1.1 $ - * $Date: 2007/11/08 09:48:59 $ - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "config_unix.h" -#include "config_win32.h" -#endif // HAVE_CONFIG_H - -#ifndef HAVE_INET_NTOP -#include "inet_ntop.h" - -#define IN6ADDRSZ 16 -#define INT16SZ 2 - -#ifndef AF_INET6 -#define AF_INET6 AF_MAX+1 /* just to let this compile */ -#endif - -/* - * 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, size_t size); -static const char *inet_ntop6(const u_char * src, char *dst, size_t 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(af, src, dst, size) -int af; -const void *src; -char *dst; -size_t size; -{ - 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(src, dst, size) -const u_char *src; -char *dst; -size_t size; -{ - static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; - - sprintf(tmp, fmt, src[0], src[1], src[2], src[3]); - if ((size_t) strlen(tmp) > size) { - errno = ENOSPC; - return (NULL); - } - strcpy(dst, tmp); - 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(src, dst, size) -const u_char *src; -char *dst; -size_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; - uint32_t words[IN6ADDRSZ / 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 < 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; - for (i = 0; i < (IN6ADDRSZ / 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; - } - sprintf(tp, "%x", words[i]); - tp += strlen(tp); - } - /* Was it a trailing run of 0x00's? */ - if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) - *tp++ = ':'; - *tp++ = '\0'; - - /* - * Check for overflow, copy, and we're done. - */ - if ((size_t) (tp - tmp) > size) { - errno = ENOSPC; - return (NULL); - } - strcpy(dst, tmp); - return (dst); -} - -#endif diff --git a/src/compat/inet_ntop.h b/src/compat/inet_ntop.h deleted file mode 100644 index ce301ea43..000000000 --- a/src/compat/inet_ntop.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * 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. - * - * This is from the BIND 4.9.4 release, modified to compile by itself - * - * $Revision: 1.1 $ - * $Date: 2007/11/08 09:48:59 $ - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "config_unix.h" -#include "config_win32.h" -#endif /* HAVE_CONFIG_H */ - -#ifndef HAVE_INET_NTOP -#if defined(__cplusplus) -extern "C" { -#endif - -const char *inet_ntop(int af, const void *src, char *dst, size_t size); - -#if defined(__cplusplus) -} -#endif -#endif /* HAVE_INET_NTOP */ diff --git a/src/compat/inet_pton.c b/src/compat/inet_pton.c deleted file mode 100644 index c74e9991b..000000000 --- a/src/compat/inet_pton.c +++ /dev/null @@ -1,222 +0,0 @@ -/* - * 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. - * - * This is from the BIND 4.9.4 release, modified to compile by itself - * - * $Revision: 1.1 $ - * $Date: 2007/11/08 09:48:59 $ - * - */ - -#ifndef HAVE_INET_PTON -#include "config.h" -#include "config_unix.h" -#include "config_win32.h" -#include "inet_pton.h" - -#define IN6ADDRSZ 16 -#define INADDRSZ 4 -#define INT16SZ 2 - -#ifndef AF_INET6 -#define AF_INET6 AF_MAX+1 /* just to let this compile */ -#endif - -/* - * 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(af, src, dst) -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(src, dst) -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 = (char *)strchr(digits, ch)) != NULL) { - int new = *tp * 10 + (pch - digits); - - 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); - /* bcopy(tmp, dst, INADDRSZ); */ - 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: - * (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(src, dst) -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; - unsigned 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 = 0; - val = 0; - while ((ch = *src++) != '\0') { - const char *pch; - - if ((pch = (char *)strchr((xdigits = xdigits_l), ch)) == NULL) - pch = (char *)strchr((xdigits = xdigits_u), 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; - } - if (tp + INT16SZ > endp) - return (0); - *tp++ = (u_char) (val >> 8) & 0xff; - *tp++ = (u_char) val & 0xff; - saw_xdigit = 0; - val = 0; - continue; - } - if (ch == '.' && ((tp + INADDRSZ) <= endp) && - inet_pton4(curtok, tp) > 0) { - tp += INADDRSZ; - saw_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; - - for (i = 1; i <= n; i++) { - endp[-i] = colonp[n - i]; - colonp[n - i] = 0; - } - tp = endp; - } - if (tp != endp) - return (0); - /* bcopy(tmp, dst, IN6ADDRSZ); */ - memcpy(dst, tmp, IN6ADDRSZ); - return (1); -} - -#endif diff --git a/src/compat/inet_pton.h b/src/compat/inet_pton.h deleted file mode 100644 index 4ee9b6178..000000000 --- a/src/compat/inet_pton.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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. - * - * This is from the BIND 4.9.4 release, modified to compile by itself - * - * $Revision: 1.1 $ - * $Date: 2007/11/08 09:48:59 $ - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#include "config_unix.h" -#include "config_win32.h" -#endif /* HAVE_CONFIG_H */ - -#ifndef HAVE_INET_PTON -#if defined(__cplusplus) -extern "C" { -#endif - -int inet_pton(int af, const char *src, void *dst); - -#if defined(__cplusplus) -} -#endif -#endif /* HAVE_INET_PTON */ - diff --git a/src/config_win32.h b/src/config_win32.h index db511d60b..9dc144e81 100644 --- a/src/config_win32.h +++ b/src/config_win32.h @@ -251,8 +251,6 @@ void ShowMessage(int level, char *msg); // MinGW-w64 defines some broken macro for strtok_r in pthread.h #undef strtok_r -#include "compat/inet_ntop.h" -#include "compat/inet_pton.h" #include "compat/gettimeofday.h" #define gettimeofday gettimeofday_replacement @@ -275,5 +273,8 @@ static inline long sysconf_replacement(int name) { #define SHUT_WR SD_SEND #define SHUT_RDWR SD_BOTH +#define inet_pton InetPtonA +#define inet_ntop InetNtopA + #endif #endif diff --git a/src/rtp/net_udp.c b/src/rtp/net_udp.c index 1a50d988b..7054ff882 100644 --- a/src/rtp/net_udp.c +++ b/src/rtp/net_udp.c @@ -51,8 +51,6 @@ #include "config_win32.h" #include "debug.h" #include "memory.h" -#include "compat/inet_pton.h" -#include "compat/inet_ntop.h" #include "compat/platform_semaphore.h" #include "compat/vsnprintf.h" #include "net_udp.h"