Adding support for sending/receiving proto bufs to dbus library.

dbus/message.h

Index: dbus/message.h
diff --git a/dbus/message.h b/dbus/message.h
index ceeb0edbf7a74f3417165f420c04539b5a8989a0..b6155941ed7c237265a2c737475da8ae172f0ae6 100644
--- a/dbus/message.h
+++ b/dbus/message.h
@@ -11,6 +11,7 @@
 #include <dbus/dbus.h>
 
 #include "base/basictypes.h"
+#include "third_party/protobuf/src/google/protobuf/message_lite.h"

[satorux1, 2012/01/31 21:42:31]

I think you can remove the include from .h file, by forward-declaring the class:

namespace google {
namespace protobuf {
class MessageLite;
}
}

Then have the #include line in .cc file.

This will speed up the build time for clients of dbus/message.h which don't use
protobuf

[rharrison, 2012/02/01 19:03:20]

Done.

 
 namespace dbus {
 
@@ -294,6 +295,14 @@ class MessageWriter {
   // specialized function.
   void AppendArrayOfObjectPaths(const std::vector<std::string>& object_paths);
 
+  // Appends the protocol buffer. The buffer is serialized into an array of

[satorux1, 2012/01/31 21:42:31]

Appends the protocol buffer as an array of bytes.

[rharrison, 2012/02/01 19:03:20]

Done.

+  // bytes before communication, since protocol buffers are not a native dbus
+  // type. On the receiving size the array of bytes needs to be read and
+  // deserialized into a protocol buffer of the correct type. There are methods
+  // in MessageReader to assist in this.
+  // Return true on succes and fail when serialization is not successful.
+  bool AppendProtocolBuffer(const google::protobuf::MessageLite& protobuf);

[satorux1, 2012/01/31 21:42:31]

AppendProtoAsArrayOfBytes() would make it clear that the protocol buffer message
is appended as an array of bytes.

[rharrison, 2012/02/01 19:03:20]

Done.

+
   // Appends the byte wrapped in a variant data container. Variants are
   // widely used in D-Bus services so it's worth having a specialized
   // function. For instance, The third parameter of
@@ -392,6 +401,14 @@ class MessageReader {
   // function.
   bool PopArrayOfObjectPaths(std::vector<std::string>* object_paths);
 
+  // Gets the array of bytes at the current iterator position. It then parses
+  // this binary blob into the protocol buffer supplied.
+  // Returns true and advances the iterator on success. On failure returns false
+  // and emits an error message on the source of the failure. The two most
+  // common errors come from the iterator not currently being at a byte array or
+  // the wrong type of protocol buffer is passed in and the parse fails.
+  bool PopProtocolBuffer(google::protobuf::MessageLite* protobuf);

[satorux1, 2012/01/31 21:42:31]

PopArrayOfBytesAsProto() ?

[rharrison, 2012/02/01 19:03:20]

Done.

+
   // Gets the byte from the variant data container at the current iterator
   // position.
   // Returns true and advances the iterator on success.