| 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 1256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1267 cricket::SendDataResult* result) { | 1267 cricket::SendDataResult* result) { |
| 1268 if (!data_channel_) { | 1268 if (!data_channel_) { |
| 1269 LOG(LS_ERROR) << "SendData called when data_channel_ is NULL."; | 1269 LOG(LS_ERROR) << "SendData called when data_channel_ is NULL."; |
| 1270 return false; | 1270 return false; |
| 1271 } | 1271 } |
| 1272 return data_channel_->SendData(params, payload, result); | 1272 return data_channel_->SendData(params, payload, result); |
| 1273 } | 1273 } |
| 1274 | 1274 |
| 1275 bool WebRtcSession::ConnectDataChannel(DataChannel* webrtc_data_channel) { | 1275 bool WebRtcSession::ConnectDataChannel(DataChannel* webrtc_data_channel) { |
| 1276 if (!data_channel_) { | 1276 if (!data_channel_) { |
| 1277 LOG(LS_ERROR) << "ConnectDataChannel called when data_channel_ is NULL."; | 1277 // Don't log an error here, because DataChannels are expected to call |
| 1278 // ConnectDataChannel in this state. It's the only way to initially tell |
| 1279 // whether or not the underlying transport is ready. |
| 1278 return false; | 1280 return false; |
| 1279 } | 1281 } |
| 1280 data_channel_->SignalReadyToSendData.connect(webrtc_data_channel, | 1282 data_channel_->SignalReadyToSendData.connect(webrtc_data_channel, |
| 1281 &DataChannel::OnChannelReady); | 1283 &DataChannel::OnChannelReady); |
| 1282 data_channel_->SignalDataReceived.connect(webrtc_data_channel, | 1284 data_channel_->SignalDataReceived.connect(webrtc_data_channel, |
| 1283 &DataChannel::OnDataReceived); | 1285 &DataChannel::OnDataReceived); |
| 1284 data_channel_->SignalStreamClosedRemotely.connect( | 1286 data_channel_->SignalStreamClosedRemotely.connect( |
| 1285 webrtc_data_channel, &DataChannel::OnStreamClosedRemotely); | 1287 webrtc_data_channel, &DataChannel::OnStreamClosedRemotely); |
| 1286 return true; | 1288 return true; |
| 1287 } | 1289 } |
| (...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2077 } | 2079 } |
| 2078 | 2080 |
| 2079 void WebRtcSession::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { | 2081 void WebRtcSession::OnDtlsHandshakeError(rtc::SSLHandshakeError error) { |
| 2080 if (metrics_observer_) { | 2082 if (metrics_observer_) { |
| 2081 metrics_observer_->IncrementEnumCounter( | 2083 metrics_observer_->IncrementEnumCounter( |
| 2082 webrtc::kEnumCounterDtlsHandshakeError, static_cast<int>(error), | 2084 webrtc::kEnumCounterDtlsHandshakeError, static_cast<int>(error), |
| 2083 static_cast<int>(rtc::SSLHandshakeError::MAX_VALUE)); | 2085 static_cast<int>(rtc::SSLHandshakeError::MAX_VALUE)); |
| 2084 } | 2086 } |
| 2085 } | 2087 } |
| 2086 } // namespace webrtc | 2088 } // namespace webrtc |
| OLD | NEW |