EDK: Make TransportData preserve handle rights.

mojo/edk/system/transport_data.h

 // Copyright 2014 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.
 
 #ifndef MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 #define MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "mojo/edk/platform/aligned_alloc.h"
 #include "mojo/edk/platform/scoped_platform_handle.h"
 #include "mojo/edk/system/dispatcher.h"
+#include "mojo/edk/system/handle.h"
+#include "mojo/public/c/system/handle.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace system {
 
 class Channel;
 
 // This class is used by |MessageInTransit| to represent handles (|Dispatcher|s)
 // in various stages of serialization.
 //
@@ skipping 54 matching lines @@
   // dispatcher.
   static const size_t kMaxSerializedDispatcherPlatformHandles = 2;
 
   // The maximum possible size of a valid transport data buffer.
   static size_t GetMaxBufferSize();
 
   // The maximum total number of platform handles that may be attached.
   static size_t GetMaxPlatformHandles();
 
   TransportData(std::unique_ptr<HandleVector> handles, Channel* channel);
-  // TODO(vtl): Remove this, once |TransportData| really supports handles.
-  TransportData(std::unique_ptr<DispatcherVector> dispatchers,
-                Channel* channel);
 
   // This is used for users of |MessageInTransit|/|TransportData|/|RawChannel|
   // that want to simply transport data and platform handles, and not
   // |Dispatcher|s. (|Header| will be present, and zero except for
   // |num_platform_handles|, and |platform_handle_table_offset| if necessary.)
   explicit TransportData(
       std::unique_ptr<std::vector<platform::ScopedPlatformHandle>>
           platform_handles,
       size_t serialized_platform_handle_size);
 
@@ skipping 28 matching lines @@
   static const char* ValidateBuffer(size_t serialized_platform_handle_size,
                                     const void* buffer,
                                     size_t buffer_size);
 
   // Gets the platform handle table from a (valid) |TransportData| buffer (which
   // should have been validated using |ValidateBuffer()| first).
   static void GetPlatformHandleTable(const void* transport_data_buffer,
                                      size_t* num_platform_handles,
                                      const void** platform_handle_table);
 
-  // Deserializes dispatchers from the given (serialized) transport data buffer
+  // Deserializes handles from the given (serialized) transport data buffer
   // (typically from a |MessageInTransit::View|) and vector of platform handles.
   // |buffer| should be non-null and |buffer_size| should be nonzero.
-  static std::unique_ptr<DispatcherVector> DeserializeDispatchers(
+  static std::unique_ptr<HandleVector> DeserializeHandles(
       const void* buffer,
       size_t buffer_size,
       std::unique_ptr<std::vector<platform::ScopedPlatformHandle>>
           platform_handles,
       Channel* channel);
 
  private:
   // To allow us to make compile-assertions about |Header|, etc. in the .cc
   // file.
   struct PrivateStructForCompileAsserts;
 
   // Header for the "secondary buffer"/"transport data". Must be a multiple of
   // |MessageInTransit::kMessageAlignment| in size. Must be POD.
   struct Header {
     uint32_t num_handles;
     // TODO(vtl): Not used yet:
     uint32_t platform_handle_table_offset;
     uint32_t num_platform_handles;
     uint32_t unused;
   };
 
   struct HandleTableEntry {
     // TODO(vtl): Should I make |Dispatcher::Type| an |int32_t| enum class?
     int32_t type;     // From |Dispatcher::Type| (|UNKNOWN| for "invalid").
     uint32_t offset;  // Relative to the start of the "secondary buffer".
     uint32_t size;    // (Not including any padding.)
-    uint32_t unused;
+    MojoHandleRights rights;
   };
 
   const Header* header() const {
     return reinterpret_cast<const Header*>(buffer_.get());
   }
 
   size_t buffer_size_;
   platform::AlignedUniquePtr<char> buffer_;  // Never null.
 
   // Any platform-specific handles attached to this message (for inter-process
   // transport). The vector (if any) owns the handles that it contains (and is
   // responsible for closing them).
   // TODO(vtl): With C++11, change it to a vector of |ScopedPlatformHandle|s.
   std::unique_ptr<std::vector<platform::ScopedPlatformHandle>>
       platform_handles_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TransportData);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_TRANSPORT_DATA_H_