Split secure command channel and untrusted application channel

src/trusted/nonnacl_util/sel_ldr_launcher.h

 /* -*- c++ -*- */
 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 // Utility class for launching sel_ldr.
 
@@ skipping 91 matching lines @@
 
   // Sets up the SRPC channel |out_app_chan|.
   bool SetupAppChannel(NaClSrpcChannel* out_app_chan);
 
   // Sends the SRPC to start the nexe over |command| and sets up the application
   // SRPC chanel |out_app_chan|.
   bool StartModuleAndSetupAppChannel(NaClSrpcChannel* command,
                                      NaClSrpcChannel* out_app_chan);
 
   // Returns the socket address used to connect to the sel_ldr.
+  DescWrapper* secure_socket_addr() const { return secure_socket_addr_.get(); }
+
+  // Returns the socket address used to connect to the module.
   DescWrapper* socket_addr() const { return socket_addr_.get(); }
 
   // Wraps a raw NaClDesc descriptor.  If NULL is returned, caller retains
   // ownership of the reference.
   DescWrapper* Wrap(NaClDesc* raw_desc);
 
   // As above, but raw_desc is Unref'd on failure.
   DescWrapper* WrapCleanup(NaClDesc* raw_desc);
 
   // Get post-crash NaClLog data.  This include some recent NaClLog
   // output as well as the LOG_FATAL message.  In the case of a severe
   // crash -- or if the peer sel_ldr does not support NaClLog crash
   // logging -- this may return the empty string.
   //
   // NB: If the NaCl module has not exited or crashed, this call will
   // block.
   nacl::string GetCrashLogOutput();
 
  protected:
   Handle channel_;
 
  private:
   // lifetime of bootstrap_socket_ must be at least that of factory_
   scoped_ptr<DescWrapperFactory> factory_;
   scoped_ptr<DescWrapper> bootstrap_socket_;
   // The socket address returned from sel_ldr for connects.
+  scoped_ptr<DescWrapper> secure_socket_addr_;
   scoped_ptr<DescWrapper> socket_addr_;
 };
 
 class SelLdrLauncherStandalone : public SelLdrLauncherBase {
  public:
   SelLdrLauncherStandalone();
   ~SelLdrLauncherStandalone();
 
   virtual bool Start(const char* url);
 
@@ skipping 60 matching lines @@
   std::vector<nacl::string> application_argv_;
 
   std::vector<Handle> close_after_launch_;
 
   scoped_ptr<SelLdrLocator> sel_ldr_locator_;
 };
 
 }  // namespace nacl
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_NONNACL_UTIL_SEL_LDR_LAUNCHER_H_