lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

Deduce which addons to 'use' from parameters names (closes #6)

Browse source 
Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
This commit is contained in:
Maximilian Wilhelm 2020-07-28 22:39:20 +02:00
parent 2420023b74
commit 73f3690432
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libifupdown/interface-file.c
View file

@ -19,6 +19,7 @@
#include "libifupdown/interface-file.h" #include "libifupdown/interface-file.h"
#include "libifupdown/fgetline.h" #include "libifupdown/fgetline.h"
#include "libifupdown/tokenize.h" #include "libifupdown/tokenize.h"
#include "libifupdown/compar.h"
bool bool
lif_interface_file_parse(struct lif_dict *collection, const char *filename) lif_interface_file_parse(struct lif_dict *collection, const char *filename)
@ -138,6 +139,23 @@ lif_interface_file_parse(struct lif_dict *collection, const char *filename)
else if (cur_iface != NULL) else if (cur_iface != NULL)
{ {
lif_dict_add(&cur_iface->vars, token, strdup(bufp)); lif_dict_add(&cur_iface->vars, token, strdup(bufp));
/* Check if token looks like <word1>-<word*> and assume <word1> is an addon */
char *word_end = strchr(token, '-');
if (word_end)
{
/* Copy word1 to not mangle *token */
char *addon = strndup(token, word_end - token);
lif_dict_add_once(&cur_iface->vars, "use", addon, compar_str);
/* pass requires as compatibility env vars to appropriate executors (bridge, bond) */
if (!strcmp(addon, "dhcp"))
cur_iface->is_dhcp = true;
else if (!strcmp(addon, "bridge"))
cur_iface->is_bridge = true;
else if (!strcmp(addon, "bond"))
cur_iface->is_bond = true;
}
} }
} }