| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 Close(); | 377 Close(); |
| 378 } | 378 } |
| 379 | 379 |
| 380 return; | 380 return; |
| 381 } | 381 } |
| 382 queued_received_data_.Push(buffer.release()); | 382 queued_received_data_.Push(buffer.release()); |
| 383 } | 383 } |
| 384 } | 384 } |
| 385 | 385 |
| 386 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { | 386 void DataChannel::OnStreamClosedRemotely(uint32_t sid) { |
| 387 if (data_channel_type_ == cricket::DCT_SCTP && sid == config_.id) { | 387 if (data_channel_type_ == cricket::DCT_SCTP && |
| 388 sid == static_cast<uint32_t>(config_.id)) { |
| 388 Close(); | 389 Close(); |
| 389 } | 390 } |
| 390 } | 391 } |
| 391 | 392 |
| 392 void DataChannel::OnChannelReady(bool writable) { | 393 void DataChannel::OnChannelReady(bool writable) { |
| 393 writable_ = writable; | 394 writable_ = writable; |
| 394 if (!writable) { | 395 if (!writable) { |
| 395 return; | 396 return; |
| 396 } | 397 } |
| 397 | 398 |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 QueueControlMessage(buffer); | 631 QueueControlMessage(buffer); |
| 631 } else { | 632 } else { |
| 632 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send" | 633 LOG(LS_ERROR) << "Closing the DataChannel due to a failure to send" |
| 633 << " the CONTROL message, send_result = " << send_result; | 634 << " the CONTROL message, send_result = " << send_result; |
| 634 Close(); | 635 Close(); |
| 635 } | 636 } |
| 636 return retval; | 637 return retval; |
| 637 } | 638 } |
| 638 | 639 |
| 639 } // namespace webrtc | 640 } // namespace webrtc |
| OLD | NEW |