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

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

Issue 1588083002: Remove assert which was incorrectly added to TcpPort::OnSentPacket. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 | « no previous file | no next file » | 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 void TCPPort::OnReadPacket(rtc::AsyncPacketSocket* socket, 283 void TCPPort::OnReadPacket(rtc::AsyncPacketSocket* socket,
284 const char* data, size_t size, 284 const char* data, size_t size,
285 const rtc::SocketAddress& remote_addr, 285 const rtc::SocketAddress& remote_addr,
286 const rtc::PacketTime& packet_time) { 286 const rtc::PacketTime& packet_time) {
287 Port::OnReadPacket(data, size, remote_addr, PROTO_TCP); 287 Port::OnReadPacket(data, size, remote_addr, PROTO_TCP);
288 } 288 }
289 289
290 void TCPPort::OnSentPacket(rtc::AsyncPacketSocket* socket, 290 void TCPPort::OnSentPacket(rtc::AsyncPacketSocket* socket,
291 const rtc::SentPacket& sent_packet) { 291 const rtc::SentPacket& sent_packet) {
292 ASSERT(socket == socket_);
293 PortInterface::SignalSentPacket(sent_packet); 292 PortInterface::SignalSentPacket(sent_packet);
294 } 293 }
295 294
296 void TCPPort::OnReadyToSend(rtc::AsyncPacketSocket* socket) { 295 void TCPPort::OnReadyToSend(rtc::AsyncPacketSocket* socket) {
297 Port::OnReadyToSend(); 296 Port::OnReadyToSend();
298 } 297 }
299 298
300 void TCPPort::OnAddressReady(rtc::AsyncPacketSocket* socket, 299 void TCPPort::OnAddressReady(rtc::AsyncPacketSocket* socket,
301 const rtc::SocketAddress& address) { 300 const rtc::SocketAddress& address) {
302 AddAddress(address, address, rtc::SocketAddress(), TCP_PROTOCOL_NAME, "", 301 AddAddress(address, address, rtc::SocketAddress(), TCP_PROTOCOL_NAME, "",
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 void TCPConnection::ConnectSocketSignals(rtc::AsyncPacketSocket* socket) { 505 void TCPConnection::ConnectSocketSignals(rtc::AsyncPacketSocket* socket) {
507 if (outgoing_) { 506 if (outgoing_) {
508 socket->SignalConnect.connect(this, &TCPConnection::OnConnect); 507 socket->SignalConnect.connect(this, &TCPConnection::OnConnect);
509 } 508 }
510 socket->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket); 509 socket->SignalReadPacket.connect(this, &TCPConnection::OnReadPacket);
511 socket->SignalReadyToSend.connect(this, &TCPConnection::OnReadyToSend); 510 socket->SignalReadyToSend.connect(this, &TCPConnection::OnReadyToSend);
512 socket->SignalClose.connect(this, &TCPConnection::OnClose); 511 socket->SignalClose.connect(this, &TCPConnection::OnClose);
513 } 512 }
514 513
515 } // namespace cricket 514 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698