Enable meta-based validation for shared libraries.

src/trusted/reverse_service/reverse_service.cc

 /*
  * 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.
  */
 
 #include "native_client/src/trusted/reverse_service/reverse_service.h"
 
 #include <string.h>
 
 #include <limits>
 #include <string>
 
 #include "native_client/src/include/nacl_compiler_annotations.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_host_desc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 
 #include "native_client/src/trusted/desc/nacl_desc_invalid.h"
 #include "native_client/src/trusted/desc/nacl_desc_io.h"
 
+#include "native_client/src/trusted/reverse_service/nacl_file_info.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 
 namespace {
 
 // ReverseInterfaceWrapper wraps a C++ interface and provides
 // C-callable wrapper functions for use by the underlying C
 // implementation.
 
 struct ReverseInterfaceWrapper {
   NaClReverseInterface base NACL_IS_REFCOUNT_SUBCLASS;
@@ skipping 54 matching lines @@
     }
     strncpy(buffer + size, it->c_str(), to_write);
     NaClLog(3, "EnumerateManifestKeys: %.*s\n", (int) to_write, buffer + size);
     size += to_write;
   }
   return size;
 }
 
 int OpenManifestEntry(NaClReverseInterface* self,
                       char const* url_key,
-                      int32_t* out_desc) {
+                      struct NaClFileInfo* info) {
   ReverseInterfaceWrapper* wrapper =
       reinterpret_cast<ReverseInterfaceWrapper*>(self);
   if (NULL == wrapper->iface) {
     NaClLog(1, "OpenManifestEntry, no reverse_interface.\n");
     return 0;
   }
-  return wrapper->iface->OpenManifestEntry(nacl::string(url_key), out_desc);
+  return wrapper->iface->OpenManifestEntry(nacl::string(url_key), info);
 }
 
 int CloseManifestEntry(NaClReverseInterface* self,
                        int32_t desc) {
   ReverseInterfaceWrapper* wrapper =
       reinterpret_cast<ReverseInterfaceWrapper*>(self);
   if (NULL == wrapper->iface) {
     NaClLog(1, "CloseManifestEntry, no reverse_interface.\n");
     return 0;
   }
@@ skipping 155 matching lines @@
 
   NaClLog(4, "VTBL\n");
   NaClLog(4, "Leaving ReverseInterfaceWrapperCtor\n");
   return 1;
 }
 
 }  // namespace
 
 namespace nacl {
 
+// TODO(ncbray) remove
+bool ReverseInterface::OpenManifestEntry(nacl::string url_key,
+                                         int32_t* out_desc) {
+  UNREFERENCED_PARAMETER(url_key);
+  *out_desc = -1;
+  return false;
+}
+
+// TODO(ncbray) convert to a pure virtual.
+bool ReverseInterface::OpenManifestEntry(nacl::string url_key,
+                                         struct NaClFileInfo* info) {
+  info->nonce = 0;
+  return OpenManifestEntry(url_key, &info->desc);
+}
+
 ReverseService::ReverseService(DescWrapper* conn_cap,
                                ReverseInterface* rif)
   : service_(NULL),
     reverse_interface_(rif) {
   NaClLog(4, "ReverseService::ReverseService ctor invoked\n");
 
   ReverseInterfaceWrapper* wrapper =
       reinterpret_cast<ReverseInterfaceWrapper*>(malloc(sizeof *wrapper));
   if (NULL == wrapper) {
     NaClLog(LOG_FATAL, "ReverseService::ReverseService: malloc failed\n");
@@ skipping 32 matching lines @@
 
 void ReverseService::IncrThreadCount() {
   NACL_VTBL(NaClReverseService, service_)->ThreadCountIncr(service_);
 }
 
 void ReverseService::DecrThreadCount() {
   NACL_VTBL(NaClReverseService, service_)->ThreadCountDecr(service_);
 }
 
 }  // namespace nacl