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

lifecyle: Use lif_address_format_cidr() for IF_ADDRESSES

Browse source 
Previously IF_ADDRESSES would not contain a prefix length if the address
  entry in the configuration did not was in CIDR format but had a netmask
  set seperately. This commit fixes that behaviour and computes a CIDR
  netmask if necessary.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
This commit is contained in:
Maximilian Wilhelm 2020-10-14 01:47:49 +02:00
parent 365461a6f6
commit de207a5950
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libifupdown/lifecycle.c
View file

@ -174,14 +174,13 @@ build_environment(char **envp[], const struct lif_execute_opts *opts, const stru
LIF_DICT_FOREACH(iter, &iface->vars) LIF_DICT_FOREACH(iter, &iface->vars)
{ {
const struct lif_dict_entry *entry = iter->data; struct lif_dict_entry *entry = iter->data;
if (!strcmp(entry->key, "address")) if (!strcmp(entry->key, "address"))
{ {
struct lif_address *addr = entry->data;
char addrbuf[4096]; char addrbuf[4096];
if (!lif_address_unparse(addr, addrbuf, sizeof addrbuf, true)) if (!lif_address_format_cidr(iface, entry, addrbuf, sizeof(addrbuf)))
continue; continue;
/* Append address to buffer */ /* Append address to buffer */