migrate t_sockaddr to lib/isc/tests

diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore
index e43da7f32bd7164ce208e5162da0d2a16a83552d..63e7dc260189ff27658f446a254be9482bdba5d0 100644 (file)
--- a/bin/tests/.gitignore
+++ b/bin/tests/.gitignore
@@ -13,7 +13,6 @@ t_names
 t_net
 t_rbt
 t_resolver
-t_sockaddr
 conf.sh
 dlopen
 keycreate

diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 693d6abb2e96b7acf9c69dc9e61bbb21c2317216..da9ed05fa17921dff8a189532f756d5cd8b5d51b 100644 (file)
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -33,7 +33,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 LIBS =         @LIBS@
 
 SUBDIR =       atomic db dst mem names net rbt resolver \
-               sockaddr tasks timers system @PKCS11_TOOLS@ optional
+               tasks timers system @PKCS11_TOOLS@ optional
 
 TESTDIRS =     system
 

diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
deleted file mode 100644 (file)
index 6a1dba1..0000000
--- a/bin/tests/sockaddr/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =    ${TEST_INCLUDES} ${ISC_INCLUDES}
-
-CDEFINES =
-CWARNINGS =
-
-ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
-TAPIDEPLIBS =  ../../../lib/tests/libt_api.@A@
-
-ISCDEPLIBS =   ../../../lib/isc/libisc.@A@
-TAPILIBS =     ../../../lib/tests/libt_api.@A@
-
-DEPLIBS =      ${TAPIDEPLIBS} ${ISCDEPLIBS}
-
-LIBS =         ${TAPILIBS} ${ISCLIBS} @LIBS@
-
-TARGETS =      t_sockaddr@EXEEXT@
-
-SRCS =         t_sockaddr.c
-
-@BIND9_MAKE_RULES@
-
-t_sockaddr@EXEEXT@: t_sockaddr.@O@ ${DEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_sockaddr.@O@ ${LIBS}
-
-test: t_sockaddr@EXEEXT@
-       -@./t_sockaddr@EXEEXT@ -b @srcdir@ -a
-
-testhelp:
-       @./t_sockaddr@EXEEXT@ -h
-
-clean distclean::
-       rm -f ${TARGETS}

diff --git a/bin/tests/sockaddr/t_sockaddr.c b/bin/tests/sockaddr/t_sockaddr.c
deleted file mode 100644 (file)
index cf1934c..0000000
--- a/bin/tests/sockaddr/t_sockaddr.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/* $Id: t_sockaddr.c,v 1.14 2007/06/19 23:47:00 tbox Exp $ */
-
-#include <config.h>
-
-#include <isc/netaddr.h>
-#include <isc/result.h>
-#include <isc/sockaddr.h>
-
-#include <tests/t_api.h>
-
-static int
-test_isc_sockaddr_eqaddrprefix(void) {
-       struct in_addr ina_a;
-       struct in_addr ina_b;
-       struct in_addr ina_c;
-       isc_sockaddr_t isa_a;
-       isc_sockaddr_t isa_b;
-       isc_sockaddr_t isa_c;
-
-       if (inet_pton(AF_INET, "194.100.32.87", &ina_a) < 0)
-               return T_FAIL;
-       if (inet_pton(AF_INET, "194.100.32.80", &ina_b) < 0)
-               return T_FAIL;
-       if (inet_pton(AF_INET, "194.101.32.87", &ina_c) < 0)
-               return T_FAIL;
-       isc_sockaddr_fromin(&isa_a, &ina_a, 0);
-       isc_sockaddr_fromin(&isa_b, &ina_b, 42);
-       isc_sockaddr_fromin(&isa_c, &ina_c, 0);
-
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 0) != ISC_TRUE)
-               return T_FAIL;
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 29) != ISC_TRUE)
-               return T_FAIL;
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 30) != ISC_FALSE)
-               return T_FAIL;
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 32) != ISC_FALSE)
-               return T_FAIL;
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_c, 8) != ISC_TRUE)
-               return T_FAIL;
-       if (isc_sockaddr_eqaddrprefix(&isa_a, &isa_c, 16) != ISC_FALSE)
-               return T_FAIL;
-
-       return T_PASS;
-}
-
-static void
-t1(void) {
-       int result;
-       t_assert("isc_sockaddr_eqaddrprefix", 1, T_REQUIRED,
-                "isc_sockaddr_eqaddrprefix() returns ISC_TRUE when "
-                "prefixes of a and b are equal, and ISC_FALSE when "
-                "they are not equal");
-       result = test_isc_sockaddr_eqaddrprefix();
-       t_result(result);
-}
-
-static int
-test_isc_netaddr_masktoprefixlen(void) {
-       struct in_addr na_a;
-       struct in_addr na_b;
-       struct in_addr na_c;
-       struct in_addr na_d;
-       isc_netaddr_t ina_a;
-       isc_netaddr_t ina_b;
-       isc_netaddr_t ina_c;
-       isc_netaddr_t ina_d;
-       unsigned int plen;
-
-       if (inet_pton(AF_INET, "0.0.0.0", &na_a) < 0)
-               return T_FAIL;
-       if (inet_pton(AF_INET, "255.255.255.254", &na_b) < 0)
-               return T_FAIL;
-       if (inet_pton(AF_INET, "255.255.255.255", &na_c) < 0)
-               return T_FAIL;
-       if (inet_pton(AF_INET, "255.255.255.0", &na_d) < 0)
-               return T_FAIL;
-       isc_netaddr_fromin(&ina_a, &na_a);
-       isc_netaddr_fromin(&ina_b, &na_b);
-       isc_netaddr_fromin(&ina_c, &na_c);
-       isc_netaddr_fromin(&ina_d, &na_d);
-
-       if (isc_netaddr_masktoprefixlen(&ina_a, &plen) != ISC_R_SUCCESS)
-               return T_FAIL;
-       if (plen != 0)
-               return T_FAIL;
-
-       if (isc_netaddr_masktoprefixlen(&ina_b, &plen) != ISC_R_SUCCESS)
-               return T_FAIL;
-       if (plen != 31)
-               return T_FAIL;
-
-       if (isc_netaddr_masktoprefixlen(&ina_c, &plen) != ISC_R_SUCCESS)
-               return T_FAIL;
-       if (plen != 32)
-               return T_FAIL;
-
-       if (isc_netaddr_masktoprefixlen(&ina_d, &plen) != ISC_R_SUCCESS)
-               return T_FAIL;
-       if (plen != 24)
-               return T_FAIL;
-
-       return T_PASS;
-}
-
-static void
-t2(void) {
-       int result;
-       t_assert("isc_netaddr_masktoprefixlen", 1, T_REQUIRED,
-                "isc_netaddr_masktoprefixlen() calculates "
-                "correct prefix lengths ");
-       result = test_isc_netaddr_masktoprefixlen();
-       t_result(result);
-}
-
-testspec_t     T_testlist[] = {
-       {       (PFV) t1,       "isc_sockaddr_eqaddrprefix"     },
-       {       (PFV) t2,       "isc_netaddr_masktoprefixlen"   },
-       {       (PFV) 0,        NULL                            }
-};
-
-#ifdef WIN32
-int
-main(int argc, char **argv) {
-       t_settests(T_testlist);
-       return (t_main(argc, argv));
-}
-#endif

diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in
deleted file mode 100644 (file)
index 7782bfe..0000000
--- a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_sockaddr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file

diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in
deleted file mode 100644 (file)
index af9820c..0000000
--- a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{351D3872-707B-46AD-8BC0-5A668B8C745B}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_sockaddr</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_sockaddr.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

diff --git a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user b/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user
deleted file mode 100644 (file)
index 695b5c7..0000000
--- a/bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-</Project>
\ No newline at end of file

diff --git a/configure b/configure
index 8a3febf9c203b1b8393a70864dc2ccc1e0a7489f..ddb52edd484d76673dabd67564b1cdf5081231b5 100755 (executable)
--- a/configure
+++ b/configure
@@ -24157,7 +24157,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/headerdep_test.sh bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/dnssec-keymgr.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/headerdep_test.sh bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/isccfg/tests/Makefile lib/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -25223,7 +25223,6 @@ do
     "bin/tests/pkcs11/benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/benchmarks/Makefile" ;;
     "bin/tests/rbt/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/rbt/Makefile" ;;
     "bin/tests/resolver/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/resolver/Makefile" ;;
-    "bin/tests/sockaddr/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/sockaddr/Makefile" ;;
     "bin/tests/system/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/Makefile" ;;
     "bin/tests/system/conf.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/conf.sh" ;;
     "bin/tests/system/dlz/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlz/prereq.sh" ;;

