Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(810)

Side by Side Diff: webrtc/p2p/base/port.h

Issue 1868353004: Update prflx candidates' generation when setting ICE credentials. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Only need to pass in the last ICE params and the generation. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel_unittest.cc ('k') | webrtc/p2p/base/port.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 567
568 // Invoked when Connection receives STUN error response with 487 code. 568 // Invoked when Connection receives STUN error response with 487 code.
569 void HandleRoleConflictFromPeer(); 569 void HandleRoleConflictFromPeer();
570 570
571 State state() const { return state_; } 571 State state() const { return state_; }
572 572
573 IceMode remote_ice_mode() const { return remote_ice_mode_; } 573 IceMode remote_ice_mode() const { return remote_ice_mode_; }
574 574
575 uint32_t ComputeNetworkCost() const; 575 uint32_t ComputeNetworkCost() const;
576 576
577 // Update the ICE password of the remote candidate if |ice_ufrag| matches 577 // Update the ICE password and/or generation of the remote candidate if a
578 // the candidate's ufrag, and the candidate's passwrod has not been set. 578 // ufrag in |remote_ice_parameters| matches the candidate's ufrag, and the
579 void MaybeSetRemoteIceCredentials(const std::string& ice_ufrag, 579 // candidate's password and/or ufrag has not been set.
580 const std::string& ice_pwd); 580 // |remote_ice_parameters| should be a list of known ICE parameters ordered
581 // by generation.
582 void MaybeSetRemoteIceCredentialsAndGeneration(const std::string& ice_ufrag,
583 const std::string& ice_pwd,
584 int generation);
581 585
582 // If |remote_candidate_| is peer reflexive and is equivalent to 586 // If |remote_candidate_| is peer reflexive and is equivalent to
583 // |new_candidate| except the type, update |remote_candidate_| to 587 // |new_candidate| except the type, update |remote_candidate_| to
584 // |new_candidate|. 588 // |new_candidate|.
585 void MaybeUpdatePeerReflexiveCandidate(const Candidate& new_candidate); 589 void MaybeUpdatePeerReflexiveCandidate(const Candidate& new_candidate);
586 590
587 // Returns the last received time of any data, stun request, or stun 591 // Returns the last received time of any data, stun request, or stun
588 // response in milliseconds 592 // response in milliseconds
589 int64_t last_received() const; 593 int64_t last_received() const;
590 594
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 const rtc::PacketOptions& options) override; 671 const rtc::PacketOptions& options) override;
668 int GetError() override { return error_; } 672 int GetError() override { return error_; }
669 673
670 private: 674 private:
671 int error_ = 0; 675 int error_ = 0;
672 }; 676 };
673 677
674 } // namespace cricket 678 } // namespace cricket
675 679
676 #endif // WEBRTC_P2P_BASE_PORT_H_ 680 #endif // WEBRTC_P2P_BASE_PORT_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/p2ptransportchannel_unittest.cc ('k') | webrtc/p2p/base/port.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698