Commit a90465a1 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Commit Bot

[fuchsia] Migrate NetInterface::flags to bits

Fixed: 1099393
Change-Id: I15d48675a9824f54542f70a5eb03c429443c88f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2358210
Commit-Queue: Tamir Duberstein <tamird@google.com>
Reviewed-by: default avatarWez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799102}
parent 99355f5f
...@@ -68,8 +68,7 @@ fuchsia::netstack::NetInterface DefaultNetInterface() { ...@@ -68,8 +68,7 @@ fuchsia::netstack::NetInterface DefaultNetInterface() {
// is sufficient. // is sufficient.
fuchsia::netstack::NetInterface interface; fuchsia::netstack::NetInterface interface;
interface.id = kDefaultInterfaceId; interface.id = kDefaultInterfaceId;
interface.flags = static_cast<decltype(interface.flags)>( interface.flags = fuchsia::netstack::Flags::UP;
fuchsia::netstack::NetInterfaceFlagUp);
interface.features = {}; interface.features = {};
interface.addr = IpAddressFrom(kDefaultIPv4Address); interface.addr = IpAddressFrom(kDefaultIPv4Address);
interface.netmask = IpAddressFrom(kDefaultIPv4Netmask); interface.netmask = IpAddressFrom(kDefaultIPv4Netmask);
...@@ -82,8 +81,7 @@ fuchsia::netstack::NetInterface SecondaryNetInterface() { ...@@ -82,8 +81,7 @@ fuchsia::netstack::NetInterface SecondaryNetInterface() {
// is sufficient. // is sufficient.
fuchsia::netstack::NetInterface interface; fuchsia::netstack::NetInterface interface;
interface.id = kSecondaryInterfaceId; interface.id = kSecondaryInterfaceId;
interface.flags = static_cast<decltype(interface.flags)>( interface.flags = fuchsia::netstack::Flags::UP;
fuchsia::netstack::NetInterfaceFlagUp);
interface.features = {}; interface.features = {};
interface.addr = IpAddressFrom(kSecondaryIPv4Address); interface.addr = IpAddressFrom(kSecondaryIPv4Address);
interface.netmask = IpAddressFrom(kSecondaryIPv4Netmask); interface.netmask = IpAddressFrom(kSecondaryIPv4Netmask);
...@@ -527,8 +525,7 @@ TEST_F(NetworkChangeNotifierFuchsiaTest, InterfaceUp) { ...@@ -527,8 +525,7 @@ TEST_F(NetworkChangeNotifierFuchsiaTest, InterfaceUp) {
EXPECT_EQ(NetworkChangeNotifier::ConnectionType::CONNECTION_NONE, EXPECT_EQ(NetworkChangeNotifier::ConnectionType::CONNECTION_NONE,
notifier_->GetCurrentConnectionType()); notifier_->GetCurrentConnectionType());
interfaces[0].flags = static_cast<decltype(interfaces[0].flags)>( interfaces[0].flags = fuchsia::netstack::Flags::UP;
fuchsia::netstack::NetInterfaceFlagUp);
netstack_.SetInterfaces(interfaces); netstack_.SetInterfaces(interfaces);
EXPECT_TRUE(type_observer_->RunAndExpectConnectionTypes( EXPECT_TRUE(type_observer_->RunAndExpectConnectionTypes(
......
...@@ -60,9 +60,8 @@ NetworkInterface NetworkInterfaceFromAddress( ...@@ -60,9 +60,8 @@ NetworkInterface NetworkInterfaceFromAddress(
NetworkChangeNotifier::ConnectionType ConvertConnectionType( NetworkChangeNotifier::ConnectionType ConvertConnectionType(
const fuchsia::netstack::NetInterface& iface) { const fuchsia::netstack::NetInterface& iface) {
auto up = if ((iface.flags & fuchsia::netstack::Flags::UP) !=
static_cast<decltype(iface.flags)>(fuchsia::netstack::NetInterfaceFlagUp); fuchsia::netstack::Flags::UP) {
if ((iface.flags & up) != up) {
return NetworkChangeNotifier::CONNECTION_NONE; return NetworkChangeNotifier::CONNECTION_NONE;
} else if ((iface.features & fuchsia::hardware::ethernet::Features::WLAN) == } else if ((iface.features & fuchsia::hardware::ethernet::Features::WLAN) ==
fuchsia::hardware::ethernet::Features::WLAN) { fuchsia::hardware::ethernet::Features::WLAN) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment