fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 14:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings/ifupdown: cleanup parsing bridge in plugin's initialize()

Browse source
This commit is contained in:
Thomas Haller 2018-08-25 10:26:44 +02:00
parent f0509205a2
commit f804b23b64
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
View file

@ -338,20 +338,22 @@ initialize (NMSettingsPlugin *config)
if (g_str_has_prefix (block_name, "br")) {
/* Try to find bridge ports */
const char *ports = ifparser_getkey (block, "bridge-ports");
if (ports) {
int i;
guint i;
int state = 0;
char **port_ifaces;
gs_strfreev char **port_ifaces = NULL;
nm_log_info (LOGD_SETTINGS, "found bridge ports %s for %s", ports, block->name);
port_ifaces = g_strsplit_set (ports, " \t", -1);
for (i = 0; i < g_strv_length (port_ifaces); i++) {
char *token = port_ifaces[i];
for (i = 0; port_ifaces[i]; i++) {
const char *token = port_ifaces[i];
/* Skip crazy stuff like regex or all */
if (nm_streq (token, "all")) {
if (nm_streq (token, "all"))
continue;
}
/* Small SM to skip everything inside regex */
if (nm_streq (token, "regex")) {
state++;
@ -368,7 +370,6 @@ initialize (NMSettingsPlugin *config)
g_hash_table_add (priv->eni_ifaces, g_strdup (token));
}
}
g_strfreev (port_ifaces);
}
continue;
}