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

Unified Diff: webrtc/p2p/base/tcpport.cc

Issue 2063823008: Adding IceConfig option to assume TURN/TURN candidate pairs will work. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename IceConfig option and fix transition to STATE_WRITE_UNRELIABLE. Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/p2p/base/tcpport.cc
diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc
index 9a1caa25546bb6e4a0631de2aa4565e2e8a0e284..94ed851b13d31995ab57d29e9d875d749fe4f607 100644
--- a/webrtc/p2p/base/tcpport.cc
+++ b/webrtc/p2p/base/tcpport.cc
@@ -124,7 +124,8 @@ TCPPort::~TCPPort() {
}
Connection* TCPPort::CreateConnection(const Candidate& address,
- CandidateOrigin origin) {
+ CandidateOrigin origin,
+ const IceConfig& config) {
if (!SupportsProtocol(address.protocol())) {
return NULL;
}
@@ -158,9 +159,9 @@ Connection* TCPPort::CreateConnection(const Candidate& address,
if (rtc::AsyncPacketSocket* socket =
GetIncoming(address.address(), true)) {
socket->SignalReadPacket.disconnect(this);
- conn = new TCPConnection(this, address, socket);
+ conn = new TCPConnection(this, address, config, socket);
} else {
- conn = new TCPConnection(this, address);
+ conn = new TCPConnection(this, address, config);
}
AddOrReplaceConnection(conn);
return conn;
@@ -305,8 +306,9 @@ void TCPPort::OnAddressReady(rtc::AsyncPacketSocket* socket,
TCPConnection::TCPConnection(TCPPort* port,
const Candidate& candidate,
+ const IceConfig& config,
rtc::AsyncPacketSocket* socket)
- : Connection(port, 0, candidate),
+ : Connection(port, 0, candidate, config),
socket_(socket),
error_(0),
outgoing_(socket == NULL),

Powered by Google App Engine
This is Rietveld 408576698