Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
451
Issues
451
List
Boards
Labels
Service Desk
Milestones
Merge Requests
75
Merge Requests
75
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
36dd3d4b
Commit
36dd3d4b
authored
Apr 12, 2011
by
chenzhengzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[trac749] refactor more C++ utility code
parent
f6aa7d59
Changes
121
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
121 changed files
with
275 additions
and
244 deletions
+275
-244
src/bin/auth/auth_srv.cc
src/bin/auth/auth_srv.cc
+2
-2
src/bin/auth/auth_srv.h
src/bin/auth/auth_srv.h
+1
-1
src/bin/auth/benchmarks/query_bench.cc
src/bin/auth/benchmarks/query_bench.cc
+2
-2
src/bin/auth/main.cc
src/bin/auth/main.cc
+2
-2
src/bin/auth/tests/auth_srv_unittest.cc
src/bin/auth/tests/auth_srv_unittest.cc
+1
-1
src/bin/host/host.cc
src/bin/host/host.cc
+2
-2
src/bin/resolver/main.cc
src/bin/resolver/main.cc
+1
-1
src/bin/resolver/resolver.cc
src/bin/resolver/resolver.cc
+2
-2
src/bin/resolver/resolver.h
src/bin/resolver/resolver.h
+1
-1
src/lib/asiolink/dns_answer.h
src/lib/asiolink/dns_answer.h
+1
-1
src/lib/asiolink/dns_lookup.h
src/lib/asiolink/dns_lookup.h
+2
-2
src/lib/asiolink/io_asio_socket.h
src/lib/asiolink/io_asio_socket.h
+3
-3
src/lib/asiolink/io_fetch.cc
src/lib/asiolink/io_fetch.cc
+4
-5
src/lib/asiolink/io_fetch.h
src/lib/asiolink/io_fetch.h
+2
-2
src/lib/asiolink/tcp_server.cc
src/lib/asiolink/tcp_server.cc
+2
-2
src/lib/asiolink/tcp_server.h
src/lib/asiolink/tcp_server.h
+1
-1
src/lib/asiolink/tcp_socket.h
src/lib/asiolink/tcp_socket.h
+7
-7
src/lib/asiolink/tests/dns_server_unittest.cc
src/lib/asiolink/tests/dns_server_unittest.cc
+3
-2
src/lib/asiolink/tests/io_fetch_unittest.cc
src/lib/asiolink/tests/io_fetch_unittest.cc
+3
-3
src/lib/asiolink/tests/tcp_socket_unittest.cc
src/lib/asiolink/tests/tcp_socket_unittest.cc
+3
-3
src/lib/asiolink/tests/udp_socket_unittest.cc
src/lib/asiolink/tests/udp_socket_unittest.cc
+3
-3
src/lib/asiolink/udp_server.cc
src/lib/asiolink/udp_server.cc
+2
-2
src/lib/asiolink/udp_socket.h
src/lib/asiolink/udp_socket.h
+2
-2
src/lib/bench/benchmark_util.cc
src/lib/bench/benchmark_util.cc
+2
-2
src/lib/bench/tests/loadquery_unittest.cc
src/lib/bench/tests/loadquery_unittest.cc
+2
-2
src/lib/cache/tests/cache_test_messagefromfile.h
src/lib/cache/tests/cache_test_messagefromfile.h
+2
-2
src/lib/cache/tests/cache_test_sectioncount.h
src/lib/cache/tests/cache_test_sectioncount.h
+1
-1
src/lib/cache/tests/message_cache_unittest.cc
src/lib/cache/tests/message_cache_unittest.cc
+2
-2
src/lib/cache/tests/message_entry_unittest.cc
src/lib/cache/tests/message_entry_unittest.cc
+1
-1
src/lib/datasrc/data_source.cc
src/lib/datasrc/data_source.cc
+5
-4
src/lib/datasrc/tests/datasrc_unittest.cc
src/lib/datasrc/tests/datasrc_unittest.cc
+2
-2
src/lib/dns/Makefile.am
src/lib/dns/Makefile.am
+0
-1
src/lib/dns/edns.cc
src/lib/dns/edns.cc
+1
-1
src/lib/dns/edns.h
src/lib/dns/edns.h
+3
-1
src/lib/dns/message.cc
src/lib/dns/message.cc
+3
-2
src/lib/dns/message.h
src/lib/dns/message.h
+4
-2
src/lib/dns/messagerenderer.cc
src/lib/dns/messagerenderer.cc
+2
-2
src/lib/dns/messagerenderer.h
src/lib/dns/messagerenderer.h
+3
-1
src/lib/dns/name.cc
src/lib/dns/name.cc
+2
-2
src/lib/dns/name.h
src/lib/dns/name.h
+4
-2
src/lib/dns/python/edns_python.cc
src/lib/dns/python/edns_python.cc
+1
-1
src/lib/dns/python/message_python.cc
src/lib/dns/python/message_python.cc
+1
-1
src/lib/dns/python/messagerenderer_python.cc
src/lib/dns/python/messagerenderer_python.cc
+1
-1
src/lib/dns/python/name_python.cc
src/lib/dns/python/name_python.cc
+1
-1
src/lib/dns/python/pydnspp.cc
src/lib/dns/python/pydnspp.cc
+1
-1
src/lib/dns/python/rdata_python.cc
src/lib/dns/python/rdata_python.cc
+1
-1
src/lib/dns/python/rrclass_python.cc
src/lib/dns/python/rrclass_python.cc
+1
-1
src/lib/dns/python/rrset_python.cc
src/lib/dns/python/rrset_python.cc
+1
-1
src/lib/dns/python/rrttl_python.cc
src/lib/dns/python/rrttl_python.cc
+1
-1
src/lib/dns/python/rrtype_python.cc
src/lib/dns/python/rrtype_python.cc
+1
-1
src/lib/dns/question.cc
src/lib/dns/question.cc
+2
-2
src/lib/dns/question.h
src/lib/dns/question.h
+4
-2
src/lib/dns/rdata.cc
src/lib/dns/rdata.cc
+2
-2
src/lib/dns/rdata.h
src/lib/dns/rdata.h
+6
-4
src/lib/dns/rdata/any_255/tsig_250.cc
src/lib/dns/rdata/any_255/tsig_250.cc
+4
-3
src/lib/dns/rdata/ch_3/a_1.cc
src/lib/dns/rdata/ch_3/a_1.cc
+2
-2
src/lib/dns/rdata/generic/cname_5.cc
src/lib/dns/rdata/generic/cname_5.cc
+2
-2
src/lib/dns/rdata/generic/dname_39.cc
src/lib/dns/rdata/generic/dname_39.cc
+2
-2
src/lib/dns/rdata/generic/dnskey_48.cc
src/lib/dns/rdata/generic/dnskey_48.cc
+4
-3
src/lib/dns/rdata/generic/ds_43.cc
src/lib/dns/rdata/generic/ds_43.cc
+4
-3
src/lib/dns/rdata/generic/mx_15.cc
src/lib/dns/rdata/generic/mx_15.cc
+2
-2
src/lib/dns/rdata/generic/ns_2.cc
src/lib/dns/rdata/generic/ns_2.cc
+2
-2
src/lib/dns/rdata/generic/nsec3_50.cc
src/lib/dns/rdata/generic/nsec3_50.cc
+6
-5
src/lib/dns/rdata/generic/nsec3param_51.cc
src/lib/dns/rdata/generic/nsec3param_51.cc
+4
-3
src/lib/dns/rdata/generic/nsec_47.cc
src/lib/dns/rdata/generic/nsec_47.cc
+4
-3
src/lib/dns/rdata/generic/opt_41.cc
src/lib/dns/rdata/generic/opt_41.cc
+2
-2
src/lib/dns/rdata/generic/ptr_12.cc
src/lib/dns/rdata/generic/ptr_12.cc
+2
-2
src/lib/dns/rdata/generic/rrsig_46.cc
src/lib/dns/rdata/generic/rrsig_46.cc
+5
-3
src/lib/dns/rdata/generic/soa_6.cc
src/lib/dns/rdata/generic/soa_6.cc
+2
-2
src/lib/dns/rdata/generic/txt_16.cc
src/lib/dns/rdata/generic/txt_16.cc
+2
-2
src/lib/dns/rdata/hs_4/a_1.cc
src/lib/dns/rdata/hs_4/a_1.cc
+2
-2
src/lib/dns/rdata/in_1/a_1.cc
src/lib/dns/rdata/in_1/a_1.cc
+2
-2
src/lib/dns/rdata/in_1/aaaa_28.cc
src/lib/dns/rdata/in_1/aaaa_28.cc
+2
-2
src/lib/dns/rdata/template.cc
src/lib/dns/rdata/template.cc
+2
-2
src/lib/dns/rrclass.cc
src/lib/dns/rrclass.cc
+2
-2
src/lib/dns/rrparamregistry.h
src/lib/dns/rrparamregistry.h
+2
-2
src/lib/dns/rrset.cc
src/lib/dns/rrset.cc
+2
-2
src/lib/dns/rrset.h
src/lib/dns/rrset.h
+4
-2
src/lib/dns/rrttl.cc
src/lib/dns/rrttl.cc
+2
-2
src/lib/dns/rrttl.h
src/lib/dns/rrttl.h
+4
-2
src/lib/dns/rrtype.cc
src/lib/dns/rrtype.cc
+2
-2
src/lib/dns/tests/edns_unittest.cc
src/lib/dns/tests/edns_unittest.cc
+2
-2
src/lib/dns/tests/message_unittest.cc
src/lib/dns/tests/message_unittest.cc
+2
-2
src/lib/dns/tests/messagerenderer_unittest.cc
src/lib/dns/tests/messagerenderer_unittest.cc
+2
-2
src/lib/dns/tests/name_unittest.cc
src/lib/dns/tests/name_unittest.cc
+2
-2
src/lib/dns/tests/question_unittest.cc
src/lib/dns/tests/question_unittest.cc
+2
-2
src/lib/dns/tests/rdata_cname_unittest.cc
src/lib/dns/tests/rdata_cname_unittest.cc
+2
-2
src/lib/dns/tests/rdata_dname_unittest.cc
src/lib/dns/tests/rdata_dname_unittest.cc
+2
-2
src/lib/dns/tests/rdata_dnskey_unittest.cc
src/lib/dns/tests/rdata_dnskey_unittest.cc
+2
-2
src/lib/dns/tests/rdata_ds_unittest.cc
src/lib/dns/tests/rdata_ds_unittest.cc
+2
-2
src/lib/dns/tests/rdata_in_a_unittest.cc
src/lib/dns/tests/rdata_in_a_unittest.cc
+2
-2
src/lib/dns/tests/rdata_in_aaaa_unittest.cc
src/lib/dns/tests/rdata_in_aaaa_unittest.cc
+2
-2
src/lib/dns/tests/rdata_mx_unittest.cc
src/lib/dns/tests/rdata_mx_unittest.cc
+2
-2
src/lib/dns/tests/rdata_ns_unittest.cc
src/lib/dns/tests/rdata_ns_unittest.cc
+2
-2
src/lib/dns/tests/rdata_nsec3_unittest.cc
src/lib/dns/tests/rdata_nsec3_unittest.cc
+4
-3
src/lib/dns/tests/rdata_nsec3param_unittest.cc
src/lib/dns/tests/rdata_nsec3param_unittest.cc
+5
-4
src/lib/dns/tests/rdata_nsec_unittest.cc
src/lib/dns/tests/rdata_nsec_unittest.cc
+2
-2
src/lib/dns/tests/rdata_opt_unittest.cc
src/lib/dns/tests/rdata_opt_unittest.cc
+2
-2
src/lib/dns/tests/rdata_ptr_unittest.cc
src/lib/dns/tests/rdata_ptr_unittest.cc
+2
-2
src/lib/dns/tests/rdata_rrsig_unittest.cc
src/lib/dns/tests/rdata_rrsig_unittest.cc
+4
-3
src/lib/dns/tests/rdata_soa_unittest.cc
src/lib/dns/tests/rdata_soa_unittest.cc
+2
-2
src/lib/dns/tests/rdata_tsig_unittest.cc
src/lib/dns/tests/rdata_tsig_unittest.cc
+2
-2
src/lib/dns/tests/rdata_txt_unittest.cc
src/lib/dns/tests/rdata_txt_unittest.cc
+2
-2
src/lib/dns/tests/rdata_unittest.cc
src/lib/dns/tests/rdata_unittest.cc
+2
-2
src/lib/dns/tests/rdata_unittest.h
src/lib/dns/tests/rdata_unittest.h
+2
-2
src/lib/dns/tests/rrclass_unittest.cc
src/lib/dns/tests/rrclass_unittest.cc
+2
-2
src/lib/dns/tests/rrparamregistry_unittest.cc
src/lib/dns/tests/rrparamregistry_unittest.cc
+1
-1
src/lib/dns/tests/rrset_unittest.cc
src/lib/dns/tests/rrset_unittest.cc
+2
-2
src/lib/dns/tests/rrttl_unittest.cc
src/lib/dns/tests/rrttl_unittest.cc
+2
-2
src/lib/dns/tests/rrtype_unittest.cc
src/lib/dns/tests/rrtype_unittest.cc
+2
-2
src/lib/nsas/tests/nameserver_address_store_unittest.cc
src/lib/nsas/tests/nameserver_address_store_unittest.cc
+1
-0
src/lib/nsas/tests/nsas_test.h
src/lib/nsas/tests/nsas_test.h
+2
-2
src/lib/nsas/tests/zone_entry_unittest.cc
src/lib/nsas/tests/zone_entry_unittest.cc
+1
-0
src/lib/nsas/zone_entry.cc
src/lib/nsas/zone_entry.cc
+1
-0
src/lib/nsas/zone_entry.h
src/lib/nsas/zone_entry.h
+2
-2
src/lib/resolve/recursive_query.cc
src/lib/resolve/recursive_query.cc
+1
-1
src/lib/resolve/recursive_query.h
src/lib/resolve/recursive_query.h
+2
-2
src/lib/resolve/tests/recursive_query_unittest.cc
src/lib/resolve/tests/recursive_query_unittest.cc
+3
-3
src/lib/resolve/tests/recursive_query_unittest_2.cc
src/lib/resolve/tests/recursive_query_unittest_2.cc
+3
-3
src/lib/testutils/srv_test.cc
src/lib/testutils/srv_test.cc
+2
-2
src/lib/testutils/srv_test.h
src/lib/testutils/srv_test.h
+3
-3
No files found.
src/bin/auth/auth_srv.cc
View file @
36dd3d4b
...
...
@@ -31,7 +31,7 @@
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/edns.h>
#include <dns/exceptions.h>
...
...
@@ -64,7 +64,7 @@ using namespace isc;
using
namespace
isc
::
cc
;
using
namespace
isc
::
datasrc
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
auth
;
using
namespace
isc
::
dns
::
rdata
;
using
namespace
isc
::
data
;
...
...
src/bin/auth/auth_srv.h
View file @
36dd3d4b
...
...
@@ -109,7 +109,7 @@ public:
/// \throw isc::Unexpected Protocol type of \a message is unexpected
void
processMessage
(
const
asiolink
::
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
message
,
isc
::
util
::
OutputBufferPtr
buffer
,
isc
::
util
::
io
::
OutputBufferPtr
buffer
,
asiolink
::
DNSServer
*
server
);
/// \brief Set verbose flag
...
...
src/bin/auth/benchmarks/query_bench.cc
View file @
36dd3d4b
...
...
@@ -22,7 +22,7 @@
#include <bench/benchmark.h>
#include <bench/benchmark_util.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
#include <dns/name.h>
#include <dns/question.h>
...
...
@@ -41,7 +41,7 @@ using namespace isc;
using
namespace
isc
::
data
;
using
namespace
isc
::
auth
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
xfr
;
using
namespace
isc
::
bench
;
using
namespace
asiolink
;
...
...
src/bin/auth/main.cc
View file @
36dd3d4b
...
...
@@ -25,7 +25,7 @@
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
#include <dns/messagerenderer.h>
...
...
@@ -50,7 +50,7 @@ using namespace isc::data;
using
namespace
isc
::
cc
;
using
namespace
isc
::
config
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
xfr
;
using
namespace
asiolink
;
...
...
src/bin/auth/tests/auth_srv_unittest.cc
View file @
36dd3d4b
...
...
@@ -41,7 +41,7 @@
using
namespace
std
;
using
namespace
isc
::
cc
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
dns
::
rdata
;
using
namespace
isc
::
data
;
using
namespace
isc
::
xfr
;
...
...
src/bin/host/host.cc
View file @
36dd3d4b
...
...
@@ -24,7 +24,7 @@
#include <string>
#include <iostream>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/name.h>
#include <dns/message.h>
...
...
@@ -38,7 +38,7 @@
using
namespace
std
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
namespace
{
char
*
dns_type
=
NULL
;
// not set, so A, AAAA, MX
...
...
src/bin/resolver/main.cc
View file @
36dd3d4b
...
...
@@ -29,7 +29,7 @@
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/rcode.h>
#include <dns/message.h>
#include <dns/messagerenderer.h>
...
...
src/bin/resolver/resolver.cc
View file @
36dd3d4b
...
...
@@ -29,7 +29,7 @@
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/opcode.h>
#include <dns/rcode.h>
...
...
@@ -51,7 +51,7 @@
using
namespace
std
;
using
namespace
isc
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
data
;
using
namespace
isc
::
config
;
...
...
src/bin/resolver/resolver.h
View file @
36dd3d4b
...
...
@@ -77,7 +77,7 @@ public:
void
processMessage
(
const
asiolink
::
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
query_message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
util
::
OutputBufferPtr
buffer
,
isc
::
util
::
io
::
OutputBufferPtr
buffer
,
asiolink
::
DNSServer
*
server
);
/// \brief Set and get the config session
...
...
src/lib/asiolink/dns_answer.h
View file @
36dd3d4b
...
...
@@ -66,7 +66,7 @@ public:
virtual
void
operator
()(
const
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
query_message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
util
::
OutputBufferPtr
buffer
)
const
=
0
;
isc
::
util
::
io
::
OutputBufferPtr
buffer
)
const
=
0
;
};
}
// namespace asiolink
...
...
src/lib/asiolink/dns_lookup.h
View file @
36dd3d4b
...
...
@@ -17,7 +17,7 @@
#include <asiolink/io_message.h>
#include <asiolink/dns_server.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
namespace
asiolink
{
...
...
@@ -70,7 +70,7 @@ public:
virtual
void
operator
()(
const
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
util
::
OutputBufferPtr
buffer
,
isc
::
util
::
io
::
OutputBufferPtr
buffer
,
DNSServer
*
server
)
const
{
(
*
self_
)(
io_message
,
message
,
answer_message
,
buffer
,
server
);
...
...
src/lib/asiolink/io_asio_socket.h
View file @
36dd3d4b
...
...
@@ -26,7 +26,7 @@
#include <exceptions/exceptions.h>
#include <coroutine.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <asiolink/io_error.h>
#include <asiolink/io_socket.h>
...
...
@@ -270,7 +270,7 @@ public:
virtual
bool
processReceivedData
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
)
=
0
;
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
)
=
0
;
/// \brief Cancel I/O On AsioSocket
virtual
void
cancel
()
=
0
;
...
...
@@ -372,7 +372,7 @@ public:
virtual
bool
receiveComplete
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
)
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
)
{
return
(
true
);
}
...
...
src/lib/asiolink/io_fetch.cc
View file @
36dd3d4b
...
...
@@ -22,16 +22,14 @@
#include <boost/scoped_ptr.hpp>
#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <util/buffer.h>
#include <dns/message.h>
#include <dns/messagerenderer.h>
#include <dns/opcode.h>
#include <dns/rcode.h>
#include <log/logger.h>
#include <util/
qid_gen
.h>
#include <util/qid_gen.h>
#include <util/
io/buffer
.h>
#include <util/
random/
qid_gen.h>
#include <asio.hpp>
#include <asio/deadline_timer.hpp>
...
...
@@ -51,7 +49,8 @@
using
namespace
asio
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
util
::
random
;
using
namespace
isc
::
log
;
using
namespace
std
;
...
...
src/lib/asiolink/io_fetch.h
View file @
36dd3d4b
...
...
@@ -25,7 +25,7 @@
#include <asio/error_code.hpp>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/question.h>
namespace
asiolink
{
...
...
@@ -134,7 +134,7 @@ public:
/// -1 indicates no timeout.
IOFetch
(
Protocol
protocol
,
IOService
&
service
,
const
isc
::
dns
::
Question
&
question
,
const
IOAddress
&
address
,
uint16_t
port
,
isc
::
util
::
OutputBufferPtr
&
buff
,
Callback
*
cb
,
uint16_t
port
,
isc
::
util
::
io
::
OutputBufferPtr
&
buff
,
Callback
*
cb
,
int
wait
=
-
1
);
/// \brief Return Current Protocol
...
...
src/lib/asiolink/tcp_server.cc
View file @
36dd3d4b
...
...
@@ -23,7 +23,7 @@
#include <log/dummylog.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <asio.hpp>
#include <asiolink/dummy_io_cb.h>
...
...
@@ -38,7 +38,7 @@ using asio::ip::tcp;
using
namespace
std
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
namespace
asiolink
{
...
...
src/lib/asiolink/tcp_server.h
View file @
36dd3d4b
...
...
@@ -91,7 +91,7 @@ private:
boost
::
shared_ptr
<
asio
::
ip
::
tcp
::
socket
>
socket_
;
// The buffer into which the response is written
boost
::
shared_ptr
<
isc
::
util
::
OutputBuffer
>
respbuf_
;
boost
::
shared_ptr
<
isc
::
util
::
io
::
OutputBuffer
>
respbuf_
;
// \c IOMessage and \c Message objects to be passed to the
// DNS lookup and answer providers
...
...
src/lib/asiolink/tcp_socket.h
View file @
36dd3d4b
...
...
@@ -33,8 +33,8 @@
#include <config.h>
#include <util/buffer.h>
#include <util/
asiolink
_utilities.h>
#include <util/
io/
buffer.h>
#include <util/
io/io
_utilities.h>
#include <asiolink/io_asio_socket.h>
#include <asiolink/io_endpoint.h>
...
...
@@ -155,7 +155,7 @@ public:
virtual
bool
processReceivedData
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
);
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
);
/// \brief Cancel I/O On Socket
virtual
void
cancel
();
...
...
@@ -185,7 +185,7 @@ private:
// The option of sending the data in two operations, the count followed by
// the data was discounted as that would lead to two callbacks which would
// cause problems with the stackless coroutine code.
isc
::
util
::
OutputBufferPtr
send_buffer_
;
///< Send buffer
isc
::
util
::
io
::
OutputBufferPtr
send_buffer_
;
///< Send buffer
};
// Constructor - caller manages socket
...
...
@@ -268,7 +268,7 @@ TCPSocket<C>::asyncSend(const void* data, size_t length,
uint16_t
count
=
boost
::
numeric_cast
<
uint16_t
>
(
length
);
// Copy data into a buffer preceded by the count field.
send_buffer_
.
reset
(
new
isc
::
util
::
OutputBuffer
(
length
+
2
));
send_buffer_
.
reset
(
new
isc
::
util
::
io
::
OutputBuffer
(
length
+
2
));
send_buffer_
->
writeUint16
(
count
);
send_buffer_
->
writeData
(
data
,
length
);
...
...
@@ -333,7 +333,7 @@ template <typename C> bool
TCPSocket
<
C
>::
processReceivedData
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
)
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
)
{
// Point to the data in the staging buffer and note how much there is.
const
uint8_t
*
data
=
static_cast
<
const
uint8_t
*>
(
staging
);
...
...
@@ -358,7 +358,7 @@ TCPSocket<C>::processReceivedData(const void* staging, size_t length,
}
// Have enough data to interpret the packet count, so do so now.
expected
=
isc
::
util
::
readUint16
(
data
);
expected
=
isc
::
util
::
io
::
readUint16
(
data
);
// We have two bytes less of data to process. Point to the start of the
// data and adjust the packet size. Note that at this point,
...
...
src/lib/asiolink/tests/dns_server_unittest.cc
View file @
36dd3d4b
...
...
@@ -67,6 +67,7 @@
using
namespace
asiolink
;
using
namespace
asio
;
namespace
{
static
const
std
::
string
server_ip
=
"127.0.0.1"
;
const
int
server_port
=
5553
;
...
...
@@ -109,7 +110,7 @@ class DummyLookup : public DNSLookup, public ServerStopper {
void
operator
()(
const
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
util
::
OutputBufferPtr
buffer
,
isc
::
util
::
io
::
OutputBufferPtr
buffer
,
DNSServer
*
server
)
const
{
stopServer
();
server
->
resume
(
true
);
...
...
@@ -123,7 +124,7 @@ class SimpleAnswer : public DNSAnswer, public ServerStopper {
void
operator
()(
const
IOMessage
&
message
,
isc
::
dns
::
MessagePtr
query_message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
util
::
OutputBufferPtr
buffer
)
const
isc
::
util
::
io
::
OutputBufferPtr
buffer
)
const
{
//copy what we get from user
buffer
->
writeData
(
message
.
getData
(),
message
.
getDataSize
());
...
...
src/lib/asiolink/tests/io_fetch_unittest.cc
View file @
36dd3d4b
...
...
@@ -26,8 +26,8 @@
#include <asio.hpp>
#include <util/buffer.h>
#include <util/
asiolink
_utilities.h>
#include <util/
io/
buffer.h>
#include <util/
io/io
_utilities.h>
#include <dns/question.h>
#include <dns/message.h>
...
...
@@ -43,7 +43,7 @@
using
namespace
asio
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
asio
::
ip
;
using
namespace
std
;
...
...
src/lib/asiolink/tests/tcp_socket_unittest.cc
View file @
36dd3d4b
...
...
@@ -35,8 +35,8 @@
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <util/buffer.h>
#include <util/
asiolink
_utilities.h>
#include <util/
io/
buffer.h>
#include <util/
io/io
_utilities.h>
#include <asio.hpp>
...
...
@@ -47,7 +47,7 @@
using
namespace
asio
;
using
namespace
asio
::
ip
;
using
namespace
asiolink
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
std
;
namespace
{
...
...
src/lib/asiolink/tests/udp_socket_unittest.cc
View file @
36dd3d4b
...
...
@@ -35,8 +35,8 @@
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
#include <util/buffer.h>
#include <util/
asiolink
_utilities.h>
#include <util/
io/
buffer.h>
#include <util/
io/io
_utilities.h>
#include <asio.hpp>
...
...
@@ -46,7 +46,7 @@
using
namespace
asio
;
using
namespace
asiolink
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
std
;
namespace
{
...
...
src/lib/asiolink/udp_server.cc
View file @
36dd3d4b
...
...
@@ -38,7 +38,7 @@ using isc::log::dlog;
using
namespace
std
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
namespace
asiolink
{
...
...
@@ -135,7 +135,7 @@ struct UDPServer::Data {
isc
::
dns
::
MessagePtr
answer_message_
;
// The buffer into which the response is written
isc
::
util
::
OutputBufferPtr
respbuf_
;
isc
::
util
::
io
::
OutputBufferPtr
respbuf_
;
// The buffer into which the query packet is written
boost
::
shared_array
<
char
>
data_
;
...
...
src/lib/asiolink/udp_socket.h
View file @
36dd3d4b
...
...
@@ -141,7 +141,7 @@ public:
virtual
bool
processReceivedData
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
);
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
);
/// \brief Cancel I/O On Socket
virtual
void
cancel
();
...
...
@@ -283,7 +283,7 @@ template <typename C> bool
UDPSocket
<
C
>::
processReceivedData
(
const
void
*
staging
,
size_t
length
,
size_t
&
cumulative
,
size_t
&
offset
,
size_t
&
expected
,
isc
::
util
::
OutputBufferPtr
&
outbuff
)
isc
::
util
::
io
::
OutputBufferPtr
&
outbuff
)
{
// Set return values to what we should expect.
cumulative
=
length
;
...
...
src/lib/bench/benchmark_util.cc
View file @
36dd3d4b
...
...
@@ -19,7 +19,7 @@
#include <exceptions/exceptions.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/exceptions.h>
#include <dns/name.h>
#include <dns/message.h>
...
...
@@ -35,7 +35,7 @@
using
namespace
std
;
using
namespace
isc
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
namespace
isc
{
namespace
bench
{
...
...
src/lib/bench/tests/loadquery_unittest.cc
View file @
36dd3d4b
...
...
@@ -17,7 +17,7 @@
#include <vector>
#include <sstream>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
#include <dns/name.h>
#include <dns/opcode.h>
...
...
@@ -32,7 +32,7 @@
using
namespace
std
;
using
namespace
isc
::
bench
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
namespace
{
typedef
pair
<
string
,
string
>
QueryParam
;
...
...
src/lib/cache/tests/cache_test_messagefromfile.h
View file @
36dd3d4b
...
...
@@ -14,7 +14,7 @@
#include <vector>
#include <dns/tests/unittest_util.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
using
namespace
isc
;
...
...
@@ -31,7 +31,7 @@ messageFromFile(Message& message, const char* datafile) {
std
::
vector
<
unsigned
char
>
data
;
UnitTestUtil
::
readWireData
(
datafile
,
data
);
isc
::
util
::
InputBuffer
buffer
(
&
data
[
0
],
data
.
size
());
isc
::
util
::
io
::
InputBuffer
buffer
(
&
data
[
0
],
data
.
size
());
message
.
fromWire
(
buffer
);
}
...
...
src/lib/cache/tests/cache_test_sectioncount.h
View file @
36dd3d4b
...
...
@@ -14,7 +14,7 @@
#include <vector>
#include <dns/tests/unittest_util.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
using
namespace
isc
;
...
...
src/lib/cache/tests/message_cache_unittest.cc
View file @
36dd3d4b
...
...
@@ -16,7 +16,7 @@
#include <string>
#include <gtest/gtest.h>
#include <dns/tests/unittest_util.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include "../message_cache.h"
#include "../rrset_cache.h"
#include "../resolver_cache.h"
...
...
@@ -25,7 +25,7 @@
using
namespace
isc
::
cache
;
using
namespace
isc
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
std
;
namespace
{
...
...
src/lib/cache/tests/message_entry_unittest.cc
View file @
36dd3d4b
...
...
@@ -15,7 +15,7 @@
#include <gtest/gtest.h>
#include <dns/tests/unittest_util.h>
#include <dns/message.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include "../message_entry.h"
#include "../rrset_cache.h"
#include "../resolver_cache.h"
...
...
src/lib/datasrc/data_source.cc
View file @
36dd3d4b
...
...
@@ -26,9 +26,9 @@
#include <datasrc/data_source.h>
#include <datasrc/query.h>
#include <util/base32hex.h>
#include <util/
buffer
.h>
#include <util/
sha1
.h>
#include <util/
compat/
base32hex.h>
#include <util/
compat/sha1
.h>
#include <util/
io/buffer
.h>
#include <dns/message.h>
#include <dns/name.h>
...
...
@@ -46,7 +46,8 @@
} while (0)
using
namespace
std
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
util
::
compat
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
dns
::
rdata
;
...
...
src/lib/datasrc/tests/datasrc_unittest.cc
View file @
36dd3d4b
...
...
@@ -20,7 +20,7 @@
#include <gtest/gtest.h>
#include <util/buffer.h>
#include <util/
io/
buffer.h>
#include <dns/message.h>
#include <dns/messagerenderer.h>
...
...
@@ -45,7 +45,7 @@
using
isc
::
UnitTestUtil
;
using
namespace
std
;
using
namespace
isc
::
util
;
using
namespace
isc
::
util
::
io
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
dns
::
rdata
;
using
namespace
isc
::
datasrc
;
...
...
src/lib/dns/Makefile.am
View file @
36dd3d4b
...
...
@@ -64,7 +64,6 @@ lib_LTLIBRARIES = libdns++.la
libdns___la_SOURCES
=
libdns___la_SOURCES
+=
edns.h edns.cc
libdns___la_SOURCES
+=
exceptions.h exceptions.cc
libdns___la_SOURCES
+=
util/hex.h
libdns___la_SOURCES
+=
masterload.h masterload.cc
libdns___la_SOURCES
+=
message.h message.cc