]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12762 from yuwata/network-introduce-carrier-and-network-state...
authorLennart Poettering <lennart@poettering.net>
Thu, 20 Jun 2019 11:36:30 +0000 (13:36 +0200)
committerGitHub <noreply@github.com>
Thu, 20 Jun 2019 11:36:30 +0000 (13:36 +0200)
network: introduce carrier and address state to fix network_is_online()

1  2 
src/network/networkd-link-bus.c
src/network/networkd-link.c
src/network/networkd-manager.c
src/systemd/sd-network.h

index 076845421ceba2716bbc6d45eb6bda937b6255c3,f44818b65f218f699765079aa84fb2f5496b6adb..eda0325c2b94ff2c2560e2e52185fc874d5a1f14
@@@ -60,8 -62,10 +63,10 @@@ const sd_bus_vtable link_vtable[] = 
          SD_BUS_VTABLE_START(0),
  
          SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+         SD_BUS_PROPERTY("CarrierState", "s", property_get_carrier_state, offsetof(Link, carrier_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
+         SD_BUS_PROPERTY("AddressState", "s", property_get_address_state, offsetof(Link, address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
          SD_BUS_PROPERTY("AdministrativeState", "s", property_get_administrative_state, offsetof(Link, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 -        SD_BUS_PROPERTY("BitRates", "(dd)", property_get_bit_rates, 0, 0),
 +        SD_BUS_PROPERTY("BitRates", "(tt)", property_get_bit_rates, 0, 0),
  
          SD_BUS_VTABLE_END
  };
Simple merge
Simple merge
Simple merge