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

ifupdown: make --auto work

Browse source
This commit is contained in:
Ariadne Conill 2020-07-23 10:57:46 -06:00
parent 16dffed37a
commit 5e99e689a8
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
cmd/ifupdown.c
View file

@ -61,9 +61,15 @@ is_ifdown()
bool bool
change_interface(struct lif_interface *iface, struct lif_dict *state, const char *ifname) change_interface(struct lif_interface *iface, struct lif_dict *state, const char *ifname)
{ {
if (exec_opts.verbose)
{
fprintf(stderr, "%s: changing interface %s state to '%s'\n",
argv0, ifname, up ? "up" : "down");
}
if (!lif_lifecycle_run(&exec_opts, iface, state, ifname, up)) if (!lif_lifecycle_run(&exec_opts, iface, state, ifname, up))
{ {
fprintf(stderr, "%s: failed to bring interface %s %s\n", fprintf(stderr, "%s: failed to change interface %s state to '%s'\n",
argv0, ifname, up ? "up" : "down"); argv0, ifname, up ? "up" : "down");
return false; return false;
} }
@ -71,10 +77,38 @@ change_interface(struct lif_interface *iface, struct lif_dict *state, const char
return true; return true;
} }
bool
change_auto_interfaces(struct lif_dict *collection, struct lif_dict *state, struct match_options *opts)
{
struct lif_node *iter;
LIF_DICT_FOREACH(iter, collection)
{
struct lif_dict_entry *entry = iter->data;
struct lif_interface *iface = entry->data;
if (opts->is_auto && !iface->is_auto)
continue;
if (opts->exclude_pattern != NULL &&
!fnmatch(opts->exclude_pattern, iface->ifname, 0))
continue;
if (opts->include_pattern != NULL &&
fnmatch(opts->include_pattern, iface->ifname, 0))
continue;
if (!change_interface(iface, state, iface->ifname))
return false;
}
return true;
}
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
argv0 = argv[0]; argv0 = basename(argv[0]);
up = !is_ifdown(); up = !is_ifdown();
struct lif_dict state = {}; struct lif_dict state = {};
@ -145,7 +179,14 @@ main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (optind >= argc) if (match_opts.is_auto)
{
if (!change_auto_interfaces(&collection, &state, &match_opts))
return EXIT_FAILURE;
return EXIT_SUCCESS;
}
else if (optind >= argc)
usage(); usage();
int idx = optind; int idx = optind;