diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-05-09 11:59:18 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-05-09 11:59:18 +0900 |
| commit | e90d037411a1ef03196daf0bc97005776ae46aeb (patch) | |
| tree | dfae495d427d5046211e27e2b4d01334343e90b2 /src/network | |
| parent | a7533e3e483cd922d6c6314c395be38666884b21 (diff) | |
| download | systemd-e90d037411a1ef03196daf0bc97005776ae46aeb.tar.gz | |
network,udev: make MACAddress= in [Match] section take multiple MAC addresses
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/networkd-network-bus.c | 18 | ||||
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.h | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c index 22160ec10b..159537b19a 100644 --- a/src/network/networkd-network-bus.c +++ b/src/network/networkd-network-bus.c @@ -6,6 +6,7 @@ ***/ #include "alloc-util.h" +#include "ether-addr-util.h" #include "networkd-manager.h" #include "string-util.h" #include "strv.h" @@ -19,23 +20,24 @@ static int property_get_ether_addrs( void *userdata, sd_bus_error *error) { - Network *n = userdata; - const char *ether = NULL; + char buf[ETHER_ADDR_TO_STRING_MAX]; + const struct ether_addr *p; + Iterator i; + Set *s; int r; assert(bus); assert(reply); - assert(n); + assert(userdata); - if (n->match_mac) - ether = ether_ntoa(n->match_mac); + s = *(Set **) userdata; r = sd_bus_message_open_container(reply, 'a', "s"); if (r < 0) return r; - if (ether) { - r = sd_bus_message_append(reply, "s", strempty(ether)); + SET_FOREACH(p, s, i) { + r = sd_bus_message_append(reply, "s", ether_addr_to_string(p, buf)); if (r < 0) return r; } @@ -48,7 +50,7 @@ const sd_bus_vtable network_vtable[] = { SD_BUS_PROPERTY("Description", "s", NULL, offsetof(Network, description), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("SourcePath", "s", NULL, offsetof(Network, filename), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("MatchMAC", "as", property_get_ether_addrs, 0, SD_BUS_VTABLE_PROPERTY_CONST), + SD_BUS_PROPERTY("MatchMAC", "as", property_get_ether_addrs, offsetof(Network, match_mac), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("MatchPath", "as", NULL, offsetof(Network, match_path), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("MatchDriver", "as", NULL, offsetof(Network, match_driver), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("MatchType", "as", NULL, offsetof(Network, match_type), SD_BUS_VTABLE_PROPERTY_CONST), diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 216572aeb4..83ac330142 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -20,7 +20,7 @@ struct ConfigPerfItem; %struct-type %includes %% -Match.MACAddress, config_parse_hwaddr, 0, offsetof(Network, match_mac) +Match.MACAddress, config_parse_hwaddrs, 0, offsetof(Network, match_mac) Match.Path, config_parse_strv, 0, offsetof(Network, match_path) Match.Driver, config_parse_strv, 0, offsetof(Network, match_driver) Match.Type, config_parse_strv, 0, offsetof(Network, match_type) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index aafb192baf..daa30cb8f0 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -353,7 +353,7 @@ void network_free(Network *network) { free(network->filename); - free(network->match_mac); + set_free_free(network->match_mac); strv_free(network->match_path); strv_free(network->match_driver); strv_free(network->match_type); diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index e4bb0ba83a..a8cf11ca5d 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -103,7 +103,7 @@ struct Network { char *filename; char *name; - struct ether_addr *match_mac; + Set *match_mac; char **match_path; char **match_driver; char **match_type; |