NaCl: enable meta-based validation for shared libraries.

ppapi/native_client/src/trusted/plugin/service_runtime.h

 /* -*- c++ -*- */
 /*
  * Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
 
 #include <map>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/plugin/utility.h"
 #include "native_client/src/trusted/reverse_service/reverse_service.h"
 #include "native_client/src/trusted/weak_ref/weak_ref.h"
 
 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/cpp/completion_callback.h"
 
+struct NaClFileInfo;
+
 namespace nacl {
 class DescWrapper;
 }  // namespace
 
 namespace pp {
 class FileIO;
 }  // namespace
 
 namespace plugin {
 
@@ skipping 16 matching lines @@
 struct PostMessageResource {
  public:
   explicit PostMessageResource(std::string msg)
       : message(msg) {}
   std::string message;
 };
 
 struct OpenManifestEntryResource {
  public:
   OpenManifestEntryResource(const std::string& target_url,
-                            int32_t* descp,
+                            struct NaClFileInfo* file_info,
                             ErrorInfo* infop,
                             bool* op_complete)
       : url(target_url),
-        out_desc(descp),
+        file_info(file_info),

[dmichael (off chromium), 2013/05/15 18:37:53]

please use distinct names for the parameter and the member.

[Nick Bray (chromium), 2013/05/16 16:38:17]

Done.

         error_info(infop),
         op_complete_ptr(op_complete) {}
   std::string url;
-  int32_t* out_desc;
+  struct NaClFileInfo *file_info;
   ErrorInfo* error_info;
   bool* op_complete_ptr;
 };
 
 struct CloseManifestEntryResource {
  public:
   CloseManifestEntryResource(int32_t desc_to_close,
                              bool* op_complete,
                              bool* op_result)
       : desc(desc_to_close),
@@ skipping 60 matching lines @@
   void ShutDown();
 
   virtual void Log(nacl::string message);
 
   virtual void DoPostMessage(nacl::string message);
 
   virtual void StartupInitializationComplete();
 
   virtual bool EnumerateManifestKeys(std::set<nacl::string>* out_keys);
 
-  virtual bool OpenManifestEntry(nacl::string url_key, int32_t* out_desc);
+  virtual bool OpenManifestEntry(nacl::string url_key,
+                                 struct NaClFileInfo *info);
 
   virtual bool CloseManifestEntry(int32_t desc);
 
   virtual void ReportCrash();
 
   virtual void ReportExitStatus(int exit_status);
 
   virtual int64_t RequestQuotaForWrite(nacl::string file_id,
                                        int64_t offset,
                                        int64_t bytes_to_write);
@@ skipping 110 matching lines @@
 
   PluginReverseInterface* rev_interface_;
 
   NaClMutex mu_;
   int exit_status_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_