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

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

Issue 1263663002: Remove GICE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: merge 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 unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/p2ptransport.cc ('k') | webrtc/p2p/base/p2ptransportchannel.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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 P2PTransport* transport, 56 P2PTransport* transport,
57 PortAllocator *allocator); 57 PortAllocator *allocator);
58 virtual ~P2PTransportChannel(); 58 virtual ~P2PTransportChannel();
59 59
60 // From TransportChannelImpl: 60 // From TransportChannelImpl:
61 virtual Transport* GetTransport() { return transport_; } 61 virtual Transport* GetTransport() { return transport_; }
62 virtual TransportChannelState GetState() const; 62 virtual TransportChannelState GetState() const;
63 virtual void SetIceRole(IceRole role); 63 virtual void SetIceRole(IceRole role);
64 virtual IceRole GetIceRole() const { return ice_role_; } 64 virtual IceRole GetIceRole() const { return ice_role_; }
65 virtual void SetIceTiebreaker(uint64 tiebreaker); 65 virtual void SetIceTiebreaker(uint64 tiebreaker);
66 virtual bool GetIceProtocolType(IceProtocolType* type) const;
67 virtual void SetIceProtocolType(IceProtocolType type);
68 virtual void SetIceCredentials(const std::string& ice_ufrag, 66 virtual void SetIceCredentials(const std::string& ice_ufrag,
69 const std::string& ice_pwd); 67 const std::string& ice_pwd);
70 virtual void SetRemoteIceCredentials(const std::string& ice_ufrag, 68 virtual void SetRemoteIceCredentials(const std::string& ice_ufrag,
71 const std::string& ice_pwd); 69 const std::string& ice_pwd);
72 virtual void SetRemoteIceMode(IceMode mode); 70 virtual void SetRemoteIceMode(IceMode mode);
73 virtual void Connect(); 71 virtual void Connect();
74 virtual void OnSignalingReady(); 72 virtual void OnSignalingReady();
75 virtual void OnCandidate(const Candidate& candidate); 73 virtual void OnCandidate(const Candidate& candidate);
76 // Sets the receiving timeout in milliseconds. 74 // Sets the receiving timeout in milliseconds.
77 // This also sets the check_receiving_delay proportionally. 75 // This also sets the check_receiving_delay proportionally.
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 Connection* pending_best_connection_; 234 Connection* pending_best_connection_;
237 std::vector<RemoteCandidate> remote_candidates_; 235 std::vector<RemoteCandidate> remote_candidates_;
238 bool sort_dirty_; // indicates whether another sort is needed right now 236 bool sort_dirty_; // indicates whether another sort is needed right now
239 bool was_writable_; 237 bool was_writable_;
240 typedef std::map<rtc::Socket::Option, int> OptionMap; 238 typedef std::map<rtc::Socket::Option, int> OptionMap;
241 OptionMap options_; 239 OptionMap options_;
242 std::string ice_ufrag_; 240 std::string ice_ufrag_;
243 std::string ice_pwd_; 241 std::string ice_pwd_;
244 std::string remote_ice_ufrag_; 242 std::string remote_ice_ufrag_;
245 std::string remote_ice_pwd_; 243 std::string remote_ice_pwd_;
246 IceProtocolType protocol_type_;
247 IceMode remote_ice_mode_; 244 IceMode remote_ice_mode_;
248 IceRole ice_role_; 245 IceRole ice_role_;
249 uint64 tiebreaker_; 246 uint64 tiebreaker_;
250 uint32 remote_candidate_generation_; 247 uint32 remote_candidate_generation_;
251 248
252 int check_receiving_delay_; 249 int check_receiving_delay_;
253 int receiving_timeout_; 250 int receiving_timeout_;
254 251
255 DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel); 252 DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
256 }; 253 };
257 254
258 } // namespace cricket 255 } // namespace cricket
259 256
260 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_ 257 #endif // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/p2ptransport.cc ('k') | webrtc/p2p/base/p2ptransportchannel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698