[ntpsec commit] ISC sockaddr code is no longer used; discard it.
Eric S. Raymond
esr at ntpsec.org
Tue Oct 20 10:38:00 UTC 2015
Module: ntpsec
Branch: master
Commit: dc74222d6ffcc40b91bd1db94b9b80433e37e64e
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=dc74222d6ffcc40b91bd1db94b9b80433e37e64e
Author: Eric S. Raymond <esr at thyrsus.com>
Date: Tue Oct 20 06:37:20 2015 -0400
ISC sockaddr code is no longer used; discard it.
---
lib/isc/include/isc/sockaddr.h | 168 -----------
lib/isc/sockaddr.c | 361 -----------------------
lib/isc/win32/libisc.def | 19 --
lib/isc/win32/libisc.dsp | 4 -
lib/isc/win32/libisc.mak | 18 --
lib/isc/wscript | 1 -
ports/winnt/vs2005/libntp.vcproj | 4 -
ports/winnt/vs2008/libntp/libntp.vcproj | 4 -
ports/winnt/vs2013/libntp/libntp.vcxproj | 1 -
ports/winnt/vs2013/libntp/libntp.vcxproj.filters | 3 -
10 files changed, 583 deletions(-)
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 3224c27..8f004f0 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -35,172 +35,4 @@ typedef ISC_LIST(struct isc_sockaddr) isc_sockaddrlist_t;
#define ISC_SOCKADDR_CMPSCOPEZERO 0x0008 /*%< when comparing scopes
* zero scopes always match */
-ISC_LANG_BEGINDECLS
-
-bool
-isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
- unsigned int flags);
-/*%<
- * Compare the elements of the two address ('a' and 'b') as specified
- * by 'flags' and report if they are equal or not.
- *
- * 'flags' is set from ISC_SOCKADDR_CMP*.
- */
-
-bool
-isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b);
-/*%<
- * Return true iff the socket addresses 'a' and 'b' are equal.
- */
-
-bool
-isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b);
-/*%<
- * Return true iff the address parts of the socket addresses
- * 'a' and 'b' are equal, ignoring the ports.
- */
-
-bool
-isc_sockaddr_eqaddrprefix(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
- unsigned int prefixlen);
-/*%<
- * Return true iff the most significant 'prefixlen' bits of the
- * socket addresses 'a' and 'b' are equal, ignoring the ports.
- * If 'b''s scope is zero then 'a''s scope will be ignored.
- */
-
-unsigned int
-isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only);
-/*%<
- * Return a hash value for the socket address 'sockaddr'. If 'address_only'
- * is true, the hash value will not depend on the port.
- *
- * IPv6 addresses containing mapped IPv4 addresses generate the same hash
- * value as the equivalent IPv4 address.
- */
-
-void
-isc_sockaddr_any(isc_sockaddr_t *sockaddr);
-/*%<
- * Return the IPv4 wildcard address.
- */
-
-void
-isc_sockaddr_any6(isc_sockaddr_t *sockaddr);
-/*%<
- * Return the IPv6 wildcard address.
- */
-
-void
-isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int family);
-/*%<
- * Set '*sockaddr' to the wildcard address of protocol family
- * 'family'.
- *
- * Requires:
- * \li 'family' is AF_INET or AF_INET6.
- */
-
-void
-isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
- in_port_t port);
-/*%<
- * Construct an isc_sockaddr_t from an IPv4 address and port.
- */
-
-void
-isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
- in_port_t port);
-/*%<
- * Construct an isc_sockaddr_t from an IPv6 address and port.
- */
-
-void
-isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
- in_port_t port);
-/*%<
- * Construct an IPv6 isc_sockaddr_t representing a mapped IPv4 address.
- */
-
-void
-isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
- in_port_t port);
-/*%<
- * Construct an isc_sockaddr_t from an isc_netaddr_t and port.
- */
-
-int
-isc_sockaddr_pf(const isc_sockaddr_t *sockaddr);
-/*%<
- * Get the protocol family of 'sockaddr'.
- *
- * Requires:
- *
- *\li 'sockaddr' is a valid sockaddr with an address family of AF_INET
- * or AF_INET6.
- *
- * Returns:
- *
- *\li The protocol family of 'sockaddr', e.g. PF_INET or PF_INET6.
- */
-
-void
-isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port);
-/*%<
- * Set the port of 'sockaddr' to 'port'.
- */
-
-in_port_t
-isc_sockaddr_getport(const isc_sockaddr_t *sockaddr);
-/*%<
- * Get the port stored in 'sockaddr'.
- */
-
-isc_result_t
-isc_sockaddr_totext(const isc_sockaddr_t *sockaddr, isc_buffer_t *target);
-/*%<
- * Append a text representation of 'sockaddr' to the buffer 'target'.
- * The text will include both the IP address (v4 or v6) and the port.
- * The text is null terminated, but the terminating null is not
- * part of the buffer's used region.
- *
- * Returns:
- * \li ISC_R_SUCCESS
- * \li ISC_R_NOSPACE The text or the null termination did not fit.
- */
-
-void
-isc_sockaddr_format(const isc_sockaddr_t *sa, char *array, unsigned int size);
-/*%<
- * Format a human-readable representation of the socket address '*sa'
- * into the character array 'array', which is of size 'size'.
- * The resulting string is guaranteed to be null-terminated.
- */
-
-bool
-isc_sockaddr_ismulticast(const isc_sockaddr_t *sa);
-/*%<
- * Returns #true if the address is a multicast address.
- */
-
-bool
-isc_sockaddr_isexperimental(const isc_sockaddr_t *sa);
-/*
- * Returns true if the address is a experimental (CLASS E) address.
- */
-
-bool
-isc_sockaddr_islinklocal(const isc_sockaddr_t *sa);
-/*%<
- * Returns true if the address is a link local address.
- */
-
-bool
-isc_sockaddr_issitelocal(const isc_sockaddr_t *sa);
-/*%<
- * Returns true if the address is a sitelocal address.
- */
-
-ISC_LANG_ENDDECLS
-
#endif /* GUARD_ISC_SOCKADDR_H */
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
deleted file mode 100644
index eee0566..0000000
--- a/lib/isc/sockaddr.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright (C) 2004-2007, 2010-2012 Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2003 Internet Software Consortium.
- * Copyright 2015 by the NTPsec project contributors
- * SPDX-License-Identifier: ISC
- */
-
-/*! \file */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/hash.h>
-#include <isc/netaddr.h>
-#include <isc/sockaddr.h>
-#include <isc/util.h>
-
-bool
-isc_sockaddr_equal(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
- return (isc_sockaddr_compare(a, b, ISC_SOCKADDR_CMPADDR|
- ISC_SOCKADDR_CMPPORT|
- ISC_SOCKADDR_CMPSCOPE));
-}
-
-bool
-isc_sockaddr_eqaddr(const isc_sockaddr_t *a, const isc_sockaddr_t *b) {
- return (isc_sockaddr_compare(a, b, ISC_SOCKADDR_CMPADDR|
- ISC_SOCKADDR_CMPSCOPE));
-}
-
-bool
-isc_sockaddr_compare(const isc_sockaddr_t *a, const isc_sockaddr_t *b,
- unsigned int flags)
-{
- REQUIRE(a != NULL && b != NULL);
-
- if (a->length != b->length)
- return (false);
-
- /*
- * We don't just memcmp because the sin_zero field isn't always
- * zero.
- */
-
- if (a->type.sa.sa_family != b->type.sa.sa_family)
- return (false);
- switch (a->type.sa.sa_family) {
- case AF_INET:
- if ((flags & ISC_SOCKADDR_CMPADDR) != 0 &&
- memcmp(&a->type.sin.sin_addr, &b->type.sin.sin_addr,
- sizeof(a->type.sin.sin_addr)) != 0)
- return (false);
- if ((flags & ISC_SOCKADDR_CMPPORT) != 0 &&
- a->type.sin.sin_port != b->type.sin.sin_port)
- return (false);
- break;
- case AF_INET6:
- if ((flags & ISC_SOCKADDR_CMPADDR) != 0 &&
- memcmp(&a->type.sin6.sin6_addr, &b->type.sin6.sin6_addr,
- sizeof(a->type.sin6.sin6_addr)) != 0)
- return (false);
-#ifdef ISC_PLATFORM_HAVESCOPEID
- /*
- * If ISC_SOCKADDR_CMPSCOPEZERO is set then don't return
- * false if one of the scopes in zero.
- */
- if ((flags & ISC_SOCKADDR_CMPSCOPE) != 0 &&
- a->type.sin6.sin6_scope_id != b->type.sin6.sin6_scope_id &&
- ((flags & ISC_SOCKADDR_CMPSCOPEZERO) == 0 ||
- (a->type.sin6.sin6_scope_id != 0 &&
- b->type.sin6.sin6_scope_id != 0)))
- return (false);
-#endif
- if ((flags & ISC_SOCKADDR_CMPPORT) != 0 &&
- a->type.sin6.sin6_port != b->type.sin6.sin6_port)
- return (false);
- break;
- default:
- if (memcmp(&a->type, &b->type, a->length) != 0)
- return (false);
- }
- return (true);
-}
-
-unsigned int
-isc_sockaddr_hash(const isc_sockaddr_t *sockaddr, bool address_only) {
- unsigned int length = 0;
- const unsigned char *s = NULL;
- unsigned int h = 0;
- unsigned int g;
- unsigned int p = 0;
- const struct in6_addr *in6;
-
- REQUIRE(sockaddr != NULL);
-
- switch (sockaddr->type.sa.sa_family) {
- case AF_INET:
- s = (const unsigned char *)&sockaddr->type.sin.sin_addr;
- p = ntohs(sockaddr->type.sin.sin_port);
- length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
- break;
- case AF_INET6:
- in6 = &sockaddr->type.sin6.sin6_addr;
- if (IN6_IS_ADDR_V4MAPPED(in6)) {
- s = (const unsigned char *)&in6 + 12;
- length = sizeof(sockaddr->type.sin.sin_addr.s_addr);
- } else {
- s = (const unsigned char *)in6;
- length = sizeof(sockaddr->type.sin6.sin6_addr);
- }
- p = ntohs(sockaddr->type.sin6.sin6_port);
- break;
- default:
- UNEXPECTED_ERROR(__FILE__, __LINE__,
- "unknown address family: %d",
- (int)sockaddr->type.sa.sa_family);
- s = (const unsigned char *)&sockaddr->type;
- length = sockaddr->length;
- p = 0;
- }
-
- h = isc_hash_calc(s, length, true);
- if (!address_only) {
- g = isc_hash_calc((const unsigned char *)&p, sizeof(p),
- true);
- h = h ^ g; /* XXX: we should concatenate h and p first */
- }
-
- return (h);
-}
-
-void
-isc_sockaddr_any(isc_sockaddr_t *sockaddr)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin.sin_family = AF_INET;
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
- sockaddr->type.sin.sin_addr.s_addr = INADDR_ANY;
- sockaddr->type.sin.sin_port = 0;
- sockaddr->length = sizeof(sockaddr->type.sin);
- ISC_LINK_INIT(sockaddr, link);
-}
-
-void
-isc_sockaddr_any6(isc_sockaddr_t *sockaddr)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
- sockaddr->type.sin6.sin6_addr = in6addr_any;
- sockaddr->type.sin6.sin6_port = 0;
- sockaddr->length = sizeof(sockaddr->type.sin6);
- ISC_LINK_INIT(sockaddr, link);
-}
-
-void
-isc_sockaddr_fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
- in_port_t port)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin.sin_family = AF_INET;
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
- sockaddr->type.sin.sin_addr = *ina;
- sockaddr->type.sin.sin_port = htons(port);
- sockaddr->length = sizeof(sockaddr->type.sin);
- ISC_LINK_INIT(sockaddr, link);
-}
-
-void
-isc_sockaddr_anyofpf(isc_sockaddr_t *sockaddr, int pf) {
- switch (pf) {
- case AF_INET:
- isc_sockaddr_any(sockaddr);
- break;
- case AF_INET6:
- isc_sockaddr_any6(sockaddr);
- break;
- default:
- INSIST(0);
- }
-}
-
-void
-isc_sockaddr_fromin6(isc_sockaddr_t *sockaddr, const struct in6_addr *ina6,
- in_port_t port)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
- sockaddr->type.sin6.sin6_addr = *ina6;
- sockaddr->type.sin6.sin6_port = htons(port);
- sockaddr->length = sizeof(sockaddr->type.sin6);
- ISC_LINK_INIT(sockaddr, link);
-}
-
-void
-isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
- in_port_t port)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin6.sin6_family = AF_INET6;
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
- sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;
- sockaddr->type.sin6.sin6_addr.s6_addr[11] = 0xff;
- memcpy(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
- sockaddr->type.sin6.sin6_port = htons(port);
- sockaddr->length = sizeof(sockaddr->type.sin6);
- ISC_LINK_INIT(sockaddr, link);
-}
-
-int
-isc_sockaddr_pf(const isc_sockaddr_t *sockaddr) {
-
- /*
- * Get the protocol family of 'sockaddr'.
- */
-
-#if (AF_INET == PF_INET && AF_INET6 == PF_INET6)
- /*
- * Assume that PF_xxx == AF_xxx for all AF and PF.
- */
- return (sockaddr->type.sa.sa_family);
-#else
- switch (sockaddr->type.sa.sa_family) {
- case AF_INET:
- return (PF_INET);
- case AF_INET6:
- return (PF_INET6);
- default:
- FATAL_ERROR(__FILE__, __LINE__,
- "unknown address family: %d",
- (int)sockaddr->type.sa.sa_family);
- }
-#endif
-}
-
-void
-isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
- in_port_t port)
-{
- memset(sockaddr, 0, sizeof(*sockaddr));
- sockaddr->type.sin.sin_family = (short)na->family;
- switch (na->family) {
- case AF_INET:
- sockaddr->length = sizeof(sockaddr->type.sin);
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin.sin_len = sizeof(sockaddr->type.sin);
-#endif
- sockaddr->type.sin.sin_addr = na->type.in;
- sockaddr->type.sin.sin_port = htons(port);
- break;
- case AF_INET6:
- sockaddr->length = sizeof(sockaddr->type.sin6);
-#ifdef ISC_PLATFORM_HAVESALEN
- sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
-#endif
- memcpy(&sockaddr->type.sin6.sin6_addr, &na->type.in6, 16);
-#ifdef ISC_PLATFORM_HAVESCOPEID
- sockaddr->type.sin6.sin6_scope_id = isc_netaddr_getzone(na);
-#endif
- sockaddr->type.sin6.sin6_port = htons(port);
- break;
- default:
- INSIST(0);
- }
- ISC_LINK_INIT(sockaddr, link);
-}
-
-void
-isc_sockaddr_setport(isc_sockaddr_t *sockaddr, in_port_t port) {
- switch (sockaddr->type.sa.sa_family) {
- case AF_INET:
- sockaddr->type.sin.sin_port = htons(port);
- break;
- case AF_INET6:
- sockaddr->type.sin6.sin6_port = htons(port);
- break;
- default:
- FATAL_ERROR(__FILE__, __LINE__,
- "unknown address family: %d",
- (int)sockaddr->type.sa.sa_family);
- }
-}
-
-in_port_t
-isc_sockaddr_getport(const isc_sockaddr_t *sockaddr) {
- in_port_t port = 0;
-
- switch (sockaddr->type.sa.sa_family) {
- case AF_INET:
- port = ntohs(sockaddr->type.sin.sin_port);
- break;
- case AF_INET6:
- port = ntohs(sockaddr->type.sin6.sin6_port);
- break;
- default:
- FATAL_ERROR(__FILE__, __LINE__,
- "unknown address family: %d",
- (int)sockaddr->type.sa.sa_family);
- }
-
- return (port);
-}
-
-bool
-isc_sockaddr_ismulticast(const isc_sockaddr_t *sockaddr) {
- isc_netaddr_t netaddr;
-
- if (sockaddr->type.sa.sa_family == AF_INET ||
- sockaddr->type.sa.sa_family == AF_INET6) {
- isc_netaddr_fromsockaddr(&netaddr, sockaddr);
- return (isc_netaddr_ismulticast(&netaddr));
- }
- return (false);
-}
-
-bool
-isc_sockaddr_isexperimental(const isc_sockaddr_t *sockaddr) {
- isc_netaddr_t netaddr;
-
- if (sockaddr->type.sa.sa_family == AF_INET) {
- isc_netaddr_fromsockaddr(&netaddr, sockaddr);
- return (isc_netaddr_isexperimental(&netaddr));
- }
- return (false);
-}
-
-bool
-isc_sockaddr_issitelocal(const isc_sockaddr_t *sockaddr) {
- isc_netaddr_t netaddr;
-
- if (sockaddr->type.sa.sa_family == AF_INET6) {
- isc_netaddr_fromsockaddr(&netaddr, sockaddr);
- return (isc_netaddr_issitelocal(&netaddr));
- }
- return (false);
-}
-
-bool
-isc_sockaddr_islinklocal(const isc_sockaddr_t *sockaddr) {
- isc_netaddr_t netaddr;
-
- if (sockaddr->type.sa.sa_family == AF_INET6) {
- isc_netaddr_fromsockaddr(&netaddr, sockaddr);
- return (isc_netaddr_islinklocal(&netaddr));
- }
- return (false);
-}
-
diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def
index 572193e..b5a4d82 100644
--- a/lib/isc/win32/libisc.def
+++ b/lib/isc/win32/libisc.def
@@ -450,25 +450,6 @@ isc_sha512_final
isc_sha512_init
isc_sha512_invalidate
isc_sha512_update
-isc_sockaddr_any
-isc_sockaddr_any6
-isc_sockaddr_anyofpf
-isc_sockaddr_compare
-isc_sockaddr_eqaddr
-isc_sockaddr_eqaddrprefix
-isc_sockaddr_equal
-isc_sockaddr_format
-isc_sockaddr_fromin
-isc_sockaddr_fromin6
-isc_sockaddr_fromnetaddr
-isc_sockaddr_getport
-isc_sockaddr_hash
-isc_sockaddr_isexperimental
-isc_sockaddr_ismulticast
-isc_sockaddr_pf
-isc_sockaddr_setport
-isc_sockaddr_totext
-isc_sockaddr_v6fromin
isc_socketmgr_renderxml
isc_stats_attach
isc_stats_create
diff --git a/lib/isc/win32/libisc.dsp b/lib/isc/win32/libisc.dsp
index ee07f83..666ebc1 100644
--- a/lib/isc/win32/libisc.dsp
+++ b/lib/isc/win32/libisc.dsp
@@ -707,10 +707,6 @@ SOURCE=..\sha2.c
# End Source File
# Begin Source File
-SOURCE=..\sockaddr.c
-# End Source File
-# Begin Source File
-
SOURCE=..\stats.c
# End Source File
# Begin Source File
diff --git a/lib/isc/win32/libisc.mak b/lib/isc/win32/libisc.mak
index de71cbd..1a0fa09 100644
--- a/lib/isc/win32/libisc.mak
+++ b/lib/isc/win32/libisc.mak
@@ -1866,24 +1866,6 @@ SOURCE=..\sha2.c
!ENDIF
-SOURCE=..\sockaddr.c
-
-!IF "$(CFG)" == "libisc - Win32 Release"
-
-
-"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "libisc - Win32 Debug"
-
-
-"$(INTDIR)\sockaddr.obj" "$(INTDIR)\sockaddr.sbr" : $(SOURCE) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
SOURCE=..\stats.c
!IF "$(CFG)" == "libisc - Win32 Release"
diff --git a/lib/isc/wscript b/lib/isc/wscript
index 432ed38..e01eb7f 100644
--- a/lib/isc/wscript
+++ b/lib/isc/wscript
@@ -12,7 +12,6 @@ def build(ctx):
"random.c",
"result.c",
"sha1.c",
- "sockaddr.c",
"unix/errno2result.c",
"unix/interfaceiter.c",
"unix/net.c",
diff --git a/ports/winnt/vs2005/libntp.vcproj b/ports/winnt/vs2005/libntp.vcproj
index 63d7a42..e6ea711 100644
--- a/ports/winnt/vs2005/libntp.vcproj
+++ b/ports/winnt/vs2005/libntp.vcproj
@@ -445,10 +445,6 @@
>
</File>
<File
- RelativePath="..\..\..\lib\isc\sockaddr.c"
- >
- </File>
- <File
RelativePath="..\..\..\libntp\socket.c"
>
</File>
diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index d0de974..8a819b4 100644
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -560,10 +560,6 @@
>
</File>
<File
- RelativePath="..\..\..\..\lib\isc\sockaddr.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\libntp\socket.c"
>
</File>
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index 618ca1a..81c00c0 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -290,7 +290,6 @@
<ClCompile Include="..\..\..\..\lib\isc\nls\msgcat.c" />
<ClCompile Include="..\..\..\..\lib\isc\ondestroy.c" />
<ClCompile Include="..\..\..\..\lib\isc\sha1.c" />
- <ClCompile Include="..\..\..\..\lib\isc\sockaddr.c" />
<ClCompile Include="..\..\..\..\lib\isc\task.c" />
<ClCompile Include="..\..\..\..\lib\isc\win32\condition.c" />
<ClCompile Include="..\..\..\..\lib\isc\win32\interfaceiter.c" />
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
index a1d2ee1..dfa9e8c 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
@@ -230,9 +230,6 @@
<ClCompile Include="..\..\..\..\libntp\snprintf.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\..\lib\isc\sockaddr.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\..\libntp\socket.c">
<Filter>Source Files</Filter>
</ClCompile>
More information about the vc
mailing list