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

Side by Side Diff: webrtc/p2p/base/transportcontroller.cc

Issue 2637503003: More minor improvements to BaseChannel/transport code. (Closed)
Patch Set: Merge with master Created 3 years, 11 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/transportcontroller.h ('k') | webrtc/pc/channel.h » ('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 2015 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2015 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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 RefCountedChannel* new_pair = new RefCountedChannel(dtls, ice); 289 RefCountedChannel* new_pair = new RefCountedChannel(dtls, ice);
290 new_pair->AddRef(); 290 new_pair->AddRef();
291 channels_.insert(channels_.end(), new_pair); 291 channels_.insert(channels_.end(), new_pair);
292 bool channel_added = transport->AddChannel(dtls, component); 292 bool channel_added = transport->AddChannel(dtls, component);
293 RTC_DCHECK(channel_added); 293 RTC_DCHECK(channel_added);
294 // Adding a channel could cause aggregate state to change. 294 // Adding a channel could cause aggregate state to change.
295 UpdateAggregateStates_n(); 295 UpdateAggregateStates_n();
296 return dtls; 296 return dtls;
297 } 297 }
298 298
299 void TransportController::DestroyTransportChannel(
300 const std::string& transport_name,
301 int component) {
302 network_thread_->Invoke<void>(
303 RTC_FROM_HERE, rtc::Bind(&TransportController::DestroyTransportChannel_n,
304 this, transport_name, component));
305 }
306
299 void TransportController::DestroyTransportChannel_n( 307 void TransportController::DestroyTransportChannel_n(
300 const std::string& transport_name, 308 const std::string& transport_name,
301 int component) { 309 int component) {
302 RTC_DCHECK(network_thread_->IsCurrent()); 310 RTC_DCHECK(network_thread_->IsCurrent());
303 auto it = GetChannelIterator_n(transport_name, component); 311 auto it = GetChannelIterator_n(transport_name, component);
304 if (it == channels_.end()) { 312 if (it == channels_.end()) {
305 LOG(LS_WARNING) << "Attempting to delete " << transport_name 313 LOG(LS_WARNING) << "Attempting to delete " << transport_name
306 << " TransportChannel " << component 314 << " TransportChannel " << component
307 << ", which doesn't exist."; 315 << ", which doesn't exist.";
308 return; 316 return;
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE, 882 RTC_FROM_HERE, this, MSG_ICEGATHERINGSTATE,
875 new rtc::TypedMessageData<IceGatheringState>(new_gathering_state)); 883 new rtc::TypedMessageData<IceGatheringState>(new_gathering_state));
876 } 884 }
877 } 885 }
878 886
879 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { 887 void TransportController::OnDtlsHandshakeError(rtc::SSLHandshakeError error) {
880 SignalDtlsHandshakeError(error); 888 SignalDtlsHandshakeError(error);
881 } 889 }
882 890
883 } // namespace cricket 891 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportcontroller.h ('k') | webrtc/pc/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698