diff --git a/configure.in b/configure.in
index 4b85c0251ddc9db6ec0903d956c96f42dfe92f11..555fd933314e0c0e92bae79bc2499c8e43cbf175 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5340,7 +5340,6 @@ AC_CONFIG_FILES([
        bin/tests/pkcs11/benchmarks/Makefile
        bin/tests/rbt/Makefile
        bin/tests/resolver/Makefile
-       bin/tests/sockaddr/Makefile
        bin/tests/system/Makefile
        bin/tests/system/conf.sh
        bin/tests/system/dlz/prereq.sh

diff --git a/lib/isc/tests/netaddr_test.c b/lib/isc/tests/netaddr_test.c
index ecd80f3c8663746e94d13fdb83cf9b63ec72ae0c..fb97f96a3bfc61072a8608120c53c634376e41ce 100644 (file)
--- a/lib/isc/tests/netaddr_test.c
+++ b/lib/isc/tests/netaddr_test.c
@@ -19,6 +19,8 @@
 #include <string.h>
 
 #include <isc/netaddr.h>
+#include <isc/sockaddr.h>
+#include <isc/util.h>
 
 ATF_TC(isc_netaddr_isnetzero);
 ATF_TC_HEAD(isc_netaddr_isnetzero, tc) {
@@ -54,12 +56,58 @@ ATF_TC_BODY(isc_netaddr_isnetzero, tc) {
        }
 }
 
+ATF_TC(netaddr_masktoprefixlen);
+ATF_TC_HEAD(netaddr_masktoprefixlen, tc) {
+       atf_tc_set_md_var(tc, "descr",
+                         "isc_netaddr_masktoprefixlen() "
+                         "calculates correct prefix lengths ");
+}
+ATF_TC_BODY(netaddr_masktoprefixlen, tc) {
+       struct in_addr na_a;
+       struct in_addr na_b;
+       struct in_addr na_c;
+       struct in_addr na_d;
+       isc_netaddr_t ina_a;
+       isc_netaddr_t ina_b;
+       isc_netaddr_t ina_c;
+       isc_netaddr_t ina_d;
+       unsigned int plen;
+
+       UNUSED(tc);
+
+       ATF_CHECK(inet_pton(AF_INET, "0.0.0.0", &na_a) >= 0);
+       ATF_CHECK(inet_pton(AF_INET, "255.255.255.254", &na_b) >= 0);
+       ATF_CHECK(inet_pton(AF_INET, "255.255.255.255", &na_c) >= 0);
+       ATF_CHECK(inet_pton(AF_INET, "255.255.255.0", &na_d) >= 0);
+
+       isc_netaddr_fromin(&ina_a, &na_a);
+       isc_netaddr_fromin(&ina_b, &na_b);
+       isc_netaddr_fromin(&ina_c, &na_c);
+       isc_netaddr_fromin(&ina_d, &na_d);
+
+       ATF_CHECK_EQ(isc_netaddr_masktoprefixlen(&ina_a, &plen),
+                    ISC_R_SUCCESS);
+       ATF_CHECK_EQ(plen, 0);
+
+       ATF_CHECK_EQ(isc_netaddr_masktoprefixlen(&ina_b, &plen),
+                    ISC_R_SUCCESS);
+       ATF_CHECK_EQ(plen, 31);
+
+       ATF_CHECK_EQ(isc_netaddr_masktoprefixlen(&ina_c, &plen),
+                    ISC_R_SUCCESS);
+       ATF_CHECK_EQ(plen, 32);
+
+       ATF_CHECK_EQ(isc_netaddr_masktoprefixlen(&ina_d, &plen),
+                    ISC_R_SUCCESS);
+       ATF_CHECK_EQ(plen, 24);
+}
+
 /*
  * Main
  */
 ATF_TP_ADD_TCS(tp) {
-
        ATF_TP_ADD_TC(tp, isc_netaddr_isnetzero);
+       ATF_TP_ADD_TC(tp, netaddr_masktoprefixlen);
 
        return (atf_no_error());
 }

diff --git a/lib/isc/tests/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c
index 98cb68d8fbf02fab7020de57a294e6f72892579f..772f6c97865cb07e40d83583f578bb774b173289 100644 (file)
--- a/lib/isc/tests/sockaddr_test.c
+++ b/lib/isc/tests/sockaddr_test.c
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 /*! \file */
 
 #include <config.h>
@@ -19,6 +17,7 @@
 
 #include <unistd.h>
 
+#include <isc/netaddr.h>
 #include <isc/sockaddr.h>
 #include <isc/print.h>
 
@@ -120,12 +119,47 @@ ATF_TC_BODY(sockaddr_isnetzero, tc) {
        }
 }
 
+ATF_TC(sockaddr_eqaddrprefix);
+ATF_TC_HEAD(sockaddr_eqaddrprefix, tc) {
+       atf_tc_set_md_var(tc, "descr",
+                         "isc_sockaddr_eqaddrprefix() returns ISC_TRUE when "
+                         "prefixes of a and b are equal, and ISC_FALSE when "
+                         "they are not equal");
+}
+ATF_TC_BODY(sockaddr_eqaddrprefix, tc) {
+       struct in_addr ina_a;
+       struct in_addr ina_b;
+       struct in_addr ina_c;
+       isc_sockaddr_t isa_a;
+       isc_sockaddr_t isa_b;
+       isc_sockaddr_t isa_c;
+
+       UNUSED(tc);
+
+       ATF_CHECK(inet_pton(AF_INET, "194.100.32.87", &ina_a) >= 0);
+       ATF_CHECK(inet_pton(AF_INET, "194.100.32.80", &ina_b) >= 0);
+       ATF_CHECK(inet_pton(AF_INET, "194.101.32.87", &ina_c) >= 0);
+
+       isc_sockaddr_fromin(&isa_a, &ina_a, 0);
+       isc_sockaddr_fromin(&isa_b, &ina_b, 42);
+       isc_sockaddr_fromin(&isa_c, &ina_c, 0);
+
+       ATF_CHECK(isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 0));
+       ATF_CHECK(isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 29));
+       ATF_CHECK(isc_sockaddr_eqaddrprefix(&isa_a, &isa_c, 8));
+
+       ATF_CHECK(! isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 30));
+       ATF_CHECK(! isc_sockaddr_eqaddrprefix(&isa_a, &isa_b, 32));
+       ATF_CHECK(! isc_sockaddr_eqaddrprefix(&isa_a, &isa_c, 16));
+}
+
 /*
  * Main
  */
 ATF_TP_ADD_TCS(tp) {
        ATF_TP_ADD_TC(tp, sockaddr_hash);
        ATF_TP_ADD_TC(tp, sockaddr_isnetzero);
+       ATF_TP_ADD_TC(tp, sockaddr_eqaddrprefix);
 
        return (atf_no_error());
 }

