diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 03:17:53 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-22 03:17:53 +0000 |
| commit | a9c689c5c1ad3384f76a3df2c611ca8c4daf187f (patch) | |
| tree | 38f864b8bd96a5c52a32c6a8f91afe6da91fd756 /remoting/protocol/session_config.h | |
| parent | aa9641797e21e23a9a9dc277869340473b09e202 (diff) | |
| download | chromium_src-a9c689c5c1ad3384f76a3df2c611ca8c4daf187f.zip chromium_src-a9c689c5c1ad3384f76a3df2c611ca8c4daf187f.tar.gz chromium_src-a9c689c5c1ad3384f76a3df2c611ca8c4daf187f.tar.bz2 | |
Improve handling of NONE transport in channel configuration.
Previously the session description parser always expected version and codec
attributes for each channel config. These attributes do not make sense
for NONE transport (i.e. when channel is disabled). Now the parser
accepts configs without these attributes and doesn't add them when formatting
outgoing messages.
BUG=144053
Review URL: https://chromiumcodereview.appspot.com/10834446
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/session_config.h')
| -rw-r--r-- | remoting/protocol/session_config.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/protocol/session_config.h b/remoting/protocol/session_config.h index 58d3d78c..5d89d67 100644 --- a/remoting/protocol/session_config.h +++ b/remoting/protocol/session_config.h @@ -36,15 +36,17 @@ struct ChannelConfig { CODEC_SPEEX, }; + // The constructor that creates a config with transport field set to + // TRANSPORT_NONE which indicates that corresponding channel is disabled. ChannelConfig(); + + // Creates a channel config with the specified parameters. ChannelConfig(TransportType transport, int version, Codec codec); // operator== is overloaded so that std::find() works with // std::vector<ChannelConfig>. bool operator==(const ChannelConfig& b) const; - void Reset(); - TransportType transport; int version; Codec codec; |