OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
480 transport_controller_->SignalConnectionState.connect( | 480 transport_controller_->SignalConnectionState.connect( |
481 this, &WebRtcSession::OnTransportControllerConnectionState); | 481 this, &WebRtcSession::OnTransportControllerConnectionState); |
482 transport_controller_->SignalReceiving.connect( | 482 transport_controller_->SignalReceiving.connect( |
483 this, &WebRtcSession::OnTransportControllerReceiving); | 483 this, &WebRtcSession::OnTransportControllerReceiving); |
484 transport_controller_->SignalGatheringState.connect( | 484 transport_controller_->SignalGatheringState.connect( |
485 this, &WebRtcSession::OnTransportControllerGatheringState); | 485 this, &WebRtcSession::OnTransportControllerGatheringState); |
486 transport_controller_->SignalCandidatesGathered.connect( | 486 transport_controller_->SignalCandidatesGathered.connect( |
487 this, &WebRtcSession::OnTransportControllerCandidatesGathered); | 487 this, &WebRtcSession::OnTransportControllerCandidatesGathered); |
488 transport_controller_->SignalCandidatesRemoved.connect( | 488 transport_controller_->SignalCandidatesRemoved.connect( |
489 this, &WebRtcSession::OnTransportControllerCandidatesRemoved); | 489 this, &WebRtcSession::OnTransportControllerCandidatesRemoved); |
490 transport_controller_->SignalDtlsHandshakeError.connect( | |
491 this, &WebRtcSession::OnDtlsHandshakeError); | |
490 } | 492 } |
491 | 493 |
492 WebRtcSession::~WebRtcSession() { | 494 WebRtcSession::~WebRtcSession() { |
493 ASSERT(signaling_thread()->IsCurrent()); | 495 ASSERT(signaling_thread()->IsCurrent()); |
494 // Destroy video_channel_ first since it may have a pointer to the | 496 // Destroy video_channel_ first since it may have a pointer to the |
495 // voice_channel_. | 497 // voice_channel_. |
496 if (video_channel_) { | 498 if (video_channel_) { |
497 SignalVideoChannelDestroyed(); | 499 SignalVideoChannelDestroyed(); |
498 channel_manager_->DestroyVideoChannel(video_channel_.release()); | 500 channel_manager_->DestroyVideoChannel(video_channel_.release()); |
499 } | 501 } |
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2001 metrics_observer_->IncrementSparseEnumCounter(ssl_counter_type, | 2003 metrics_observer_->IncrementSparseEnumCounter(ssl_counter_type, |
2002 ssl_cipher_suite); | 2004 ssl_cipher_suite); |
2003 } | 2005 } |
2004 } | 2006 } |
2005 | 2007 |
2006 void WebRtcSession::OnSentPacket_w(const rtc::SentPacket& sent_packet) { | 2008 void WebRtcSession::OnSentPacket_w(const rtc::SentPacket& sent_packet) { |
2007 RTC_DCHECK(worker_thread()->IsCurrent()); | 2009 RTC_DCHECK(worker_thread()->IsCurrent()); |
2008 media_controller_->call_w()->OnSentPacket(sent_packet); | 2010 media_controller_->call_w()->OnSentPacket(sent_packet); |
2009 } | 2011 } |
2010 | 2012 |
2013 void WebRtcSession::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { | |
2014 metrics_observer_->IncrementEnumCounter( | |
skvlad
2016/07/22 01:25:14
Please add a DCHECK(metrics_observer_ != NULL)
honghaiz3
2016/07/22 21:35:26
I think you should add a condition on it.
if (met
| |
2015 webrtc::kEnumCounterDtlsHandshakeError, static_cast<int>(error), | |
2016 static_cast<int>(rtc::SSLHandshakeError::ERR_OTHER) + 1); | |
2017 } | |
2018 | |
2011 } // namespace webrtc | 2019 } // namespace webrtc |
OLD | NEW |