| OLD | NEW | 
|---|
| 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 572 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 583   void HandleRoleConflictFromPeer(); | 583   void HandleRoleConflictFromPeer(); | 
| 584 | 584 | 
| 585   State state() const { return state_; } | 585   State state() const { return state_; } | 
| 586 | 586 | 
| 587   int num_pings_sent() const { return num_pings_sent_; } | 587   int num_pings_sent() const { return num_pings_sent_; } | 
| 588 | 588 | 
| 589   IceMode remote_ice_mode() const { return remote_ice_mode_; } | 589   IceMode remote_ice_mode() const { return remote_ice_mode_; } | 
| 590 | 590 | 
| 591   uint32_t ComputeNetworkCost() const; | 591   uint32_t ComputeNetworkCost() const; | 
| 592 | 592 | 
| 593   // Update the ICE password and/or generation of the remote candidate if a | 593   // Update the ICE password and/or generation of the remote candidate if the | 
| 594   // ufrag in |remote_ice_parameters| matches the candidate's ufrag, and the | 594   // ufrag in |params| matches the candidate's ufrag, and the | 
| 595   // candidate's password and/or ufrag has not been set. | 595   // candidate's password and/or ufrag has not been set. | 
| 596   // |remote_ice_parameters| should be a list of known ICE parameters ordered | 596   void MaybeSetRemoteIceParametersAndGeneration(const IceParameters& params, | 
| 597   // by generation. | 597                                                 int generation); | 
| 598   void MaybeSetRemoteIceCredentialsAndGeneration(const std::string& ice_ufrag, |  | 
| 599                                                  const std::string& ice_pwd, |  | 
| 600                                                  int generation); |  | 
| 601 | 598 | 
| 602   // If |remote_candidate_| is peer reflexive and is equivalent to | 599   // If |remote_candidate_| is peer reflexive and is equivalent to | 
| 603   // |new_candidate| except the type, update |remote_candidate_| to | 600   // |new_candidate| except the type, update |remote_candidate_| to | 
| 604   // |new_candidate|. | 601   // |new_candidate|. | 
| 605   void MaybeUpdatePeerReflexiveCandidate(const Candidate& new_candidate); | 602   void MaybeUpdatePeerReflexiveCandidate(const Candidate& new_candidate); | 
| 606 | 603 | 
| 607   // Returns the last received time of any data, stun request, or stun | 604   // Returns the last received time of any data, stun request, or stun | 
| 608   // response in milliseconds | 605   // response in milliseconds | 
| 609   int64_t last_received() const; | 606   int64_t last_received() const; | 
| 610   // Returns the last time when the connection changed its receiving state. | 607   // Returns the last time when the connection changed its receiving state. | 
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 716            const rtc::PacketOptions& options) override; | 713            const rtc::PacketOptions& options) override; | 
| 717   int GetError() override { return error_; } | 714   int GetError() override { return error_; } | 
| 718 | 715 | 
| 719  private: | 716  private: | 
| 720   int error_ = 0; | 717   int error_ = 0; | 
| 721 }; | 718 }; | 
| 722 | 719 | 
| 723 }  // namespace cricket | 720 }  // namespace cricket | 
| 724 | 721 | 
| 725 #endif  // WEBRTC_P2P_BASE_PORT_H_ | 722 #endif  // WEBRTC_P2P_BASE_PORT_H_ | 
| OLD | NEW | 
|---|