diff --git a/util/copyrights b/util/copyrights
index 21041aa4dedc26828e2f1713dc836762eb1a9124..186cf94c221f54b7f175ddcbf367321e11baf770 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -554,11 +554,6 @@
 ./bin/tests/shutdown_test.c                    C       1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
 ./bin/tests/sig0_test.c                                C       2000,2001,2004,2005,2007,2008,2009,2012,2015,2016,2018
 ./bin/tests/sock_test.c                                C       1998,1999,2000,2001,2004,2007,2008,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/sockaddr/Makefile.in               MAKE    1999,2000,2001,2002,2004,2007,2009,2012,2014,2016,2017,2018
-./bin/tests/sockaddr/t_sockaddr.c              C       1999,2000,2001,2004,2007,2013,2016,2018
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.filters.in       X       2013,2015,2018
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.in       X       2013,2015,2016,2017,2018
-./bin/tests/sockaddr/win32/t_sockaddr.vcxproj.user     X       2013,2018
 ./bin/tests/startperf/README                   X       2011,2018
 ./bin/tests/startperf/clean.sh                 SH      2011,2012,2016,2018
 ./bin/tests/startperf/makenames.pl             PERL    2011,2012,2016,2018

diff --git a/win32utils/Configure b/win32utils/Configure
index 9bb5f2c8b57dce5cd0cde24f59a498da61c7bd9c..05b6520397c20ccc61892cef77cf5d0be5b3bc42 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -130,8 +130,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
                    "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj.filters",
                    "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj",
                    "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj.filters",
-                   "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.vcxproj",
-                   "..\\bin\\tests\\sockaddr\\win32\\t_sockaddr.vcxproj.filters",
                    "..\\bin\\tests\\system\\win32\\bigkey.vcxproj",
                    "..\\bin\\tests\\system\\win32\\bigkey.vcxproj.filters",
                    "..\\bin\\tests\\system\\win32\\feature-test.vcxproj",

diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in
index f79e54f619c1a4cb30c18c23985e3ab47b6304b4..63bd2872bd4215f559a16f4740f6c37cd9c66788 100644 (file)
--- a/win32utils/bind9.sln.in
+++ b/win32utils/bind9.sln.in
@@ -554,12 +554,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_resolver", "..\bin\tests\
                {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_sockaddr", "..\bin\tests\sockaddr\win32\t_sockaddr.vcxproj", "{351D3872-707B-46AD-8BC0-5A668B8C745B}"
-       ProjectSection(ProjectDependencies) = postProject
-               {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}
-               {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_tasks", "..\bin\tests\tasks\win32\t_tasks.vcxproj", "{2CB7B128-5954-4FAF-B5EA-501B23BB8054}"
        ProjectSection(ProjectDependencies) = postProject
                {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}