BIND 10 master, updated. 479e328c6685788093ff7fdece472629f863fd39 [master] Merge remote-tracking branch 'origin/trac2028'
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jun 15 18:30:26 UTC 2012
The branch, master has been updated
via 479e328c6685788093ff7fdece472629f863fd39 (commit)
via 9ca86731ef187433a58f8489ff983d536a3ae005 (commit)
from 0a4607b2a469aa91bc60ccfab2212eb10a96c5a2 (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 479e328c6685788093ff7fdece472629f863fd39
Merge: 0a4607b 9ca8673
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Fri Jun 15 11:26:45 2012 -0700
[master] Merge remote-tracking branch 'origin/trac2028'
-----------------------------------------------------------------------
Summary of changes:
.../isc/util/cio/tests/socketsession_test.py | 14 ++++++++++----
src/lib/util/tests/socketsession_unittest.cc | 12 +++++++++---
2 files changed, 19 insertions(+), 7 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/util/cio/tests/socketsession_test.py b/src/lib/python/isc/util/cio/tests/socketsession_test.py
index 66b43d5..f2de999 100644
--- a/src/lib/python/isc/util/cio/tests/socketsession_test.py
+++ b/src/lib/python/isc/util/cio/tests/socketsession_test.py
@@ -22,6 +22,8 @@ TESTDATA_OBJDIR = os.getenv("TESTDATAOBJDIR")
TEST_UNIX_FILE = TESTDATA_OBJDIR + '/ssessiontest.unix'
TEST_DATA = b'BIND10 test'
TEST_PORT = 53535
+TEST_PORT2 = 53536
+TEST_PORT3 = 53537
class TestForwarder(unittest.TestCase):
'''In general, this is a straightforward port of the C++ counterpart.
@@ -179,8 +181,11 @@ class TestForwarder(unittest.TestCase):
self.assertEqual(TEST_DATA, client_sock.recv(len(TEST_DATA)))
def test_push_and_pop(self):
- # This is a straightforward port of C++ pushAndPop test.
+ # This is a straightforward port of C++ pushAndPop test. See the
+ # C++ version why we use multiple ports for "local".
local6 = ('::1', TEST_PORT, 0, 0)
+ local6_alt = ('::1', TEST_PORT2, 0, 0)
+ local6_alt2 = ('::1', TEST_PORT3, 0, 0)
remote6 = ('2001:db8::1', 5300, 0, 0)
self.check_push_and_pop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP,
local6, remote6, TEST_DATA, True)
@@ -188,6 +193,7 @@ class TestForwarder(unittest.TestCase):
local6, remote6, TEST_DATA, False)
local4 = ('127.0.0.1', TEST_PORT)
+ local4_alt = ('127.0.0.1', TEST_PORT2)
remote4 = ('192.0.2.2', 5300)
self.check_push_and_pop(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
local4, remote4, TEST_DATA, False)
@@ -195,11 +201,11 @@ class TestForwarder(unittest.TestCase):
local4, remote4, TEST_DATA, False)
self.check_push_and_pop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP,
- local6, remote6, self.large_text, False)
+ local6_alt, remote6, self.large_text, False)
self.check_push_and_pop(AF_INET6, SOCK_STREAM, IPPROTO_TCP,
local6, remote6, self.large_text, False)
self.check_push_and_pop(AF_INET, SOCK_DGRAM, IPPROTO_UDP,
- local4, remote4, self.large_text, False)
+ local4_alt, remote4, self.large_text, False)
self.check_push_and_pop(AF_INET, SOCK_STREAM, IPPROTO_TCP,
local4, remote4, self.large_text, False)
@@ -207,7 +213,7 @@ class TestForwarder(unittest.TestCase):
# scope (zone) ID
scope6 = ('fe80::1', TEST_PORT, 0, 1)
self.check_push_and_pop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP,
- local6, scope6, TEST_DATA, False)
+ local6_alt2, scope6, TEST_DATA, False)
def test_push_too_fast(self):
# A straightforward port of C++ pushTooFast test.
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index b9f2667..e83c140 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -53,6 +53,7 @@ namespace {
const char* const TEST_UNIX_FILE = TEST_DATA_TOPBUILDDIR "/test.unix";
const char* const TEST_PORT = "53535";
+const char* const TEST_PORT2 = "53536"; // use this in case we need 2 ports
const char TEST_DATA[] = "BIND10 test";
// A simple helper structure to automatically close test sockets on return
@@ -540,8 +541,12 @@ ForwardTest::checkPushAndPop(int family, int type, int protocol,
}
TEST_F(ForwardTest, pushAndPop) {
- // Pass a UDP/IPv6 session.
+ // Pass a UDP/IPv6 session. We use different ports for different UDP
+ // tests because Solaris 11 seems to prohibit reusing the same port for
+ // some short period once the socket FD is forwarded, even if the sockets
+ // are closed. See Trac #2028.
const SockAddrInfo sai_local6(getSockAddr("::1", TEST_PORT));
+ const SockAddrInfo sai_local6_alt(getSockAddr("::1", TEST_PORT2));
const SockAddrInfo sai_remote6(getSockAddr("2001:db8::1", "5300"));
{
SCOPED_TRACE("Passing UDP/IPv6 session");
@@ -559,6 +564,7 @@ TEST_F(ForwardTest, pushAndPop) {
// receiver, which should be usable for multiple attempts of passing,
// regardless of family of the passed session
const SockAddrInfo sai_local4(getSockAddr("127.0.0.1", TEST_PORT));
+ const SockAddrInfo sai_local4_alt(getSockAddr("127.0.0.1", TEST_PORT2));
const SockAddrInfo sai_remote4(getSockAddr("192.0.2.2", "5300"));
{
SCOPED_TRACE("Passing UDP/IPv4 session");
@@ -575,7 +581,7 @@ TEST_F(ForwardTest, pushAndPop) {
// Also try large data
{
SCOPED_TRACE("Passing UDP/IPv6 session with large data");
- checkPushAndPop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, sai_local6,
+ checkPushAndPop(AF_INET6, SOCK_DGRAM, IPPROTO_UDP, sai_local6_alt,
sai_remote6, large_text_.c_str(), large_text_.length(),
false);
}
@@ -587,7 +593,7 @@ TEST_F(ForwardTest, pushAndPop) {
}
{
SCOPED_TRACE("Passing UDP/IPv4 session with large data");
- checkPushAndPop(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local4,
+ checkPushAndPop(AF_INET, SOCK_DGRAM, IPPROTO_UDP, sai_local4_alt,
sai_remote4, large_text_.c_str(), large_text_.length(),
false);
}
More information about the bind10-changes
mailing list