From f876c3429fc9bcc30583ac6dd99674515b17b8ba Mon Sep 17 00:00:00 2001 From: llsth Date: Tue, 17 Mar 2015 09:57:03 +0100 Subject: [PATCH] Removed unused IPv6 reference --- atimed.h | 106 -------------------------------------------------- ntp_peerset.c | 2 - 2 files changed, 108 deletions(-) delete mode 100644 atimed.h diff --git a/atimed.h b/atimed.h deleted file mode 100644 index 8f69bb4..0000000 --- a/atimed.h +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2015 Carsten Larsen - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef ATIMED_H -#define ATIMED_H - -#if defined(AROS) || defined(AOS3) -#ifndef AMIGA -#define AMIGA -#endif -#endif - -#ifdef AOS3 -#include -#include -#define IPTR APTR -#define CONST_STRPTR STRPTR -#define ARGSPTR LONG* -#endif - -#ifdef AROS -#define ARGSPTR IPTR* -#endif - -#ifdef AOS3 -#include -#include -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -typedef unsigned long long uint64_t; -typedef uint32_t uintptr_t; - -#include -static inline double -round(double x) -{ - return x > 0.0 ? floor(x + 0.5) : ceil(x - 0.5); -} -#endif - -#define nan(p) 0./0. - -#ifdef AROS -#include -typedef uint32_t register_t; -#endif - -#ifdef AOS3 -#define ATIMER TIMERNAME -#endif - -#ifdef AROS -#define ATIMER (CONST_STRPTR)TIMERNAME -#endif - -#ifndef AF_INET6 -#define AF_INET6 10 -#endif - -#ifndef _ALIGNBYTES -#define _ALIGNBYTES (sizeof(register_t) - 1) -#define ALIGN(p) (((uintptr_t)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -#endif - -typedef unsigned int sa_family_t; -typedef unsigned int socklen_t; -typedef uint16_t in_port_t; - - -// General socket address holding structure, big enough to hold either -// struct sockaddr_in or struct sockaddr_in6 data: -struct sockaddr_storage { - sa_family_t ss_family; // address family - - // all this is padding, implementation specific, ignore it: - char __ss_pad1[128 - sizeof(sa_family_t)]; -}; - -void amiga_save_time(void); -#define Time_Amiga_Save amiga_save_time - -#endif diff --git a/ntp_peerset.c b/ntp_peerset.c index 182f70e..40cbb35 100644 --- a/ntp_peerset.c +++ b/ntp_peerset.c @@ -132,8 +132,6 @@ ntp_peerset_fillgroup(struct ocx *ocx, struct ntp_peerset *nps, Fail(ocx, 1, "hostname '%s', port '123': %s\n", lookup, gai_strerror(error)); for (res = res0; res; res = res->ai_next) { - if (res->ai_family != AF_INET && res->ai_family != AF_INET6) - continue; np = NTP_Peer_New(ng->hostname, res->ai_addr, res->ai_addrlen); AN(np); TAILQ_FOREACH(np2, &nps->head, list)