diff options
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp | 16 |
2 files changed, 19 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 90d1bb5786a..adaade27ecc 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Fri May 17 09:10:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> + + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: + + Rename ALLOW_UNICAST_MIOP to TAO_ALLOW_UNICAST_MIOP, this feature + was originally not going to be committed into the Open Source but + it is being used (unwisely in our opinion) in the community. It + short circuits the error checking on joins, such that MIOP can + be used to send to a unicast address. I would not recommend building + TAO with this option set. + Fri May 17 08:26:00 UTC 2013 Simon Massey <simon dot massey at prismtech dot com> * orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp index 24e1491abe0..b1608a6bd87 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Mcast_Connection_Handler.cpp @@ -124,22 +124,22 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) preferred); preferred_size= preferred.size (); -#ifndef ALLOW_UNICAST_MIOP +#ifndef TAO_ALLOW_UNICAST_MIOP // If we are attempting to join ANY preferred listener interfaces, at least one join must // complete in the loop below for a successful outcome. If we have NO valid preferred // listener interfaces, then we are concidered successful HERE so as to allow the // default join to be attempted later. bool success= !preferred_size; -#endif // ALLOW_UNICAST_MIOP +#endif // TAO_ALLOW_UNICAST_MIOP for (CORBA::ULong i= 0u; i < preferred_size; ++i) if (0 == this->peer ().join ( this->local_addr_, 1, ACE_TEXT_CHAR_TO_TCHAR (preferred[i].c_str ()))) { -#ifndef ALLOW_UNICAST_MIOP +#ifndef TAO_ALLOW_UNICAST_MIOP success= true; // At least one perferred listener interface join succeeded -#endif // ALLOW_UNICAST_MIOP +#endif // TAO_ALLOW_UNICAST_MIOP if (TAO_debug_level > 5) ORBSVCS_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P|%t) - UIPMC_Mcast_Connection_Handler::open, ") @@ -158,10 +158,10 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) preferred[i].c_str () )); -#ifndef ALLOW_UNICAST_MIOP +#ifndef TAO_ALLOW_UNICAST_MIOP if (!success) return -1; // No joins worked, we are not listening. -#endif // ALLOW_UNICAST_MIOP +#endif // TAO_ALLOW_UNICAST_MIOP } // If we have NO valid preferred listener interfaces matches, then we attempt the @@ -193,9 +193,9 @@ TAO_UIPMC_Mcast_Connection_Handler::open (void *) ((this->listen_on_all_) ? "All" : "Default") )); -#ifndef ALLOW_UNICAST_MIOP +#ifndef TAO_ALLOW_UNICAST_MIOP return -1; // No joins worked, we are not listening. -#endif // ALLOW_UNICAST_MIOP +#endif // TAO_ALLOW_UNICAST_MIOP } } |