admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverting to previous behavior due to a downstream test expectation.

Browse Source 
This reverts the change in behavior for setRemoteDescription,
introduced here:
https://webrtc-review.googlesource.com/c/src/+/206063

And disables the associated test.

Bug: webrtc:9987
Change-Id: I39a5664032a967a0a9cd336fa585d4d3880c88c5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/207162
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33248}
This commit is contained in:
Tomas Gunnarsson 2021-02-12 13:16:26 +01:00 committed by Commit Bot
parent 1ba1fc9598
commit 27bc6e2246
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pc/peer_connection_ice_unittest.cc
View File

@ -497,7 +497,10 @@ TEST_P(PeerConnectionIceTest, DuplicateIceCandidateIgnoredWhenAdded) {
EXPECT_EQ(1u, caller->GetIceCandidatesFromRemoteDescription().size());
}
TEST_P(PeerConnectionIceTest, ErrorOnInvalidRemoteIceCandidateAdded) {
// TODO(tommi): Re-enable after updating RTCPeerConnection-blockedPorts.html in
// Chromium (the test needs setRemoteDescription to succeed for an invalid
// candidate).
TEST_P(PeerConnectionIceTest, DISABLED_ErrorOnInvalidRemoteIceCandidateAdded) {
auto caller = CreatePeerConnectionWithAudioVideo();
auto callee = CreatePeerConnectionWithAudioVideo();
ASSERT_TRUE(callee->SetRemoteDescription(caller->CreateOfferAndSetAsLocal()));

6
pc/sdp_offer_answer.cc
View File

@ -4478,8 +4478,10 @@ bool SdpOfferAnswerHandler::UseCandidate(
const cricket::Candidate& c = candidate->candidate();
RTCError error = cricket::VerifyCandidate(c);
if (!error.ok())
return false;
if (!error.ok()) {
RTC_LOG(LS_WARNING) << "Invalid candidate: " << c.ToString();
return true;
}
pc_->AddRemoteCandidate(result.value()->name, c);