[master] Merge branch 'trac443'

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

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.

src/lib/nsas/address_request_callback.h

@@ -15,7 +15,6 @@
 #ifndef ADDRESS_REQUEST_CALLBACK_H
 #define ADDRESS_REQUEST_CALLBACK_H
 
-#include "asiolink.h"
 #include "nameserver_address.h"
 
 namespace isc {

src/lib/nsas/asiolink.h

@@ -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

src/lib/nsas/nameserver_address.h

@@ -19,7 +19,6 @@
 
 #include <exceptions/exceptions.h>
 
-#include "asiolink.h"
 #include "address_entry.h"
 #include "nsas_types.h"
 

src/lib/nsas/nameserver_entry.h

@@ -28,7 +28,6 @@
 #include <util/lru_list.h>
 
 #include "address_entry.h"
-#include "asiolink.h"
 #include "nsas_types.h"
 #include "hash_key.h"
 #include "fetchable.h"

src/lib/nsas/tests/nameserver_entry_unittest.cc

@@ -30,7 +30,6 @@
 #include <dns/name.h>
 #include <exceptions/exceptions.h>
 
-#include "../asiolink.h"
 #include "../address_entry.h"
 #include "../nameserver_entry.h"
 #include "../nameserver_address.h"

src/lib/nsas/tests/zone_entry_unittest.cc

@@ -23,7 +23,6 @@
 #include <dns/rrclass.h>
 #include <dns/rdataclass.h>
 
-#include "../asiolink.h"
 #include "../zone_entry.h"
 #include "../nameserver_entry.h"
 #include "../address_request_callback.h"

src/lib/nsas/zone_entry.h

@@ -30,7 +30,6 @@
 
 #include "hash_key.h"
 #include "nsas_entry.h"
-#include "asiolink.h"
 #include "fetchable.h"
 #include "nsas_types.h"
 #include "glue_hints.h"