From: Danny Mayer Date: Thu, 24 Apr 2003 15:50:33 +0000 (-0400) Subject: Updates to handle IPv6 addresses for non-IPv6 capable systems. X-Git-Tag: NTP_4_1_80_RC1~35^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc213258fb5aa81beb51c5f63a22103c51d3dbf;p=thirdparty%2Fntp.git Updates to handle IPv6 addresses for non-IPv6 capable systems. bk: 3ea807c9JdKalWKy4zo_I9OpX5mzKg --- diff --git a/libisc/inet_ntop.c b/libisc/inet_ntop.c new file mode 100644 index 000000000..50677cdbc --- /dev/null +++ b/libisc/inet_ntop.c @@ -0,0 +1,196 @@ +/* + * Copyright (C) 1996-2001 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. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char rcsid[] = + "$Id: inet_ntop.c,v 1.13 2001/11/27 01:56:00 gson Exp $"; +#endif /* LIBC_SCCS and not lint */ + +#include + +#include +#include +#include + +#include + +#define NS_INT16SZ 2 +#define NS_IN6ADDRSZ 16 + +/* + * 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 unsigned char *src, char *dst, + size_t size); + +#ifdef AF_INET6 +static const char *inet_ntop6(const unsigned char *src, char *dst, + size_t size); +#endif + +/* char * + * isc_net_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 * +isc_net_ntop(int af, const void *src, char *dst, size_t size) +{ + switch (af) { + case AF_INET: + return (inet_ntop4(src, dst, size)); +#ifdef AF_INET6 + case AF_INET6: + return (inet_ntop6(src, dst, size)); +#endif + default: + errno = EAFNOSUPPORT; + return (NULL); + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address + * return: + * `dst' (as a const) + * notes: + * (1) uses no statics + * (2) takes a unsigned char* not an in_addr as input + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop4(const unsigned char *src, char *dst, size_t size) +{ + static const char *fmt = "%u.%u.%u.%u"; + char tmp[sizeof("255.255.255.255")]; + + if ((size_t)sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) >= size) + { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + + return (dst); +} + +/* const char * + * isc_inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +#ifdef AF_INET6 +static const char * +inet_ntop6(const unsigned 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; + 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++) + words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); + best.base = -1; + best.len = 0; + cur.base = -1; + cur.len = 0; + 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 ((size_t)(tp - tmp) > size) { + errno = ENOSPC; + return (NULL); + } + strcpy(dst, tmp); + return (dst); +} +#endif /* AF_INET6 */ diff --git a/libntp/Makefile.am b/libntp/Makefile.am index 8f67157a4..9b67d1b03 100644 --- a/libntp/Makefile.am +++ b/libntp/Makefile.am @@ -17,7 +17,7 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \ uglydate.c uinttoa.c utvtoa.c ymd2yd.c \ ../libisc/assertions.c ../libisc/error.c ../libisc/interfaceiter.c \ ../libisc/lib.c ../libisc/mem.c ../libisc/msgcat.c ../libisc/net.c \ - ../libisc/isc_strerror.c + ../libisc/isc_strerror.c ../libisc/inet_ntop.c libntp_a_SOURCES = systime.c $(libntp_a_SRCS) libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS) EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c diff --git a/libntp/log.c b/libntp/log.c index 02c6ae1e2..991b498e9 100644 --- a/libntp/log.c +++ b/libntp/log.c @@ -1,5 +1,10 @@ /* Microsoft Developer Support Copyright (c) 1993 Microsoft Corporation. */ +/* Skip asynch rpc inclusion */ +#ifndef __RPCASYNC_H__ +#define __RPCASYNC_H__ +#endif + #include #include #include diff --git a/libntp/socktoa.c b/libntp/socktoa.c index aaf125a60..39d32c4a8 100644 --- a/libntp/socktoa.c +++ b/libntp/socktoa.c @@ -1,6 +1,14 @@ /* * socktoa - return a numeric host name from a sockaddr_storage structure */ +#ifdef SYS_WINNT +/* Skip asynch rpc inclusion */ +#ifndef __RPCASYNC_H__ +#define __RPCASYNC_H__ +#endif +#include +#endif + #include #include #include @@ -8,6 +16,10 @@ #include +#ifndef HAVE_IPV6 +#include +#endif + #include #include "ntp_fp.h" @@ -15,13 +27,11 @@ #include "ntp_stdlib.h" #include "ntp.h" - char * socktoa( struct sockaddr_storage* sock ) { -#ifdef HAVE_IPV6 register char *buffer; LIB_GETBUF(buffer); @@ -40,7 +50,4 @@ socktoa( LIB_BUFLENGTH); } return buffer; -#else - return numtoa(GET_INADDR(*sock)); -#endif } diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c index 9564cbab0..12270c7e1 100644 --- a/ntpd/ntp_crypto.c +++ b/ntpd/ntp_crypto.c @@ -3597,8 +3597,7 @@ crypto_tai( tstamp_t fstamp; /* filestamp */ u_int len; char *ptr; - int rval; - u_int i; + int rval,i; #ifdef KERNEL_PLL #if NTP_API > 3 struct timex ntv; /* kernel interface structure */ @@ -3656,7 +3655,7 @@ crypto_tai( continue; if (sscanf(buf, "%u %u", &leapsec[i], &offset) != 2) continue; - if (i != offset - TAI_1972) { + if (i != (int)(offset - TAI_1972)) { break; } i++; diff --git a/ports/winnt/libntp/libntp.dsp b/ports/winnt/libntp/libntp.dsp index e302182b5..f381549f6 100644 --- a/ports/winnt/libntp/libntp.dsp +++ b/ports/winnt/libntp/libntp.dsp @@ -209,6 +209,10 @@ SOURCE=..\..\..\libntp\ieee754io.c # End Source File # Begin Source File +SOURCE=..\..\..\libisc\inet_ntop.c +# End Source File +# Begin Source File + SOURCE=..\libisc\interfaceiter.c # End Source File # Begin Source File @@ -433,6 +437,10 @@ SOURCE=..\include\arpa\inet.h # End Source File # Begin Source File +SOURCE=..\..\..\include\isc\interfaceiter.h +# End Source File +# Begin Source File + SOURCE=..\include\sys\ioctl.h # End Source File # Begin Source File