Index: webrtc/p2p/base/p2ptransportchannel.h |
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h |
index ada3ecfb8bb2deeb6bc5d9120eb1647d7cd1a1da..69d52a2deb362a9f8453a6d91dda0a9a9abecc3d 100644 |
--- a/webrtc/p2p/base/p2ptransportchannel.h |
+++ b/webrtc/p2p/base/p2ptransportchannel.h |
@@ -308,11 +308,14 @@ class P2PTransportChannel : public TransportChannelImpl, |
std::set<Connection*> pinged_connections_; |
std::set<Connection*> unpinged_connections_; |
- Connection* best_connection_; |
+ Connection* best_connection_ = nullptr; |
pthatcher1
2016/06/15 21:59:52
Can we just start calling the "selected_connection
honghaiz3
2016/06/16 23:03:48
Done.
|
// Connection selected by the controlling agent. This should be used only |
pthatcher1
2016/06/15 21:59:52
It should be "connection nominated by the controll
honghaiz3
2016/06/16 23:03:48
Done.
|
// at controlled side when protocol type is RFC5245. |
pthatcher1
2016/06/15 21:59:52
The stuff about protocol type is no longer needed.
honghaiz3
2016/06/16 23:03:48
Done.
|
- Connection* pending_best_connection_; |
+ Connection* last_nominated_conn_ = nullptr; |
pthatcher1
2016/06/15 21:59:52
We could have it be "conn_" everwhere (including s
honghaiz3
2016/06/16 23:03:48
Done.
|
+ // The connection on which the data was received most recently. |
pthatcher1
2016/06/15 21:59:52
was most recently received.
honghaiz3
2016/06/16 23:03:48
Done.
|
+ Connection* last_data_received_conn_ = nullptr; |
pthatcher1
2016/06/15 21:59:52
I think this should coincide with our "receiving"
honghaiz3
2016/06/16 23:03:48
Using last_receiving_connection_ as it is shorter
|
+ |
std::vector<RemoteCandidate> remote_candidates_; |
bool sort_dirty_; // indicates whether another sort is needed right now |
bool had_connection_ = false; // if connections_ has ever been nonempty |