From 9616196c38149e9a920d59da3019f47d1d61ff85 Mon Sep 17 00:00:00 2001 From: "lally@webrtc.org" Date: Tue, 24 Feb 2015 20:19:16 +0000 Subject: [PATCH] Merging definitions of IsSctp. Cr-Commit-Position: refs/heads/master@{#8482} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8482 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/app/webrtc/webrtcsdp.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc index 889fe89e11..908b11d23d 100644 --- a/talk/app/webrtc/webrtcsdp.cc +++ b/talk/app/webrtc/webrtcsdp.cc @@ -1827,7 +1827,8 @@ bool IsRtp(const std::string& protocol) { bool IsDtlsSctp(const std::string& protocol) { // This intentionally excludes "SCTP" and "SCTP/DTLS". - return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos; + return protocol.find(cricket::kMediaProtocolDtlsSctp) != std::string::npos + || protocol.find(cricket::kMediaProtocolUdpDtlsSctp) != std::string::npos; } bool ParseSessionDescription(const std::string& message, size_t* pos,