diff options
| author | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 06:05:55 +0000 |
|---|---|---|
| committer | mallinath@webrtc.org <mallinath@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-08-13 06:05:55 +0000 |
| commit | eea342ea2f4dba9a37e956a59e3a0643cedf8102 (patch) | |
| tree | ddfc02441348aace4e2b20ab3d682e98d3336c26 | |
| parent | 9ebf75e35979cec9a6e7330e6ac3fe1caeaf0302 (diff) | |
| download | talk-eea342ea2f4dba9a37e956a59e3a0643cedf8102.tar.gz | |
Removing ASSERT for tcp candidate for port 0 and 9, as Android clients
may not be called with set_allow_tcp_listen(false).
This CL will also sends tcp candidate in RFC 6544 format.
BUG=https://code.google.com/p/webrtc/issues/detail?id=3677
R=braveyao@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14119004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6880 4adac7df-926f-26a2-2b94-8c16560cd09d
| -rw-r--r-- | app/webrtc/webrtcsdp.cc | 9 | ||||
| -rw-r--r-- | app/webrtc/webrtcsdp_unittest.cc | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/app/webrtc/webrtcsdp.cc b/app/webrtc/webrtcsdp.cc index 2eb5fb3..09e5cbd 100644 --- a/app/webrtc/webrtcsdp.cc +++ b/app/webrtc/webrtcsdp.cc @@ -1720,14 +1720,7 @@ void BuildCandidate(const std::vector<Candidate>& candidates, } if (it->protocol() == cricket::TCP_PROTOCOL_NAME) { - // In case of WebRTC, candidate must be always "active" only. That means - // it should have port number either 0 or 9. - ASSERT(it->address().port() == 0 || - it->address().port() == cricket::DISCARD_PORT); - ASSERT(it->tcptype() == cricket::TCPTYPE_ACTIVE_STR); - // TODO(mallinath) : Uncomment below line once WebRTCSdp capable of - // parsing RFC 6544. - // os << kTcpCandidateType << " " << it->tcptype() << " "; + os << kTcpCandidateType << " " << it->tcptype() << " "; } // Extensions diff --git a/app/webrtc/webrtcsdp_unittest.cc b/app/webrtc/webrtcsdp_unittest.cc index 9f5e1eb..3629347 100644 --- a/app/webrtc/webrtcsdp_unittest.cc +++ b/app/webrtc/webrtcsdp_unittest.cc @@ -1631,7 +1631,7 @@ TEST_F(WebRtcSdpTest, SerializeCandidates) { // TODO(mallinath) : Enable this test once WebRTCSdp capable of parsing // RFC 6544. -TEST_F(WebRtcSdpTest, DISABLED_SerializeTcpCandidates) { +TEST_F(WebRtcSdpTest, SerializeTcpCandidates) { Candidate candidate( "", ICE_CANDIDATE_COMPONENT_RTP, "tcp", rtc::SocketAddress("192.168.1.5", 9), kCandidatePriority, |