peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-30 12:33:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

confd: avoid setting lower-layer-if to vlanN

Browse Source 
Inference for an interface named vlanN can only guess C-VLAN and VID,
the base interface must be left to the user to fill in.  This is also
mandatory in the model.

Fixes #531

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2024-08-08 13:35:27 +02:00
parent 76d3627ccd
commit 05526dd893
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/confd/src/ietf-interfaces.c
+17 -11
View File
@@ -117,7 +117,7 @@ out:
static int ifchange_cand_infer_vlan(sr_session_ctx_t *session, const char *path)
{
sr_val_t inferred = { .type = SR_STRING_T };
char *ifname, *type, *xpath;
char *ifname, *type, *xpath, *lower;
sr_error_t err = SR_ERR_OK;
size_t cnt = 0;
int vid;
@@ -144,10 +144,14 @@ static int ifchange_cand_infer_vlan(sr_session_ctx_t *session, const char *path)
goto out_free_ifname;
*ptr++ = '\0';
vid = strtol(ptr, NULL, 10);
vid = strtol(ptr, NULL, 10);
lower = ifname;
} else if (!fnmatch("vlan+([0-9])", ifname, FNM_EXTMATCH)) {
if (sscanf(ifname, "vlan%d", &vid) != 1)
goto out_free_ifname;
/* Avoid setting lower-layer-if to vlanN */
lower = NULL;
} else {
goto out_free_ifname;
}
@@ -155,16 +159,18 @@ static int ifchange_cand_infer_vlan(sr_session_ctx_t *session, const char *path)
if (vid < 1 || vid > 4094)
goto out_free_ifname;
err = srx_nitems(session, &cnt, "/interfaces/interface[name='%s']/name", ifname);
if (err || !cnt)
goto out_free_ifname;
err = srx_nitems(session, &cnt, IF_VLAN_XPATH "/lower-layer-if", xpath);
if (!err && !cnt) {
inferred.data.string_val = ifname;
err = srx_set_item(session, &inferred, 0, IF_VLAN_XPATH "/lower-layer-if", xpath);
if (err)
if (lower) {
err = srx_nitems(session, &cnt, "/interfaces/interface[name='%s']/name", lower);
if (err || !cnt)
goto out_free_ifname;
err = srx_nitems(session, &cnt, IF_VLAN_XPATH "/lower-layer-if", xpath);
if (!err && !cnt) {
inferred.data.string_val = lower;
err = srx_set_item(session, &inferred, 0, IF_VLAN_XPATH "/lower-layer-if", xpath);
if (err)
goto out_free_ifname;
}
}
err = srx_nitems(session, &cnt, IF_VLAN_XPATH "/tag-type", xpath);