diff options
| author | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 17:26:19 +0000 |
|---|---|---|
| committer | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 17:26:19 +0000 |
| commit | 649dd8126f846d18fb434435ce18478144e7bc1c (patch) | |
| tree | 0a7661543ce61a9c05d3855052778bcbe4639630 /net/base/net_util.cc | |
| parent | a723e995ee0fa2962d77377b3e4b267f02a962d4 (diff) | |
| download | chromium_src-649dd8126f846d18fb434435ce18478144e7bc1c.zip chromium_src-649dd8126f846d18fb434435ce18478144e7bc1c.tar.gz chromium_src-649dd8126f846d18fb434435ce18478144e7bc1c.tar.bz2 | |
Reland 238671 "Added net::NetworkInterface::interface_index."
net_unittests still failed after reverting the original CL, so
it obviously wasn't the cause of the failures.
> Revert 238671 "Added net::NetworkInterface::interface_index."
>
> Speculative revert to see if it fixes the issues with net_unittests
> on WinXP: http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%282%29/builds/32133/steps/net_unittests/logs/stdio
>
> > Added net::NetworkInterface::interface_index.
> > Not implemented for Android.
> >
> > BUG=319068
> >
> > Review URL: https://codereview.chromium.org/100703002
>
> TBR=vitalybuka@chromium.org
>
> Review URL: https://codereview.chromium.org/101403004
TBR=dubroy@chromium.org
Review URL: https://codereview.chromium.org/105053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 4a4ff52..241d748 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -2186,9 +2186,13 @@ NetworkInterface::NetworkInterface() : network_prefix(0) { } NetworkInterface::NetworkInterface(const std::string& name, + uint32 interface_index, const IPAddressNumber& address, size_t network_prefix) - : name(name), address(address), network_prefix(network_prefix) { + : name(name), + interface_index(interface_index), + address(address), + network_prefix(network_prefix) { } NetworkInterface::~NetworkInterface() { |