summaryrefslogtreecommitdiffstats
path: root/remoting/proto
diff options
context:
space:
mode:
authorjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 00:13:48 +0000
committerjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-13 00:13:48 +0000
commit09eabd65c680e41cb3565e13d8d3488f5065db4b (patch)
tree33e255b078618e9212f5538f0de99925fc542e68 /remoting/proto
parent3570ac4e041b3d2f7c314aa1094955d8c982fc13 (diff)
downloadchromium_src-09eabd65c680e41cb3565e13d8d3488f5065db4b.zip
chromium_src-09eabd65c680e41cb3565e13d8d3488f5065db4b.tar.gz
chromium_src-09eabd65c680e41cb3565e13d8d3488f5065db4b.tar.bz2
Added JsonMessage to the control channel.
This adds the client plumbing needed to get an arbitrary JSON message from client to host, or vice versa. This will allow us to extend the protocol at short notice, without needing to wait for client plugin changes to be promoted to Stable. BUG= Review URL: https://chromiumcodereview.appspot.com/22477006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/proto')
-rw-r--r--remoting/proto/control.proto11
-rw-r--r--remoting/proto/internal.proto1
2 files changed, 12 insertions, 0 deletions
diff --git a/remoting/proto/control.proto b/remoting/proto/control.proto
index 888c0b0..2d2baf6 100644
--- a/remoting/proto/control.proto
+++ b/remoting/proto/control.proto
@@ -66,3 +66,14 @@ message PairingResponse {
// Shared secret for this client.
optional string shared_secret = 2;
}
+
+message ExtensionMessage {
+ // The message type. This is used to dispatch the message to the correct
+ // recipient.
+ optional string type = 1;
+
+ // String-encoded message data. The client and host must agree on the encoding
+ // for each message type; different message types need not shared the same
+ // encoding.
+ optional string data = 2;
+} \ No newline at end of file
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 219e3ef..6ae35f4 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -24,6 +24,7 @@ message ControlMessage {
optional Capabilities capabilities = 6;
optional PairingRequest pairing_request = 7;
optional PairingResponse pairing_response = 8;
+ optional ExtensionMessage extension_message = 9;
}
// Defines an event message on the event channel.