diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-23 01:08:51 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-01 01:24:42 +0900 |
| commit | b38de0e9cc1dfd60a89cf9ec998ed94e71610d50 (patch) | |
| tree | a9116945729ad42b3769a388db14e4630d1f76b1 /src/libsystemd-network | |
| parent | 54a8423788ec3cc6240959ab9f5cdac40baf047a (diff) | |
| download | systemd-b38de0e9cc1dfd60a89cf9ec998ed94e71610d50.tar.gz | |
network,udev: make net_match_config() take sd_device
Diffstat (limited to 'src/libsystemd-network')
| -rw-r--r-- | src/libsystemd-network/network-internal.c | 18 | ||||
| -rw-r--r-- | src/libsystemd-network/network-internal.h | 4 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 60227cf286..1f02a1e984 100644 --- a/src/libsystemd-network/network-internal.c +++ b/src/libsystemd-network/network-internal.c @@ -106,12 +106,24 @@ bool net_match_config(Set *match_mac, char * const *match_drivers, char * const *match_types, char * const *match_names, + sd_device *device, const struct ether_addr *dev_mac, - const char *dev_path, - const char *dev_driver, - const char *dev_type, const char *dev_name) { + const char *dev_path = NULL, *dev_driver = NULL, *dev_type = NULL, *mac_str; + + if (device) { + (void) sd_device_get_property_value(device, "ID_PATH", &dev_path); + (void) sd_device_get_property_value(device, "ID_NET_DRIVER", &dev_driver); + (void) sd_device_get_devtype(device, &dev_type); + + if (!dev_name) + (void) sd_device_get_sysname(device, &dev_name); + if (!dev_mac && + sd_device_get_sysattr_value(device, "address", &mac_str) >= 0) + dev_mac = ether_aton(mac_str); + } + if (match_mac && (!dev_mac || !set_contains(match_mac, dev_mac))) return false; diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h index 958938d3fe..f6e69078fa 100644 --- a/src/libsystemd-network/network-internal.h +++ b/src/libsystemd-network/network-internal.h @@ -19,10 +19,8 @@ bool net_match_config(Set *match_mac, char * const *match_driver, char * const *match_type, char * const *match_name, + sd_device *device, const struct ether_addr *dev_mac, - const char *dev_path, - const char *dev_driver, - const char *dev_type, const char *dev_name); CONFIG_PARSER_PROTOTYPE(config_parse_net_condition); |