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

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

Issue 1270613006: First step of passive aggressive nomination. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Addressed comments Created 5 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/p2ptransportchannel_unittest.cc ('k') | webrtc/p2p/base/port.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/port.h
diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h
index 0fdead398a41286545df069d7704bb970b702f1a..dd1a12f01180ba7b87f3336e03954d9caff71e5d 100644
--- a/webrtc/p2p/base/port.h
+++ b/webrtc/p2p/base/port.h
@@ -484,6 +484,9 @@ class Connection : public rtc::MessageHandler,
bool use_candidate_attr() const { return use_candidate_attr_; }
void set_use_candidate_attr(bool enable);
+ bool nominated() const { return nominated_; }
+ void set_nominated(bool nominated) { nominated_ = nominated; }
pthatcher1 2015/08/18 20:47:00 Should set_nominated fire SignalNominated?
+
void set_remote_ice_mode(IceMode mode) {
remote_ice_mode_ = mode;
}
@@ -515,10 +518,9 @@ class Connection : public rtc::MessageHandler,
bool reported() const { return reported_; }
void set_reported(bool reported) { reported_ = reported;}
- // This flag will be set if this connection is the chosen one for media
- // transmission. This connection will send STUN ping with USE-CANDIDATE
- // attribute.
- sigslot::signal1<Connection*> SignalUseCandidate;
+ // This signal will be fired if this connection is nominated by the
+ // controlling side.
+ sigslot::signal1<Connection*> SignalNominated;
// Invoked when Connection receives STUN error response with 487 code.
void HandleRoleConflictFromPeer();
@@ -577,10 +579,13 @@ class Connection : public rtc::MessageHandler,
bool connected_;
bool pruned_;
// By default |use_candidate_attr_| flag will be true,
- // as we will be using agrressive nomination.
+ // as we will be using aggressive nomination.
// But when peer is ice-lite, this flag "must" be initialized to false and
// turn on when connection becomes "best connection".
bool use_candidate_attr_;
+ // Whether this connection has been nominated by the controlling side via
+ // the use_candidate attribute.
+ bool nominated_;
IceMode remote_ice_mode_;
StunRequestManager requests_;
uint32 rtt_;
« 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