diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-06 23:22:48 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-06-06 23:22:48 +0000 |
| commit | 04d1b92cb6d3f86e0b0cc66332d60f5cab7de58f (patch) | |
| tree | d3a3376c8e813e3ddb2c91bf390ccd337e61cab9 | |
| parent | c785c5c564b10230a51d22f26d11ae75358ed0f1 (diff) | |
| download | ATCD-04d1b92cb6d3f86e0b0cc66332d60f5cab7de58f.tar.gz | |
Thu Jun 6 23:19:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com>
* tao/IIOP_Endpoint.cpp:
Fix for an old bug that occurred when a client is using
-ORBPreferIPv6Interfaces 1, and the supplied IOR contains
only a single IPv4 endpoint.
* tests/IPV6/run_test.pl:
Add a regression test for the above. Also an intemediate patch to
make one of the regression tests dump verbose logging to see why the
test fails on the nightly build host.
| -rw-r--r-- | TAO/ChangeLog | 14 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Endpoint.cpp | 2 | ||||
| -rwxr-xr-x | TAO/tests/IPV6/run_test.pl | 9 |
3 files changed, 23 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8ca83d98481..752c923f51c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Jun 6 23:19:04 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/IIOP_Endpoint.cpp: + + Fix for an old bug that occurred when a client is using + -ORBPreferIPv6Interfaces 1, and the supplied IOR contains + only a single IPv4 endpoint. + + * tests/IPV6/run_test.pl: + + Add a regression test for the above. Also an intemediate patch to + make one of the regression tests dump verbose logging to see why the + test fails on the nightly build host. + Thu Jun 6 12:38:36 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * performance-tests/Cubit/TAO/MT_Cubit/server.cpp: diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp index be98bc1a382..be553ed041b 100644 --- a/TAO/tao/IIOP_Endpoint.cpp +++ b/TAO/tao/IIOP_Endpoint.cpp @@ -295,7 +295,7 @@ TAO_IIOP_Endpoint::next_filtered_i (TAO_IIOP_Endpoint *root, { if (candidate == 0) return !want_ipv6 ? candidate : - root->next_filtered_i(root, ipv6_only, prefer_ipv6, false); + root->next_filtered_i(0, ipv6_only, prefer_ipv6, false); if (want_ipv6 == candidate->is_ipv6_decimal()) return candidate; diff --git a/TAO/tests/IPV6/run_test.pl b/TAO/tests/IPV6/run_test.pl index dd0d7f39083..1b249c32820 100755 --- a/TAO/tests/IPV6/run_test.pl +++ b/TAO/tests/IPV6/run_test.pl @@ -53,8 +53,15 @@ $client_arg = "-k file://$client_iorfile "; url => 0, url_address => "", },{ + description => "Testing IPV4 server with client with '-ORBPreferIPV6Interfaces 1'.\n", + server => "$server_arg -ORBListenEndpoints iiop://127.0.0.1", + client => "$client_arg -ORBPreferIPV6Interfaces 1", + error => 0, + url => 0, + url_address => "", + },{ description => "Testing IPV4 server with client and URL-style IOR", - server => "$server_arg -ORBListenEndpoints iiop://0.0.0.0 -ORBObjRefStyle url", + server => "$server_arg -ORBDebuglevel 10 -ORBListenEndpoints iiop://0.0.0.0 -ORBObjRefStyle url", client => "$client_arg", error => 0, url => 0, |