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

Unified Diff: webrtc/p2p/base/p2ptransportchannel.h

Issue 2224563004: Add signaling to support ICE renomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/p2ptransportchannel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/p2ptransportchannel.h
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
index 25510c2f6418bb2cebe98d0dc86b7a3a486f8a9f..a6dfd88f8720c465b3b514e18bf3f0aee5820ef3 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -43,18 +43,6 @@ extern const int STABILIZING_WRITABLE_CONNECTION_PING_INTERVAL;
extern const int STABLE_WRITABLE_CONNECTION_PING_INTERVAL;
static const int MIN_PINGS_AT_WEAK_PING_INTERVAL = 3;
-struct IceParameters {
- std::string ufrag;
- std::string pwd;
- IceParameters(const std::string& ice_ufrag, const std::string& ice_pwd)
- : ufrag(ice_ufrag), pwd(ice_pwd) {}
-
- bool operator==(const IceParameters& other) {
- return ufrag == other.ufrag && pwd == other.pwd;
- }
- bool operator!=(const IceParameters& other) { return !(*this == other); }
-};
-
// Adds the port on which the candidate originated.
class RemoteCandidate : public Candidate {
public:
@@ -88,10 +76,8 @@ class P2PTransportChannel : public TransportChannelImpl,
void SetIceRole(IceRole role) override;
IceRole GetIceRole() const override { return ice_role_; }
void SetIceTiebreaker(uint64_t tiebreaker) override;
- void SetIceCredentials(const std::string& ice_ufrag,
- const std::string& ice_pwd) override;
- void SetRemoteIceCredentials(const std::string& ice_ufrag,
- const std::string& ice_pwd) override;
+ void SetIceParameters(const IceParameters& ice_params) override;
+ void SetRemoteIceParameters(const IceParameters& ice_params) override;
void SetRemoteIceMode(IceMode mode) override;
// TODO(deadbeef): Deprecated. Remove when Chromium's
// IceTransportChannel does not depend on this.
@@ -209,11 +195,6 @@ class P2PTransportChannel : public TransportChannelImpl,
return remote_candidates_;
}
- // Public for unit tests.
- void set_remote_supports_renomination(bool remote_supports_renomination) {
- remote_supports_renomination_ = remote_supports_renomination;
- }
-
private:
rtc::Thread* thread() const { return worker_thread_; }
bool IsGettingPorts() { return allocator_session()->IsGettingPorts(); }
@@ -395,8 +376,7 @@ class P2PTransportChannel : public TransportChannelImpl,
bool had_connection_ = false; // if connections_ has ever been nonempty
typedef std::map<rtc::Socket::Option, int> OptionMap;
OptionMap options_;
- std::string ice_ufrag_;
- std::string ice_pwd_;
+ IceParameters ice_parameters_;
std::vector<IceParameters> remote_ice_parameters_;
IceMode remote_ice_mode_;
IceRole ice_role_;
@@ -410,10 +390,6 @@ class P2PTransportChannel : public TransportChannelImpl,
IceConfig config_;
int last_sent_packet_id_ = -1; // -1 indicates no packet was sent before.
bool started_pinging_ = false;
- // TODO(honghaiz): Put this and ICE role inside ICEParameters and rename this
- // as renomination. Set its value in subsequent CLs based on signaling
- // exchange.
- bool remote_supports_renomination_ = false;
// The value put in the "nomination" attribute for the next nominated
// connection. A zero-value indicates the connection will not be nominated.
uint32_t nomination_ = 0;
« no previous file with comments | « webrtc/p2p/base/faketransportcontroller.h ('k') | webrtc/p2p/base/p2ptransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698