BIND 10 master, updated. 0e4c259dde279eafa1e3677a161ac9b67095c3d7 [master] Merge branch 'trac443'
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Sep 11 10:27:46 UTC 2013
The branch, master has been updated
via 0e4c259dde279eafa1e3677a161ac9b67095c3d7 (commit)
via 63b99b7f1c5d80b78da7d526f883d3b53fb116c4 (commit)
via 534a84a7d3f35a11204966317724bb8327a36282 (commit)
from 27e895a6ee41d4588f6822fc7aa9dd5eac3c5738 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0e4c259dde279eafa1e3677a161ac9b67095c3d7
Merge: 27e895a 63b99b7
Author: Kean Johnston <kean at isc.org>
Date: Wed Sep 11 12:26:53 2013 +0200
[master] Merge branch 'trac443'
-----------------------------------------------------------------------
Summary of changes:
src/lib/nsas/Makefile.am | 1 -
src/lib/nsas/README | 5 -----
src/lib/nsas/address_request_callback.h | 1 -
src/lib/nsas/asiolink.h | 21 ---------------------
src/lib/nsas/nameserver_address.h | 1 -
src/lib/nsas/nameserver_entry.h | 1 -
src/lib/nsas/tests/nameserver_entry_unittest.cc | 1 -
src/lib/nsas/tests/zone_entry_unittest.cc | 1 -
src/lib/nsas/zone_entry.h | 1 -
9 files changed, 33 deletions(-)
delete mode 100644 src/lib/nsas/asiolink.h
-----------------------------------------------------------------------
diff --git a/src/lib/nsas/Makefile.am b/src/lib/nsas/Makefile.am
index eb8c0c3..dd30593 100644
--- 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 d0598ca..144bdde 100644
--- 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 e43dfe2..5d86d58 100644
--- a/src/lib/nsas/address_request_callback.h
+++ b/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 {
diff --git a/src/lib/nsas/asiolink.h b/src/lib/nsas/asiolink.h
deleted file mode 100644
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 5f5c7c9..33a1169 100644
--- a/src/lib/nsas/nameserver_address.h
+++ b/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"
diff --git a/src/lib/nsas/nameserver_entry.h b/src/lib/nsas/nameserver_entry.h
index 3ffdf10..5ff72ff 100644
--- a/src/lib/nsas/nameserver_entry.h
+++ b/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"
diff --git a/src/lib/nsas/tests/nameserver_entry_unittest.cc b/src/lib/nsas/tests/nameserver_entry_unittest.cc
index e0ec0ad..10f0c20 100644
--- a/src/lib/nsas/tests/nameserver_entry_unittest.cc
+++ b/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"
diff --git a/src/lib/nsas/tests/zone_entry_unittest.cc b/src/lib/nsas/tests/zone_entry_unittest.cc
index 8754906..dc34275 100644
--- a/src/lib/nsas/tests/zone_entry_unittest.cc
+++ b/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"
diff --git a/src/lib/nsas/zone_entry.h b/src/lib/nsas/zone_entry.h
index b0c26c3..d53b321 100644
--- a/src/lib/nsas/zone_entry.h
+++ b/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"
More information about the bind10-changes
mailing list