summaryrefslogtreecommitdiffstats
path: root/content/renderer/p2p
diff options
context:
space:
mode:
authormallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 05:13:32 +0000
committermallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-15 05:13:32 +0000
commitf7a8aee098ac5d816df06b0f72224341915817fa (patch)
tree17cdfb0c86319e5a4082aa3c12ae0689952de9dd /content/renderer/p2p
parent1abde7fe263c333098a728646d0dd3b6b7f51a6a (diff)
downloadchromium_src-f7a8aee098ac5d816df06b0f72224341915817fa.zip
chromium_src-f7a8aee098ac5d816df06b0f72224341915817fa.tar.gz
chromium_src-f7a8aee098ac5d816df06b0f72224341915817fa.tar.bz2
Use STUN_TCP_SOCKET also while checking for
tcp client socket. R=sergeyu@chromium.org Review URL: https://chromiumcodereview.appspot.com/17093004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/p2p')
-rw-r--r--content/renderer/p2p/ipc_socket_factory.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index bbc87e1..28f8007 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -19,6 +19,11 @@ namespace content {
namespace {
+bool IsTcpClientSocket(P2PSocketType type) {
+ return (type == P2P_SOCKET_STUN_TCP_CLIENT) ||
+ (type == P2P_SOCKET_TCP_CLIENT);
+}
+
// TODO(miu): This needs tuning. http://crbug.com/237960
const size_t kMaximumInFlightBytes = 64 * 1024; // 64 KB
@@ -75,7 +80,6 @@ class IpcPacketSocket : public talk_base::AsyncPacketSocket,
void InitAcceptedTcp(P2PSocketClient* client,
const talk_base::SocketAddress& local_address,
const talk_base::SocketAddress& remote_address);
-
P2PSocketType type_;
// Message loop on which this socket was created and being used.
@@ -267,7 +271,7 @@ talk_base::AsyncPacketSocket::State IpcPacketSocket::GetState() const {
return STATE_BINDING;
case IS_OPEN:
- if (type_ == P2P_SOCKET_TCP_CLIENT) {
+ if (IsTcpClientSocket(type_)) {
return STATE_CONNECTED;
} else {
return STATE_BOUND;
@@ -316,7 +320,7 @@ void IpcPacketSocket::OnOpen(const net::IPEndPoint& address) {
TraceSendThrottlingState();
SignalAddressReady(this, local_address_);
- if (type_ == P2P_SOCKET_TCP_CLIENT)
+ if (IsTcpClientSocket(type_))
SignalConnect(this);
}