[443] Removed asiolink.h from NSAS and use the full version instead.

diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index eb8c0c3d4af1a707dfbc3b891e5c84951f2a770c..dd30593a734fce080f9a89d33219029d251e239d 100644 (file)
--- a/src/lib/nsas/Makefile.am
+++ b/src/lib/nsas/Makefile.am
@@ -38,7 +38,6 @@ BUILT_SOURCES = nsas_messages.h nsas_messages.cc
 
 # Library sources. The generated files will not be in the distribution.
 libb10_nsas_la_SOURCES  = address_entry.h address_entry.cc
-libb10_nsas_la_SOURCES += asiolink.h
 libb10_nsas_la_SOURCES += hash.cc hash.h
 libb10_nsas_la_SOURCES += hash_deleter.h
 libb10_nsas_la_SOURCES += hash_key.cc hash_key.h

diff --git a/src/lib/nsas/README b/src/lib/nsas/README
index d0598caa7212ad45dd99634028643b7c9af4cd7c..144bdded95c0a1c0e7e41b4279b20779b89fa268 100644 (file)
--- a/src/lib/nsas/README
+++ b/src/lib/nsas/README
@@ -1,7 +1,2 @@
 For an overview of the Nameserver Address Store, see the requirements and design
 documents at http://bind10.isc.org/wiki/Resolver.
-
-At the time of writing (19 October 2010), the file asiolink.h is present in this
-directory only for the purposes of development.  When the resolver's
-asynchronous I/O code has been finished, this will be removed and the NSAS will
-use the "real" code.

diff --git a/src/lib/nsas/address_request_callback.h b/src/lib/nsas/address_request_callback.h
index e43dfe295f4118bd9014b7d93cc562effadbbd94..6b2e58e27590ae4c91733ff11fdc734f461fc417 100644 (file)
--- a/src/lib/nsas/address_request_callback.h
+++ b/src/lib/nsas/address_request_callback.h
@@ -15,7 +15,8 @@
 #ifndef ADDRESS_REQUEST_CALLBACK_H
 #define ADDRESS_REQUEST_CALLBACK_H
 
-#include "asiolink.h"
+#include <asiolink/asiolink.h>
+
 #include "nameserver_address.h"
 
 namespace isc {

diff --git a/src/lib/nsas/asiolink.h b/src/lib/nsas/asiolink.h
deleted file mode 100644 (file)
index b236a0e..0000000
--- a/src/lib/nsas/asiolink.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (C) 2010  Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or 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 ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS.  IN NO EVENT SHALL ISC 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.
-
-#ifndef ASIOLINK_H
-#define ASIOLINK_H
-
-#include <string>
-#include <sys/socket.h>
-
-#endif // ASIOLINK_H

diff --git a/src/lib/nsas/nameserver_address.h b/src/lib/nsas/nameserver_address.h
index 5f5c7c95be05ef4d9068fbe0e780217a31e7b624..5a8ae465fffcda616ca8fe787b32811debf69e8c 100644 (file)
--- a/src/lib/nsas/nameserver_address.h
+++ b/src/lib/nsas/nameserver_address.h
@@ -19,7 +19,8 @@
 
 #include <exceptions/exceptions.h>
 
-#include "asiolink.h"
+#include <asiolink/asiolink.h>
+
 #include "address_entry.h"
 #include "nsas_types.h"
 

diff --git a/src/lib/nsas/nameserver_entry.h b/src/lib/nsas/nameserver_entry.h
index 3ffdf1001d32d856cbbbe2c08dfbbeba155a122e..320c74ae854bdd9b8a45f0f113c8295dfba6c448 100644 (file)
--- a/src/lib/nsas/nameserver_entry.h
+++ b/src/lib/nsas/nameserver_entry.h
@@ -27,8 +27,9 @@
 
 #include <util/lru_list.h>
 
+#include <asiolink/asiolink.h>
+
 #include "address_entry.h"
-#include "asiolink.h"
 #include "nsas_types.h"
 #include "hash_key.h"
 #include "fetchable.h"

diff --git a/src/lib/nsas/tests/nameserver_entry_unittest.cc b/src/lib/nsas/tests/nameserver_entry_unittest.cc
index e0ec0ad183eb56fa634b88b76b101ddb0874870a..4cff15da8fa37c861eae3acd25e71a160928dcdd 100644 (file)
--- a/src/lib/nsas/tests/nameserver_entry_unittest.cc
+++ b/src/lib/nsas/tests/nameserver_entry_unittest.cc
@@ -30,7 +30,8 @@
 #include <dns/name.h>
 #include <exceptions/exceptions.h>
 
-#include "../asiolink.h"
+#include <asiolink/asiolink.h>
+
 #include "../address_entry.h"
 #include "../nameserver_entry.h"
 #include "../nameserver_address.h"

diff --git a/src/lib/nsas/tests/zone_entry_unittest.cc b/src/lib/nsas/tests/zone_entry_unittest.cc
index 875490605f228615e3d8bf1aa77e845c31b02cce..fe5eb883b6d2815dac00b50970131df2ce49be25 100644 (file)
--- a/src/lib/nsas/tests/zone_entry_unittest.cc
+++ b/src/lib/nsas/tests/zone_entry_unittest.cc
@@ -23,7 +23,8 @@
 #include <dns/rrclass.h>
 #include <dns/rdataclass.h>
 
-#include "../asiolink.h"
+#include <asiolink/asiolink.h>
+
 #include "../zone_entry.h"
 #include "../nameserver_entry.h"
 #include "../address_request_callback.h"

diff --git a/src/lib/nsas/zone_entry.h b/src/lib/nsas/zone_entry.h
index b0c26c313deaa2e7c85ec7dca19359677a5c3f3a..ca4a6be76515782e313a8db78afae0dce1719825 100644 (file)
--- a/src/lib/nsas/zone_entry.h
+++ b/src/lib/nsas/zone_entry.h
@@ -28,9 +28,10 @@
 #include <util/locks.h>
 #include <util/random/random_number_generator.h>
 
+#include <asiolink/asiolink.h>
+
 #include "hash_key.h"
 #include "nsas_entry.h"
-#include "asiolink.h"
 #include "fetchable.h"
 #include "nsas_types.h"
 #include "glue_hints.h"