SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network,udev: make MACAddress= in [Match] section take multiple MAC addresses

Browse Source
This commit is contained in:
Yu Watanabe
2018-05-09 11:59:18 +09:00
parent a7533e3e48
commit e90d037411
9 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-network-bus.c
+10 -8
View File
@@ -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),
src/network/networkd-network-gperf.gperf
+1 -1
View File
@@ -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)
src/network/networkd-network.c
+1 -1
View File
@@ -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);
src/network/networkd-network.h
+1 -1
View File
@@ -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;