| Index: remoting/protocol/jingle_messages.h
|
| diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h
|
| index e12c854489ee6755f3117192da02a3cfb717a3fb..c83776ad4f3060215ce74efdfbd02dbafecafe45 100644
|
| --- a/remoting/protocol/jingle_messages.h
|
| +++ b/remoting/protocol/jingle_messages.h
|
| @@ -12,16 +12,11 @@
|
| #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
|
| #include "third_party/webrtc/p2p/base/candidate.h"
|
|
|
| -
|
| namespace remoting {
|
| namespace protocol {
|
|
|
| class ContentDescription;
|
|
|
| -extern const char kJabberNamespace[];
|
| -extern const char kJingleNamespace[];
|
| -extern const char kP2PTransportNamespace[];
|
| -
|
| struct JingleMessage {
|
| enum ActionType {
|
| UNKNOWN_ACTION,
|
| @@ -42,7 +37,7 @@ struct JingleMessage {
|
| };
|
|
|
| struct NamedCandidate {
|
| - NamedCandidate();
|
| + NamedCandidate() = default;
|
| NamedCandidate(const std::string& name,
|
| const cricket::Candidate& candidate);
|
|
|
| @@ -50,6 +45,17 @@ struct JingleMessage {
|
| cricket::Candidate candidate;
|
| };
|
|
|
| + struct IceCredentials {
|
| + IceCredentials() = default;
|
| + IceCredentials(std::string channel,
|
| + std::string ufrag,
|
| + std::string password);
|
| +
|
| + std::string channel;
|
| + std::string ufrag;
|
| + std::string password;
|
| + };
|
| +
|
| JingleMessage();
|
| JingleMessage(const std::string& to_value,
|
| ActionType action_value,
|
| @@ -68,12 +74,15 @@ struct JingleMessage {
|
|
|
| std::string from;
|
| std::string to;
|
| - ActionType action;
|
| + ActionType action = UNKNOWN_ACTION;
|
| std::string sid;
|
|
|
| std::string initiator;
|
|
|
| scoped_ptr<ContentDescription> description;
|
| +
|
| + bool standard_ice = true;
|
| + std::list<IceCredentials> ice_credentials;
|
| std::list<NamedCandidate> candidates;
|
|
|
| // Content of session-info messages.
|
| @@ -82,7 +91,7 @@ struct JingleMessage {
|
| // Value from the <reason> tag if it is present in the
|
| // message. Useful mainly for session-terminate messages, but Jingle
|
| // spec allows it in any message.
|
| - Reason reason;
|
| + Reason reason = UNKNOWN_REASON;
|
| };
|
|
|
| struct JingleMessageReply {
|
|
|