peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-08-01 13:23:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: follow-up to bridge support, support removing bridge ports

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-06-22 00:12:43 +02:00
committed by Tobias Waldekranz
parent 791a153ebf
commit 2994b68e89
2 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/confd/dagger.c
+1 -1
View File
@@ -22,7 +22,7 @@ static FILE *dagger_fopen(struct dagger *d, int gen, const char *action,
if (err)
return NULL;
fp = fopenf("w", "%s/%d/action/%s/%s/%02u-%s",
fp = fopenf("a", "%s/%d/action/%s/%s/%02u-%s",
d->path, gen, action, node, prio, script);
if (!fp)
return NULL;
src/confd/src/confd/ietf-interfaces.c
+48 -24
View File
@@ -576,6 +576,51 @@ static int netdag_gen_sysctl(struct dagger *net,
return err;
}
static int bridge_gen_ports(struct dagger *net, struct lyd_node *dif, struct lyd_node *cif, FILE *ip)
{
struct lyd_node *node, *bridge;
struct lydx_diff brdiff;
const char *ifname;
int err = 0;
node = lydx_get_descendant(lyd_child(dif), "bridge-port", NULL);
bridge = lydx_get_child(node, "bridge");
if (!node || !bridge)
return 0; /* not a bridge port, skip */
ifname = lydx_get_cattr(cif, "name");
if (lydx_get_diff(bridge, &brdiff) && brdiff.old) {
FILE *prev;
prev = dagger_fopen_current(net, "exit", brdiff.old, 60, "exit.ip");
if (!prev) {
err = -EIO;
goto fail;
}
fprintf(prev, "link set %s nomaster\n", ifname);
fclose(prev);
}
if (brdiff.new) {
FILE *next;
next = dagger_fopen_next(net, "init", brdiff.new, 60, "init.ip");
if (!next) {
err = -EIO;
goto fail;
}
fprintf(next, "link set %s master %s\n", ifname, brdiff.new);
fclose(next);
err = dagger_add_dep(net, brdiff.new, ifname);
if (err)
return ERR_IFACE(cif, err, "Unable to add dep \"%s\" to %s", ifname, brdiff.new);
}
fail:
return err;
}
static int bridge_fwd_mask(struct lyd_node *cif)
{
struct lyd_node *node, *proto;
@@ -740,27 +785,6 @@ static int netdag_gen_afspec_set(struct dagger *net, struct lyd_node *dif,
return -ENOSYS;
}
static int netdag_bridge_links(struct dagger *net, struct lyd_node *dif,
struct lyd_node *cif, FILE *ip)
{
const char *ifname = lydx_get_cattr(cif, "name");
struct lyd_node *node;
int err = 0;
node = lydx_get_descendant(lyd_child(cif), "bridge-port", NULL);
if (node) {
const char *brname = lydx_get_cattr(node, "bridge");
fprintf(ip, " master %s", brname);
err = dagger_add_dep(net, ifname, brname);
if (err)
return ERR_IFACE(cif, err, "Unable to add dep \"%s\" to %s", brname, ifname);
}
return err;
}
static bool netdag_must_del(struct lyd_node *dif, struct lyd_node *cif)
{
const char *iftype = lydx_get_cattr(cif, "type");
@@ -866,12 +890,12 @@ static sr_error_t netdag_gen_iface(struct dagger *net,
if (err)
goto err_close_ip;
err = netdag_bridge_links(net, dif, cif, ip);
fputc('\n', ip);
err = bridge_gen_ports(net, dif, cif, ip);
if (err)
goto err_close_ip;
fputc('\n', ip);
/* Set type specific attributes */
if (!fixed && op != LYDX_OP_CREATE) {
err = netdag_gen_afspec_set(net, dif, cif, ip);