Makefile.SSLIOP

4 files changed, 43 insertions, 19 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index e4b46306397..ab0513411bb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -86,10 +86,6 @@ public:
   /// endpoints set up by this acceptor.
   const SSLIOP::SSL &ssl_component (void) const;
 
-  /// Retrieve the CSIv2 CSIIOP::TLS_SEC_TRANS component associated with
-  /// the endpoints set up by this acceptor.
-  const SSLIOP::SSL &ssl_component (void) const;
-
 private:
 
   /// Implement the common part of the open*() methods.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index c90b167d441..bc1e49fac6b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -84,7 +84,7 @@ TAO_SSLIOP_Protocol_Factory::init (int argc,
 
   CSIIOP::AssociationOptions csiv2_target_supports =
     CSIIOP::Integrity | CSIIOP::Confidentiality;
-  CSIIOP::AssociationOptions csiv2_target_requires = 
+  CSIIOP::AssociationOptions csiv2_target_requires =
     CSIIOP::Integrity | CSIIOP::Confidentiality;
 
   // Force the Singleton instance to be initialized/instantiated.
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.cpp
index 57325016240..bf99b4c344a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.cpp
@@ -2,6 +2,9 @@
 
 
 #include "SSLIOP_IORInterceptor.h"
+#include "SSLIOP_Acceptor.h"
+
+#include "tao/Acceptor_Registry.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,9 +12,10 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO::SSLIOP::IORInterceptor (TAO_ORB_Core * orb_core,
-                             CSIIOP::AssociationOptions csiv2_target_supports,
-                             CSIIOP::AssociationOptions csiv2_target_requires)
+TAO::SSLIOP::IORInterceptor::IORInterceptor (
+  TAO_ORB_Core * orb_core,
+  CSIIOP::AssociationOptions csiv2_target_supports,
+  CSIIOP::AssociationOptions csiv2_target_requires)
   : orb_core_ (orb_core),
     csiv2_target_supports_ (csiv2_target_supports),
     csiv2_target_requires_ (csiv2_target_requires)
@@ -73,7 +77,7 @@ TAO::SSLIOP::IORInterceptor::establish_components (
   // Replace the contents of the octet sequence with the CDR stream.
   const CORBA::ULong len = cdr.total_length ();
   tc.component_data.length (len);
-  const CORBA::Octet * buf = tc.component_data.get_buffer ();
+  CORBA::Octet * buf = tc.component_data.get_buffer ();
   for (const ACE_Message_Block *i = cdr.begin ();
        i != 0;
        i = i->cont ())
@@ -120,7 +124,7 @@ TAO::SSLIOP::IORInterceptor::construct_transport_mech_component (
   IOP::TaggedComponent & tc)
 {
   // SSLIOP-specific CSIv2 TaggedComponent information.
-  transport_mech.tag = IOP::TAG_TLS_SEC_TRANS;
+  tc.tag = IOP::TAG_TLS_SEC_TRANS;
 
   CSIIOP::TLS_SEC_TRANS tls_component;
 
@@ -139,8 +143,8 @@ TAO::SSLIOP::IORInterceptor::construct_transport_mech_component (
 
   // Replace the contents of the octet sequence with the CDR stream.
   const CORBA::ULong len = cdr.total_length ();
-  transport_mech.component_data.length (len);
-  const CORBA::Octet * buf = transport_mech.component_data.get_buffer ();
+  tc.component_data.length (len);
+  CORBA::Octet * buf = tc.component_data.get_buffer ();
   for (const ACE_Message_Block *i = cdr.begin ();
        i != 0;
        i = i->cont ())
@@ -157,9 +161,9 @@ TAO::SSLIOP::IORInterceptor::populate_transport_address_list (
   CSIIOP::TransportAddressList & list)
 {
   TAO_Acceptor_Registry & ar =
-    this->orb_core_->lane_resources->acceptor_registry ();
+    this->orb_core_->lane_resources ().acceptor_registry ();
 
-  const CORBA::ULong max_endpoints = ar->endpoint_count ();
+  const CORBA::ULong max_endpoints = ar.endpoint_count ();
 
   // Pre-allocate the maximum size of the transport address list to
   // prevent unnecessary allocations and copying resulting from
@@ -168,9 +172,9 @@ TAO::SSLIOP::IORInterceptor::populate_transport_address_list (
 
   CORBA::ULong i = 0;
 
-  const TAO_AcceptorSetIterator end = this->end ();
+  const TAO_AcceptorSetIterator end = ar.end ();
 
-  for (TAO_AcceptorSetIterator acceptor = this->begin ();
+  for (TAO_AcceptorSetIterator acceptor = ar.begin ();
        acceptor != end;
        ++acceptor)
     {
@@ -191,8 +195,8 @@ TAO::SSLIOP::IORInterceptor::populate_transport_address_list (
               const ACE_INET_Addr & addr = addrs[j];
 
               if (this->orb_core_->orb_params ()->use_dotted_decimal_addresses ()
-                  && this->dotted_decimal_address (addr,
-                                                   address.host_name.out ()) != 0)
+                  && s->dotted_decimal_address (addr,
+                                                address.host_name.out ()) != 0)
                 {
                   return -1;
                 }
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.h
index 099d7c7c99f..6855b1e19f8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_IORInterceptor.h
@@ -19,6 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orbsvcs/CSIIOPC.h"
 #include "tao/IORInterceptor/IORInterceptorC.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
@@ -51,7 +52,9 @@ namespace TAO
     public:
 
       /// Constructor
-      IORInterceptor (void);
+      IORInterceptor (TAO_ORB_Core * orb_core,
+                      CSIIOP::AssociationOptions csiv2_target_supports,
+                      CSIIOP::AssociationOptions csiv2_target_requires);
 
       /**
        * @name Methods Required by the IOR Interceptor Interface
@@ -92,6 +95,27 @@ namespace TAO
         ACE_THROW_SPEC ((CORBA::SystemException));
       //@}
 
+    private:
+
+      /// Construct the @c IOP::TAG_TLS_SEC_TRANS tagged component
+      /// containing the @c CSIIOP::TLS_SEC_TRANS structure.
+      int construct_transport_mech_component (IOP::TaggedComponent & tc);
+
+      /// Populate the @c CSIIOP::TLS_SEC_TRANS::addresses field.
+      int populate_transport_address_list (
+            CSIIOP::TransportAddressList & list);
+
+    private:
+
+      // Pointer to the @c TAO_ORB_Core within which this interceptor
+      // is registered.
+      TAO_ORB_Core * orb_core_;
+
+      /// Supported CSIv2 TLS-specific association options.
+      CSIIOP::AssociationOptions csiv2_target_supports_;
+
+      /// Required CSIv2 TLS-specific association options.
+      CSIIOP::AssociationOptions csiv2_target_requires_;
     };
 
   }  // End SSLIOP namespace