BIND 10 trac826, updated. 5c0c029adc27ad96a5fbd88d06d50204a53a2537 fix libasiodns
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 28 22:57:46 UTC 2012
The branch, trac826 has been updated
via 5c0c029adc27ad96a5fbd88d06d50204a53a2537 (commit)
from 98743e8215518210ae8e6efb5348b14c4fe4cd28 (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 5c0c029adc27ad96a5fbd88d06d50204a53a2537
Author: Francis Dupont <fdupont at isc.org>
Date: Fri Jun 29 00:57:35 2012 +0200
fix libasiodns
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiodns/dns_service.cc | 5 +++++
src/lib/asiodns/tests/dns_server_unittest.cc | 11 +++++++----
src/lib/asiodns/tests/dns_service_unittest.cc | 5 +++--
win32build/VS2008/libasiodns/libasiodns.vcproj | 16 ++++++++++++++++
.../libasiodns_tests/libasiodns_tests.vcproj | 4 ++--
win32build/VS2010/libasiodns/libasiodns.vcxproj | 6 +++++-
.../VS2010/libasiodns/libasiodns.vcxproj.filters | 12 ++++++++++++
.../libasiodns_tests/libasiodns_tests.vcxproj | 4 ++--
.../libasiodns_tests.vcxproj.filters | 6 +++---
9 files changed, 55 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/asiodns/dns_service.cc b/src/lib/asiodns/dns_service.cc
index 175e82b..8747464 100644
--- a/src/lib/asiodns/dns_service.cc
+++ b/src/lib/asiodns/dns_service.cc
@@ -14,6 +14,11 @@
#include <config.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#include <mswsock.h>
+#endif
+
#include <exceptions/exceptions.h>
#include <dns_service.h>
diff --git a/src/lib/asiodns/tests/dns_server_unittest.cc b/src/lib/asiodns/tests/dns_server_unittest.cc
index 39c6a53..e0dfa30 100644
--- a/src/lib/asiodns/tests/dns_server_unittest.cc
+++ b/src/lib/asiodns/tests/dns_server_unittest.cc
@@ -36,8 +36,10 @@
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#ifndef _WIN32
#include <sys/types.h>
#include <sys/socket.h>
+#endif
/// The following tests focus on stop interface for udp and
/// tcp server, there are lots of things can be shared to test
@@ -382,7 +384,7 @@ class DNSServerTestBase : public::testing::Test {
#ifdef _WIN32
UINT_PTR id = 1;
SetTimer(NULL, id, IO_SERVICE_TIME_OUT * 1000,
- DNSServerTest::stopIOService);
+ DNSServerTestBase::stopIOService);
current_service = &service;
service.run();
service.reset();
@@ -408,8 +410,9 @@ class DNSServerTestBase : public::testing::Test {
UINT_PTR _no_use_idevent,
DWORD _no_use_dwtime)
#else
- static void stopIOService(int _no_use_parameter) {
+ static void stopIOService(int _no_use_parameter)
#endif
+ {
io_service_is_time_out = true;
if (current_service != NULL) {
current_service->stop();
@@ -516,8 +519,8 @@ protected:
this->checker_, this->lookup_,
this->answer_);
#ifdef _WIN32
- const int fdTCP(getFd(SOCK_STREAM));
- ASSERT_NE(-1, fdTCP) << strerror(errno);
+ const SOCKET fdTCP(getFd(SOCK_STREAM));
+ ASSERT_NE(INVALID_SOCKET, fdTCP) << strerror(errno);
#else
const int fdTCP(getFd(SOCK_STREAM));
ASSERT_NE(-1, fdTCP) << strerror(errno);
diff --git a/src/lib/asiodns/tests/dns_service_unittest.cc b/src/lib/asiodns/tests/dns_service_unittest.cc
index 4450053..7122874 100644
--- a/src/lib/asiodns/tests/dns_service_unittest.cc
+++ b/src/lib/asiodns/tests/dns_service_unittest.cc
@@ -26,10 +26,10 @@
#include <csignal>
+#ifndef _WIN32
#include <sys/types.h>
#include <sys/socket.h>
-#ifndef _WIN32
#include <unistd.h>
#include <netdb.h>
#endif
@@ -140,8 +140,9 @@ protected:
UINT_PTR _no_use_idevent,
DWORD _no_use_dwtime)
#else
- static void stopIOService(int) {
+ static void stopIOService(int)
#endif
+ {
io_service_is_time_out = true;
if (current_service != NULL) {
current_service->stop();
diff --git a/win32build/VS2008/libasiodns/libasiodns.vcproj b/win32build/VS2008/libasiodns/libasiodns.vcproj
index b279679..4bbefe2 100755
--- a/win32build/VS2008/libasiodns/libasiodns.vcproj
+++ b/win32build/VS2008/libasiodns/libasiodns.vcproj
@@ -165,6 +165,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\asiodns\logger.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\asiodns\sync_udp_server.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\asiodns\tcp_server.cc"
>
</File>
@@ -207,6 +215,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\asiodns\logger.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\asiodns\sync_udp_server.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\asiodns\tcp_server.h"
>
</File>
diff --git a/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj b/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
index 70be012..4968b8a 100755
--- a/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
+++ b/win32build/VS2008/libasiodns_tests/libasiodns_tests.vcproj
@@ -185,11 +185,11 @@
>
</File>
<File
- RelativePath="..\..\..\src\lib\asiodns\tests\io_fetch_unittest.cc"
+ RelativePath="..\..\..\src\lib\asiodns\tests\dns_service_unittest.cc"
>
</File>
<File
- RelativePath="..\..\..\src\lib\asiodns\tests\io_service_unittest.cc"
+ RelativePath="..\..\..\src\lib\asiodns\tests\io_fetch_unittest.cc"
>
</File>
<File
diff --git a/win32build/VS2010/libasiodns/libasiodns.vcxproj b/win32build/VS2010/libasiodns/libasiodns.vcxproj
index 757e711..5648847 100755
--- a/win32build/VS2010/libasiodns/libasiodns.vcxproj
+++ b/win32build/VS2010/libasiodns/libasiodns.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -18,6 +18,8 @@
<ClInclude Include="..\..\..\src\lib\asiodns\dns_server.h" />
<ClInclude Include="..\..\..\src\lib\asiodns\dns_service.h" />
<ClInclude Include="..\..\..\src\lib\asiodns\io_fetch.h" />
+ <ClInclude Include="..\..\..\src\lib\asiodns\logger.h" />
+ <ClInclude Include="..\..\..\src\lib\asiodns\sync_udp_server.h" />
<ClInclude Include="..\..\..\src\lib\asiodns\tcp_server.h" />
<ClInclude Include="..\..\..\src\lib\asiodns\udp_server.h" />
</ItemGroup>
@@ -25,6 +27,8 @@
<ClCompile Include="..\..\..\src\lib\asiodns\asiodns_messages.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\dns_service.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\io_fetch.cc" />
+ <ClCompile Include="..\..\..\src\lib\asiodns\logger.cc" />
+ <ClCompile Include="..\..\..\src\lib\asiodns\sync_udp_server.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\tcp_server.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\udp_server.cc" />
</ItemGroup>
diff --git a/win32build/VS2010/libasiodns/libasiodns.vcxproj.filters b/win32build/VS2010/libasiodns/libasiodns.vcxproj.filters
index 111f01d..c140df6 100755
--- a/win32build/VS2010/libasiodns/libasiodns.vcxproj.filters
+++ b/win32build/VS2010/libasiodns/libasiodns.vcxproj.filters
@@ -42,6 +42,12 @@
<ClInclude Include="..\..\..\src\lib\asiodns\asiodns_messages.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\lib\asiodns\logger.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\asiodns\sync_udp_server.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\asiodns\dns_service.cc">
@@ -59,5 +65,11 @@
<ClCompile Include="..\..\..\src\lib\asiodns\asiodns_messages.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\asiodns\logger.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\asiodns\sync_udp_server.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj b/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj
index 38ac393..3fc9ef7 100755
--- a/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj
+++ b/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -87,8 +87,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\asiodns\tests\dns_server_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\asiodns\tests\dns_service_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\tests\io_fetch_unittest.cc" />
- <ClCompile Include="..\..\..\src\lib\asiodns\tests\io_service_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\asiodns\tests\run_unittests.cc" />
<ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
</ItemGroup>
diff --git a/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj.filters b/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj.filters
index e8c1691..1d919be 100755
--- a/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj.filters
+++ b/win32build/VS2010/libasiodns_tests/libasiodns_tests.vcxproj.filters
@@ -21,15 +21,15 @@
<ClCompile Include="..\..\..\src\lib\asiodns\tests\io_fetch_unittest.cc">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\lib\asiodns\tests\io_service_unittest.cc">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\lib\asiodns\tests\run_unittests.cc">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\asiodns\tests\dns_service_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
More information about the bind10-changes
mailing list