diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/p2p/base/connection.cc | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | third_party/libwebrtc/p2p/base/connection.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/third_party/libwebrtc/p2p/base/connection.cc b/third_party/libwebrtc/p2p/base/connection.cc index d0e6f1bff8..bf07dec607 100644 --- a/third_party/libwebrtc/p2p/base/connection.cc +++ b/third_party/libwebrtc/p2p/base/connection.cc @@ -590,10 +590,8 @@ void Connection::HandleStunBindingOrGoogPingRequest(IceMessage* msg) { // This connection should now be receiving. ReceivedPing(msg->transaction_id()); if (field_trials_->extra_ice_ping && last_ping_response_received_ == 0) { - if (local_candidate().type() == RELAY_PORT_TYPE || - local_candidate().type() == PRFLX_PORT_TYPE || - remote_candidate().type() == RELAY_PORT_TYPE || - remote_candidate().type() == PRFLX_PORT_TYPE) { + if (local_candidate().is_relay() || local_candidate().is_prflx() || + remote_candidate().is_relay() || remote_candidate().is_prflx()) { const int64_t now = rtc::TimeMillis(); if (last_ping_sent_ + kMinExtraPingDelayMs <= now) { RTC_LOG(LS_INFO) << ToString() @@ -1579,8 +1577,7 @@ void Connection::MaybeSetRemoteIceParametersAndGeneration( void Connection::MaybeUpdatePeerReflexiveCandidate( const Candidate& new_candidate) { - if (remote_candidate_.type() == PRFLX_PORT_TYPE && - new_candidate.type() != PRFLX_PORT_TYPE && + if (remote_candidate_.is_prflx() && !new_candidate.is_prflx() && remote_candidate_.protocol() == new_candidate.protocol() && remote_candidate_.address() == new_candidate.address() && remote_candidate_.username() == new_candidate.username() && |