Index: webrtc/p2p/base/transportdescription.h |
diff --git a/webrtc/p2p/base/transportdescription.h b/webrtc/p2p/base/transportdescription.h |
index 8ea1f4bc2e95e1dac4149119e20108becd409251..5ab1cd6a1250fd1b6ced5f19c3738d6df9b2adda 100644 |
--- a/webrtc/p2p/base/transportdescription.h |
+++ b/webrtc/p2p/base/transportdescription.h |
@@ -35,6 +35,16 @@ enum SecurePolicy { |
SEC_REQUIRED |
}; |
+// The transport protocol we've elected to use. |
+enum TransportProtocol { |
+ ICEPROTO_GOOGLE, // Google version of ICE protocol. |
+ ICEPROTO_HYBRID, // ICE, but can fall back to the Google version. |
+ ICEPROTO_RFC5245 // Standard RFC 5245 version of ICE. |
+}; |
+// The old name for TransportProtocol. |
+// TODO(juberti): remove this. |
+typedef TransportProtocol IceProtocolType; |
+ |
// Whether our side of the call is driving the negotiation, or the other side. |
enum IceRole { |
ICEROLE_CONTROLLING = 0, |
@@ -76,28 +86,33 @@ struct TransportDescription { |
: ice_mode(ICEMODE_FULL), |
connection_role(CONNECTIONROLE_NONE) {} |
- TransportDescription(const std::vector<std::string>& transport_options, |
+ TransportDescription(const std::string& transport_type, |
+ const std::vector<std::string>& transport_options, |
const std::string& ice_ufrag, |
const std::string& ice_pwd, |
IceMode ice_mode, |
ConnectionRole role, |
const rtc::SSLFingerprint* identity_fingerprint, |
const Candidates& candidates) |
- : transport_options(transport_options), |
+ : transport_type(transport_type), |
+ transport_options(transport_options), |
ice_ufrag(ice_ufrag), |
ice_pwd(ice_pwd), |
ice_mode(ice_mode), |
connection_role(role), |
identity_fingerprint(CopyFingerprint(identity_fingerprint)), |
candidates(candidates) {} |
- TransportDescription(const std::string& ice_ufrag, |
+ TransportDescription(const std::string& transport_type, |
+ const std::string& ice_ufrag, |
const std::string& ice_pwd) |
- : ice_ufrag(ice_ufrag), |
+ : transport_type(transport_type), |
+ ice_ufrag(ice_ufrag), |
ice_pwd(ice_pwd), |
ice_mode(ICEMODE_FULL), |
connection_role(CONNECTIONROLE_NONE) {} |
TransportDescription(const TransportDescription& from) |
- : transport_options(from.transport_options), |
+ : transport_type(from.transport_type), |
+ transport_options(from.transport_options), |
ice_ufrag(from.ice_ufrag), |
ice_pwd(from.ice_pwd), |
ice_mode(from.ice_mode), |
@@ -110,6 +125,7 @@ struct TransportDescription { |
if (this == &from) |
return *this; |
+ transport_type = from.transport_type; |
transport_options = from.transport_options; |
ice_ufrag = from.ice_ufrag; |
ice_pwd = from.ice_pwd; |
@@ -139,6 +155,7 @@ struct TransportDescription { |
return new rtc::SSLFingerprint(*from); |
} |
+ std::string transport_type; // xmlns of <transport> |
std::vector<std::string> transport_options; |
std::string ice_ufrag; |
std::string ice_pwd; |