Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
95b1c903
Commit
95b1c903
authored
Apr 08, 2011
by
Ocean Wang
Browse files
[trac751] Move some dependency of libasiolink to libasiodns
parent
8fc7cdd2
Changes
39
Hide whitespace changes
Inline
Side-by-side
src/bin/auth/Makefile.am
View file @
95b1c903
...
...
@@ -49,6 +49,7 @@ b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/config/libcfgclient.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
b10_auth_LDADD
+=
$(top_builddir)
/src/lib/xfr/libxfr.la
...
...
src/bin/auth/auth_srv.cc
View file @
95b1c903
...
...
@@ -68,7 +68,8 @@ using namespace isc::dns::rdata;
using
namespace
isc
::
data
;
using
namespace
isc
::
config
;
using
namespace
isc
::
xfr
;
using
namespace
asiolink
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
server_common
::
portconfig
;
class
AuthSrvImpl
{
...
...
@@ -766,6 +767,6 @@ AuthSrv::setListenAddresses(const AddressList& addresses) {
}
void
AuthSrv
::
setDNSService
(
asiolink
::
DNSService
&
dnss
)
{
AuthSrv
::
setDNSService
(
isc
::
asiodns
::
DNSService
&
dnss
)
{
dnss_
=
&
dnss
;
}
src/bin/auth/auth_srv.h
View file @
95b1c903
...
...
@@ -26,11 +26,11 @@
#include <dns/message.h>
#include <dns/buffer.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#include <asiolink/io_message.h>
#include <asiolink/io_service.h>
#include <asiolink/dns_server.h>
#include <asiolink/dns_lookup.h>
#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h>
#include <asiolink/asiolink.h>
...
...
@@ -116,10 +116,10 @@ public:
/// \param server Pointer to the \c DNSServer
///
/// \throw isc::Unexpected Protocol type of \a message is unexpected
void
processMessage
(
const
asiolink
::
IOMessage
&
io_message
,
void
processMessage
(
const
isc
::
asiolink
::
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
message
,
isc
::
dns
::
OutputBufferPtr
buffer
,
asiolink
::
DNSServer
*
server
);
isc
::
asiodns
::
DNSServer
*
server
);
/// \brief Set verbose flag
///
...
...
@@ -202,16 +202,16 @@ public:
void
setConfigSession
(
isc
::
config
::
ModuleCCSession
*
config_session
);
/// \brief Return this object's ASIO IO Service queue
asiolink
::
IOService
&
getIOService
();
isc
::
asiolink
::
IOService
&
getIOService
();
/// \brief Return pointer to the DNS Lookup callback function
asiolink
::
DNSLookup
*
getDNSLookupProvider
()
const
{
return
(
dns_lookup_
);
}
isc
::
asiodns
::
DNSLookup
*
getDNSLookupProvider
()
const
{
return
(
dns_lookup_
);
}
/// \brief Return pointer to the DNS Answer callback function
asiolink
::
DNSAnswer
*
getDNSAnswerProvider
()
const
{
return
(
dns_answer_
);
}
isc
::
asiodns
::
DNSAnswer
*
getDNSAnswerProvider
()
const
{
return
(
dns_answer_
);
}
/// \brief Return pointer to the Checkin callback function
asiolink
::
SimpleCallback
*
getCheckinProvider
()
const
{
return
(
checkin_
);
}
isc
::
asiolink
::
SimpleCallback
*
getCheckinProvider
()
const
{
return
(
checkin_
);
}
/// \brief Set or update the size (number of slots) of hot spot cache.
///
...
...
@@ -372,15 +372,15 @@ public:
const
;
/// \brief Assign an ASIO DNS Service queue to this Auth object
void
setDNSService
(
asiolink
::
DNSService
&
dnss
);
void
setDNSService
(
isc
::
asiodns
::
DNSService
&
dnss
);
private:
AuthSrvImpl
*
impl_
;
asiolink
::
SimpleCallback
*
checkin_
;
asiolink
::
DNSLookup
*
dns_lookup_
;
asiolink
::
DNSAnswer
*
dns_answer_
;
asiolink
::
DNSService
*
dnss_
;
isc
::
asiolink
::
SimpleCallback
*
checkin_
;
isc
::
asiodns
::
DNSLookup
*
dns_lookup_
;
isc
::
asiodns
::
DNSAnswer
*
dns_answer_
;
isc
::
asiodns
::
DNSService
*
dnss_
;
};
#endif // __AUTH_SRV_H
...
...
src/bin/auth/benchmarks/Makefile.am
View file @
95b1c903
...
...
@@ -22,6 +22,7 @@ query_bench_LDADD += $(top_builddir)/src/lib/cc/libcc.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/xfr/libxfr.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/nsas/libnsas.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
query_bench_LDADD
+=
$(top_builddir)
/src/lib/server_common/libserver_common.la
query_bench_LDADD
+=
$(SQLITE_LIBS)
src/bin/auth/benchmarks/query_bench.cc
View file @
95b1c903
...
...
@@ -36,6 +36,7 @@
#include <auth/auth_config.h>
#include <auth/query.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
using
namespace
std
;
...
...
@@ -45,7 +46,8 @@ using namespace isc::auth;
using
namespace
isc
::
dns
;
using
namespace
isc
::
xfr
;
using
namespace
isc
::
bench
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
namespace
{
// Commonly used constant:
...
...
src/bin/auth/main.cc
View file @
95b1c903
...
...
@@ -43,6 +43,7 @@
#include <auth/command.h>
#include <auth/change_user.h>
#include <auth/auth_srv.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <log/dummylog.h>
...
...
@@ -52,7 +53,8 @@ using namespace isc::cc;
using
namespace
isc
::
config
;
using
namespace
isc
::
dns
;
using
namespace
isc
::
xfr
;
using
namespace
asiolink
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
asiodns
;
namespace
{
...
...
src/bin/auth/tests/Makefile.am
View file @
95b1c903
...
...
@@ -39,6 +39,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/testutils/libtestutils.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libcfgclient.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
...
...
src/bin/auth/tests/auth_srv_unittest.cc
View file @
95b1c903
...
...
@@ -44,7 +44,8 @@ using namespace isc::dns;
using
namespace
isc
::
dns
::
rdata
;
using
namespace
isc
::
data
;
using
namespace
isc
::
xfr
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
testutils
;
using
namespace
isc
::
server_common
::
portconfig
;
using
isc
::
UnitTestUtil
;
...
...
src/bin/auth/tests/command_unittest.cc
View file @
95b1c903
...
...
@@ -99,7 +99,7 @@ AuthConmmandTest::stopServer() {
}
TEST_F
(
AuthConmmandTest
,
shutdown
)
{
asiolink
::
IntervalTimer
itimer
(
server
.
getIOService
());
isc
::
asiolink
::
IntervalTimer
itimer
(
server
.
getIOService
());
itimer
.
setup
(
boost
::
bind
(
&
AuthConmmandTest
::
stopServer
,
this
),
1
);
server
.
getIOService
().
run
();
EXPECT_EQ
(
0
,
rcode
);
...
...
src/bin/auth/tests/config_unittest.cc
View file @
95b1c903
...
...
@@ -35,7 +35,8 @@
using
namespace
isc
::
dns
;
using
namespace
isc
::
data
;
using
namespace
isc
::
datasrc
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
namespace
{
class
AuthConfigTest
:
public
::
testing
::
Test
{
...
...
src/bin/resolver/Makefile.am
View file @
95b1c903
...
...
@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/bin
-I
$(top_builddir)
/src/bin
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/dns
-I
$(top_builddir)
/src/lib/dns
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/cc
-I
$(top_builddir)
/src/lib/cc
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/asiodns
AM_CPPFLAGS
+=
-I
$(top_builddir)
/src/lib/asiodns
AM_CPPFLAGS
+=
-I
$(top_srcdir)
/src/lib/asiolink
AM_CPPFLAGS
+=
-I
$(top_builddir)
/src/lib/asiolink
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
...
...
@@ -45,6 +47,7 @@ b10_resolver_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/config/libcfgclient.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libexceptions.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/xfr/libxfr.la
b10_resolver_LDADD
+=
$(top_builddir)
/src/lib/log/liblog.la
...
...
src/bin/resolver/main.cc
View file @
95b1c903
...
...
@@ -27,6 +27,7 @@
#include <boost/foreach.hpp>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <exceptions/exceptions.h>
...
...
@@ -58,7 +59,8 @@ using namespace isc::cc;
using
namespace
isc
::
config
;
using
namespace
isc
::
data
;
using
isc
::
log
::
dlog
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
namespace
{
...
...
src/bin/resolver/resolver.cc
View file @
95b1c903
...
...
@@ -20,6 +20,7 @@
#include <vector>
#include <cassert>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <boost/foreach.hpp>
...
...
@@ -54,7 +55,8 @@ using namespace isc::dns;
using
namespace
isc
::
data
;
using
namespace
isc
::
config
;
using
isc
::
log
::
dlog
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
server_common
::
portconfig
;
class
ResolverImpl
{
...
...
@@ -295,7 +297,7 @@ public:
edns_response
->
setUDPSize
(
Message
::
DEFAULT_MAX_EDNS0_UDPSIZE
);
answer_message
->
setEDNS
(
edns_response
);
}
if
(
io_message
.
getSocket
().
getProtocol
()
==
IPPROTO_UDP
)
{
if
(
edns
)
{
renderer
.
setLengthLimit
(
edns
->
getUDPSize
());
...
...
@@ -345,7 +347,7 @@ Resolver::~Resolver() {
}
void
Resolver
::
setDNSService
(
asiolink
::
DNSService
&
dnss
)
{
Resolver
::
setDNSService
(
isc
::
asiodns
::
DNSService
&
dnss
)
{
dnss_
=
&
dnss
;
}
...
...
src/bin/resolver/resolver.h
View file @
95b1c903
...
...
@@ -24,12 +24,12 @@
#include <dns/message.h>
#include <dns/buffer.h>
#include <asiodns/dns_server.h>
#include <asiodns/dns_service.h>
#include <asiodns/dns_lookup.h>
#include <asiodns/dns_answer.h>
#include <asiolink/io_message.h>
#include <asiolink/io_service.h>
#include <asiolink/dns_server.h>
#include <asiolink/dns_service.h>
#include <asiolink/dns_lookup.h>
#include <asiolink/dns_answer.h>
#include <asiolink/simple_callback.h>
#include <nsas/nameserver_address_store.h>
...
...
@@ -82,11 +82,11 @@ public:
/// shall return to the client
/// \param buffer Pointer to an \c OutputBuffer for the resposne
/// \param server Pointer to the \c DNSServer
void
processMessage
(
const
asiolink
::
IOMessage
&
io_message
,
void
processMessage
(
const
isc
::
asiolink
::
IOMessage
&
io_message
,
isc
::
dns
::
MessagePtr
query_message
,
isc
::
dns
::
MessagePtr
answer_message
,
isc
::
dns
::
OutputBufferPtr
buffer
,
asiolink
::
DNSServer
*
server
);
isc
::
asiodns
::
DNSServer
*
server
);
/// \brief Set and get the config session
isc
::
config
::
ModuleCCSession
*
getConfigSession
()
const
;
...
...
@@ -96,16 +96,16 @@ public:
isc
::
data
::
ConstElementPtr
updateConfig
(
isc
::
data
::
ConstElementPtr
config
);
/// \brief Assign an ASIO IO Service queue to this Resolver object
void
setDNSService
(
asiolink
::
DNSService
&
dnss
);
void
setDNSService
(
isc
::
asiodns
::
DNSService
&
dnss
);
/// \brief Assign a NameserverAddressStore to this Resolver object
void
setNameserverAddressStore
(
isc
::
nsas
::
NameserverAddressStore
&
nsas
);
/// \brief Assign a cache to this Resolver object
void
setCache
(
isc
::
cache
::
ResolverCache
&
cache
);
/// \brief Return this object's ASIO IO Service queue
asiolink
::
DNSService
&
getDNSService
()
const
{
return
(
*
dnss_
);
}
isc
::
asiodns
::
DNSService
&
getDNSService
()
const
{
return
(
*
dnss_
);
}
/// \brief Returns this object's NSAS
isc
::
nsas
::
NameserverAddressStore
&
getNameserverAddressStore
()
const
{
...
...
@@ -116,15 +116,15 @@ public:
isc
::
cache
::
ResolverCache
&
getResolverCache
()
const
{
return
*
cache_
;
};
/// \brief Return pointer to the DNS Lookup callback function
asiolink
::
DNSLookup
*
getDNSLookupProvider
()
{
return
(
dns_lookup_
);
}
isc
::
asiodns
::
DNSLookup
*
getDNSLookupProvider
()
{
return
(
dns_lookup_
);
}
/// \brief Return pointer to the DNS Answer callback function
asiolink
::
DNSAnswer
*
getDNSAnswerProvider
()
{
return
(
dns_answer_
);
}
isc
::
asiodns
::
DNSAnswer
*
getDNSAnswerProvider
()
{
return
(
dns_answer_
);
}
/// \brief Return pointer to the Checkin callback function
asiolink
::
SimpleCallback
*
getCheckinProvider
()
{
return
(
checkin_
);
}
isc
::
asiolink
::
SimpleCallback
*
getCheckinProvider
()
{
return
(
checkin_
);
}
/**
* \brief Tell the Resolver that is has already been configured
...
...
@@ -238,10 +238,10 @@ public:
private:
ResolverImpl
*
impl_
;
asiolink
::
DNSService
*
dnss_
;
asiolink
::
SimpleCallback
*
checkin_
;
asiolink
::
DNSLookup
*
dns_lookup_
;
asiolink
::
DNSAnswer
*
dns_answer_
;
isc
::
asiodns
::
DNSService
*
dnss_
;
isc
::
asiolink
::
SimpleCallback
*
checkin_
;
isc
::
asiodns
::
DNSLookup
*
dns_lookup_
;
isc
::
asiodns
::
DNSAnswer
*
dns_answer_
;
isc
::
nsas
::
NameserverAddressStore
*
nsas_
;
isc
::
cache
::
ResolverCache
*
cache_
;
// This value is initally false, and will be set to true
...
...
@@ -252,6 +252,6 @@ private:
#endif // __RESOLVER_H
// Local Variables:
// Local Variables:
// mode: c++
// End:
// End:
src/bin/resolver/response_scrubber.cc
View file @
95b1c903
...
...
@@ -26,7 +26,7 @@ using namespace std;
// Compare addresses etc.
ResponseScrubber
::
Category
ResponseScrubber
::
addressCheck
(
const
asiolink
::
IOEndpoint
&
to
,
const
asiolink
::
IOEndpoint
&
from
)
const
isc
::
asiolink
::
IOEndpoint
&
to
,
const
isc
::
asiolink
::
IOEndpoint
&
from
)
{
if
(
from
.
getProtocol
()
==
to
.
getProtocol
())
{
if
(
from
.
getAddress
()
==
to
.
getAddress
())
{
...
...
src/bin/resolver/response_scrubber.h
View file @
95b1c903
...
...
@@ -282,8 +282,8 @@ public:
///
/// \return SUCCESS if the two endpoints match, otherwise an error status
/// indicating what was incorrect.
static
Category
addressCheck
(
const
asiolink
::
IOEndpoint
&
to
,
const
asiolink
::
IOEndpoint
&
from
);
static
Category
addressCheck
(
const
isc
::
asiolink
::
IOEndpoint
&
to
,
const
isc
::
asiolink
::
IOEndpoint
&
from
);
/// \brief Check QID
///
...
...
src/bin/resolver/tests/Makefile.am
View file @
95b1c903
...
...
@@ -31,6 +31,7 @@ run_unittests_LDADD += $(SQLITE_LIBS)
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/testutils/libtestutils.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/datasrc/libdatasrc.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libdns++.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libasiodns.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libasiolink.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libcfgclient.la
run_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libcc.la
...
...
src/bin/resolver/tests/resolver_config_unittest.cc
View file @
95b1c903
...
...
@@ -20,6 +20,7 @@
#include <cc/data.h>
#include <asiodns/asiodns.h>
#include <asiolink/asiolink.h>
#include <resolver/resolver.h>
...
...
@@ -31,7 +32,8 @@
using
namespace
std
;
using
namespace
isc
::
data
;
using
namespace
isc
::
testutils
;
using
namespace
asiolink
;
using
namespace
isc
::
asiodns
;
using
namespace
isc
::
asiolink
;
using
isc
::
UnitTestUtil
;
namespace
{
...
...
src/bin/resolver/tests/response_scrubber_unittest.cc
View file @
95b1c903
...
...
@@ -41,6 +41,7 @@
// Class for endpoint checks. The family of the endpoint is set in the
// constructor; the address family by the string provided for the address.
namespace
isc
{
namespace
asiolink
{
class
GenericEndpoint
:
public
IOEndpoint
{
...
...
@@ -73,13 +74,14 @@ private:
short
protocol_
;
// Protocol of the endpoint
};
}
}
using
namespace
asio
::
ip
;
using
namespace
isc
::
dns
;
using
namespace
rdata
;
using
namespace
isc
::
dns
::
rdata
::
generic
;
using
namespace
isc
::
dns
::
rdata
::
in
;
using
namespace
asiolink
;
using
namespace
isc
::
asiolink
;
// Test class
...
...
src/lib/asiodns/Makefile.am
View file @
95b1c903
...
...
@@ -9,9 +9,6 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES
=
*
.gcno
*
.gcda
# This is a wrapper library solely used for b10-auth. The ASIO header files
# have some code fragments that would hit gcc's unused-parameter warning,
# which would make the build fail with -Werror (our default setting).
lib_LTLIBRARIES
=
libasiodns.la
libasiodns_la_SOURCES
=
dns_answer.h
libasiodns_la_SOURCES
+=
dns_lookup.h
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment