diff options
author | mallinath@google.com <mallinath@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 00:38:31 +0000 |
---|---|---|
committer | mallinath@google.com <mallinath@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-15 00:38:31 +0000 |
commit | 2e39148c5c57d04757660af62102338cefc44112 (patch) | |
tree | 6230bc753381ff4c7494d360296a993ef3c3e7f9 /content/renderer/p2p/ipc_network_manager.cc | |
parent | 9a76dd0553dc4cd17386065bd18506b49751e807 (diff) | |
download | chromium_src-2e39148c5c57d04757660af62102338cefc44112.zip chromium_src-2e39148c5c57d04757660af62102338cefc44112.tar.gz chromium_src-2e39148c5c57d04757660af62102338cefc44112.tar.bz2 |
Rolling new libjingle revision 100
- Add IPv6 support to talk_base::SocketAddress
- Refactored PeerConnectionFactory interface
- Bug fixes
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/8914025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/p2p/ipc_network_manager.cc')
-rw-r--r-- | content/renderer/p2p/ipc_network_manager.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc index a3b408e..019801b 100644 --- a/content/renderer/p2p/ipc_network_manager.cc +++ b/content/renderer/p2p/ipc_network_manager.cc @@ -53,7 +53,8 @@ void IpcNetworkManager::OnNetworkListChanged( memcpy(&address, &it->address[0], sizeof(uint32)); address = ntohl(address); networks.push_back( - new talk_base::Network(it->name, it->name, address)); + new talk_base::Network( + it->name, it->name, talk_base::IPAddress(address))); } MergeNetworkList(networks, !first_update_sent_); |