After another round of reviews.
Cr-Commit-Position: refs/heads/master@{#8483}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8483 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc
index 908b11d..b2b33fa 100644
--- a/talk/app/webrtc/webrtcsdp.cc
+++ b/talk/app/webrtc/webrtcsdp.cc
@@ -1185,12 +1185,6 @@
return true;
}
-static bool IsSctp(const std::string& protocol) {
- return protocol == cricket::kMediaProtocolDtlsSctp
- || protocol == cricket::kMediaProtocolUdpDtlsSctp
- || protocol == cricket::kMediaProtocolSctp;
-}
-
void BuildMediaDescription(const ContentInfo* content_info,
const TransportInfo* transport_info,
const MediaType media_type,
@@ -1827,8 +1821,7 @@
bool IsDtlsSctp(const std::string& protocol) {
// This intentionally excludes "SCTP" and "SCTP/DTLS".
- return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos
- || protocol.find(cricket::kMediaProtocolUdpDtlsSctp) != std::string::npos;
+ return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos;
}
bool ParseSessionDescription(const std::string& message, size_t* pos,
diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
index e33dfc6..8315279 100644
--- a/talk/session/media/mediasession.cc
+++ b/talk/session/media/mediasession.cc
@@ -72,6 +72,7 @@
const char kMediaProtocolSctp[] = "SCTP";
const char kMediaProtocolDtlsSctp[] = "DTLS/SCTP";
const char kMediaProtocolUdpDtlsSctp[] = "UDP/DTLS/SCTP";
+const char kMediaProtocolTcpDtlsSctp[] = "TCP/DTLS/SCTP";
static bool IsMediaContentOfType(const ContentInfo* content,
MediaType media_type) {
diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h
index bb973aa..5bcc8cc 100644
--- a/talk/session/media/mediasession.h
+++ b/talk/session/media/mediasession.h
@@ -87,6 +87,7 @@
extern const char kMediaProtocolSctp[];
extern const char kMediaProtocolDtlsSctp[];
extern const char kMediaProtocolUdpDtlsSctp[];
+extern const char kMediaProtocolTcpDtlsSctp[];
// Options to control how session descriptions are generated.
const int kAutoBandwidth = -1;
