diff options
| author | Steve Huston <shuston@riverace.com> | 2007-07-24 21:12:04 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-07-24 21:12:04 +0000 |
| commit | 76b5301c09250aff6166c44ce9d2392ead8c7a7c (patch) | |
| tree | f691c95cd22ade006e25ca064b3c8910e8ce93d1 | |
| parent | 06ad5130a8a9bdc7da26627566b79969c0a6b5c2 (diff) | |
| download | ATCD-76b5301c09250aff6166c44ce9d2392ead8c7a7c.tar.gz | |
ChangeLogTag:Tue Jul 24 21:09:27 UTC 2007 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/tests/Multicast_Test_IPV6.cpp | 14 | ||||
| -rw-r--r-- | ACE/tests/Proactor_Test_IPV6.cpp | 5 |
3 files changed, 24 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e61e65d5adf..85dbd63345e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Jul 24 21:09:27 UTC 2007 Steve Huston <shuston@riverace.com> + + * tests/Proactor_Test_IPV6.cpp: Default to half duplex operation on + Linux. Identical to recent change to Proactor_Test.cpp; see + Wed Jun 27 13:48:50 UTC 2007 Steve Huston <shuston@riverace.com> + + * tests/Multicast_Test_IPV6.cpp: Don't log an error if + IPV6_MULTICAST_LOOP is an unsupported sockopt; also fix spelling. + Tue Jul 24 20:03:24 UTC 2007 Ciju John <johnc at ociweb dot com> * bin/tao_orb_tests.lst: diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index bc3db91d036..2a963923b1f 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -49,7 +49,7 @@ #if defined (ACE_HAS_IP_MULTICAST) && defined (ACE_HAS_THREADS) /* - * The 'finished' flag is used to break out of an infninite loop in the + * The 'finished' flag is used to break out of an infinite loop in the * task::svc () method. The 'handler' will set the flag in respose to * SIGINT (CTRL-C). */ @@ -818,15 +818,21 @@ int producer (MCT_Config &config) hops)); } - // Turn on multicast loop back since the test relies on it and the + // Turn on multicast loopback since the test relies on it and the // ACE_SOCK_Dgram_Mcast documents the loopback state as indeterminate. char do_loopback = 1; if (socket.set_option (IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (void *)&do_loopback, 1) == -1) - ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), - ACE_TEXT ("Can't set IPV6_MULTICAST_LOOP"))); + { + if (errno == ENOTSUP) + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("IPV6_MULTICAST_LOOP not supported\n"))); + else + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("Can't set IPV6_MULTICAST_LOOP"))); + } #endif /* ACE_HAS_IPV6 */ diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp index 0ac98651378..cd01d31b063 100644 --- a/ACE/tests/Proactor_Test_IPV6.cpp +++ b/ACE/tests/Proactor_Test_IPV6.cpp @@ -1840,6 +1840,11 @@ parse_args (int argc, ACE_TCHAR *argv[]) // Default transfer limit 50 messages per Sender xfer_limit = 50 * ACE_OS::strlen (complete_message); + // Linux kernels up to at least 2.6.9 (RHEL 4) can't do full duplex aio. +# if defined (linux) + duplex = 0; +#endif + if (argc == 1) // no arguments , so one button test return 0; |