| 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),
|
|
|