diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 00:51:04 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-10 00:51:04 +0000 |
commit | f8aa077c2ca13e8d665e0644e4de567c0380f37c (patch) | |
tree | 84e78197d9a6cf0cee14a1ca624b05f4acef9bc8 | |
parent | 08857c6c0b07f34b8e5161607e6f035dee28003e (diff) | |
download | chromium_src-f8aa077c2ca13e8d665e0644e4de567c0380f37c.zip chromium_src-f8aa077c2ca13e8d665e0644e4de567c0380f37c.tar.gz chromium_src-f8aa077c2ca13e8d665e0644e4de567c0380f37c.tar.bz2 |
Renamed authorized_ to connected_ for p2p sockets host.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7604014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96105 0039d316-1c4b-4281-b951-d872f2087c98
4 files changed, 11 insertions, 11 deletions
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc index 56d74a2f..2c09a2e 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc @@ -21,7 +21,7 @@ const int kPacketHeaderSize = sizeof(uint16); P2PSocketHostTcp::P2PSocketHostTcp(IPC::Message::Sender* message_sender, int routing_id, int id) : P2PSocketHost(message_sender, routing_id, id), - authorized_(false), + connected_(false), ALLOW_THIS_IN_INITIALIZER_LIST( connect_callback_(this, &P2PSocketHostTcp::OnConnected)), ALLOW_THIS_IN_INITIALIZER_LIST( @@ -135,11 +135,11 @@ void P2PSocketHostTcp::OnRead(int result) { } void P2PSocketHostTcp::OnPacket(std::vector<char>& data) { - if (!authorized_) { + if (!connected_) { P2PSocketHost::StunMessageType type; bool stun = GetStunPacketType(&*data.begin(), data.size(), &type); if (stun && IsRequestOrResponse(type)) { - authorized_ = true; + connected_ = true; } else if (!stun || type == STUN_DATA_INDICATION) { LOG(ERROR) << "Received unexpected data packet from " << remote_address_.ToString() @@ -207,7 +207,7 @@ void P2PSocketHostTcp::Send(const net::IPEndPoint& to, return; } - if (!authorized_) { + if (!connected_) { P2PSocketHost::StunMessageType type; bool stun = GetStunPacketType(&*data.begin(), data.size(), &type); if (!stun || type == STUN_DATA_INDICATION) { diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h index 568752c..6cfc3a5 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.h +++ b/content/browser/renderer_host/p2p/socket_host_tcp.h @@ -62,7 +62,7 @@ class P2PSocketHostTcp : public P2PSocketHost { scoped_refptr<net::GrowableIOBuffer> read_buffer_; scoped_refptr<net::DrainableIOBuffer> write_buffer_; - bool authorized_; + bool connected_; net::CompletionCallbackImpl<P2PSocketHostTcp> connect_callback_; net::CompletionCallbackImpl<P2PSocketHostTcp> read_callback_; diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc index a606ebc..e03af8e 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.cc +++ b/content/browser/renderer_host/p2p/socket_host_udp.cc @@ -97,11 +97,11 @@ void P2PSocketHostUdp::DidCompleteRead(int result) { if (result > 0) { std::vector<char> data(recv_buffer_->data(), recv_buffer_->data() + result); - if (authorized_peers_.find(recv_address_) == authorized_peers_.end()) { + if (connected_peers_.find(recv_address_) == connected_peers_.end()) { P2PSocketHost::StunMessageType type; bool stun = GetStunPacketType(&*data.begin(), data.size(), &type); if (stun && IsRequestOrResponse(type)) { - authorized_peers_.insert(recv_address_); + connected_peers_.insert(recv_address_); } else if (!stun || type == STUN_DATA_INDICATION) { LOG(ERROR) << "Received unexpected data packet from " << recv_address_.ToString() @@ -132,7 +132,7 @@ void P2PSocketHostUdp::Send(const net::IPEndPoint& to, return; } - if (authorized_peers_.find(to) == authorized_peers_.end()) { + if (connected_peers_.find(to) == connected_peers_.end()) { P2PSocketHost::StunMessageType type; bool stun = GetStunPacketType(&*data.begin(), data.size(), &type); if (!stun || type == STUN_DATA_INDICATION) { diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h index 90457a3..9294e8a 100644 --- a/content/browser/renderer_host/p2p/socket_host_udp.h +++ b/content/browser/renderer_host/p2p/socket_host_udp.h @@ -34,7 +34,7 @@ class P2PSocketHostUdp : public P2PSocketHost { private: friend class P2PSocketHostUdpTest; - typedef std::set<net::IPEndPoint> AuthorizedPeerSet; + typedef std::set<net::IPEndPoint> ConnectedPeerSet; void OnError(); void DoRead(); @@ -50,8 +50,8 @@ class P2PSocketHostUdp : public P2PSocketHost { bool send_pending_; // Set of peer for which we have received STUN binding request or - // response. - AuthorizedPeerSet authorized_peers_; + // response or relay allocation request or response. + ConnectedPeerSet connected_peers_; net::CompletionCallbackImpl<P2PSocketHostUdp> recv_callback_; net::CompletionCallbackImpl<P2PSocketHostUdp> send_callback_; |