diff options
| author | Steve Huston <shuston@riverace.com> | 2007-07-31 15:01:29 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2007-07-31 15:01:29 +0000 |
| commit | fce807bdee6abdb66a4f90ae313817c228618ac4 (patch) | |
| tree | 7f6552e9da260fdcf31336e5053320d44aa76172 | |
| parent | 58c89be6fd990ec78aea1da5578055264feef805 (diff) | |
| download | ATCD-fce807bdee6abdb66a4f90ae313817c228618ac4.tar.gz | |
ChangeLogTag:Tue Jul 31 15:02:34 UTC 2007 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/tests/Multicast_Test_IPV6.cpp | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 3f7ddb9b7c5..74c94b7cbcd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 31 15:02:34 UTC 2007 Steve Huston <shuston@riverace.com> + + * tests/Multicast_Test_IPV6.cpp: Added some more diagnostic output and + changed the enable-loopback sockopt from char to int to try and avoid + some platform issues, particularly on Windows. + Tue Jul 31 14:45:35 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com> * contrib/utility/Utility/ReferenceCounting/DefaultImpl.hpp: diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 2a963923b1f..4357d8ad387 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -545,16 +545,19 @@ MCT_Event_Handler::join (const ACE_INET_Addr &mcast_addr, int reuse_addr, const ACE_TCHAR *net_if) { - if (this->mcast_.join (mcast_addr, reuse_addr, net_if) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("MCT_Event_Handler::join - %p\n"), - ACE_TEXT ("Could not join group")), - -1); - char buf[MAX_STRING_SIZE]; ACE_OS::sprintf (buf, "%s/%d", mcast_addr.get_host_addr (), mcast_addr.get_port_number ()); + + if (this->mcast_.join (mcast_addr, reuse_addr, net_if) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("MCT_Event_Handler::join %C %p\n"), + buf, + ACE_TEXT ("failed")), + -1); + + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Joined %C\n"), buf)); ACE_CString *str; ACE_NEW_RETURN (str, ACE_CString (ACE::strnew (buf)), -1); this->address_vec_.push_back (str); @@ -820,11 +823,11 @@ int producer (MCT_Config &config) // 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; + int do_loopback = 1; if (socket.set_option (IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (void *)&do_loopback, - 1) == -1) + sizeof (do_loopback)) == -1) { if (errno == ENOTSUP) ACE_DEBUG ((LM_INFO, |