diff options
| author | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:44:56 +0000 |
|---|---|---|
| committer | szym@chromium.org <szym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:44:56 +0000 |
| commit | 7054e78fe6a2fcda72b06dc196b5f91cfdc75872 (patch) | |
| tree | 2efdd9b07a784a17905d737df9b762d88a6cd1c4 /chrome/browser/chromeos/web_socket_proxy.cc | |
| parent | cd46545164adf645d744f3955b256cf89412cdc6 (diff) | |
| download | chromium_src-7054e78fe6a2fcda72b06dc196b5f91cfdc75872.zip chromium_src-7054e78fe6a2fcda72b06dc196b5f91cfdc75872.tar.gz chromium_src-7054e78fe6a2fcda72b06dc196b5f91cfdc75872.tar.bz2 | |
Reimplements net::AddressList without struct addrinfo.
net::AddressList extends std::vector<std::IPEndPoint> by canonical name. (Canonical name is planned to be removed as well.)
Removes dependency on sys_addrinfo.h throughout the codebase.
Introduces net::SockaddrStorage for convenience.
BUG=125696
TEST=green waterfall
Review URL: http://codereview.chromium.org/10309002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135731 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/web_socket_proxy.cc')
| -rw-r--r-- | chrome/browser/chromeos/web_socket_proxy.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/web_socket_proxy.cc b/chrome/browser/chromeos/web_socket_proxy.cc index fc4e50d..441b5b8 100644 --- a/chrome/browser/chromeos/web_socket_proxy.cc +++ b/chrome/browser/chromeos/web_socket_proxy.cc @@ -1481,8 +1481,10 @@ bool Conn::TryConnectDest(const struct sockaddr* addr, socklen_t addrlen) { destchan_.write_fd(), NULL, &OnDestchanWrite, &OnDestchanError, evkey_)); - net::AddressList addrlist = net::AddressList::CreateFromSockaddr( - addr, addrlen, SOCK_STREAM, IPPROTO_TCP); + net::IPEndPoint endpoint; + if (!endpoint.FromSockAddr(addr, addrlen)) + return false; + net::AddressList addrlist(endpoint); net::HostPortPair host_port_pair(destname_, destport_); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, base::Bind( |