experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: [yang_enum_int_value() fails if no explicit values are assigned to enums](https://github.com/clicon/clixon/issues/483)

Browse source
This commit is contained in:
Olof hagsand 2024-01-24 23:16:57 +01:00
parent 60ded12ea7
commit a97a06d15a
4 changed files with 62 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

48
lib/src/clixon_yang.c
View file

@ -2563,6 +2563,47 @@ ys_populate_length(clixon_handle h,
return retval;
}
/*! Assign enum values
*
* @param[in] h Clixon handle
* @param[in] ys The yang statement (type) to populate.
* @retval 0 OK
* @retval -1 Error
*/
static int
ys_populate_type_enum(clixon_handle h,
yang_stmt *ys)
{
int retval = -1;
yang_stmt *yenum = NULL;
yang_stmt *yval;
char *valstr;
int v;
int i = 0;
cg_var *cv = NULL;
yenum = NULL;
while ((yenum = yn_each(ys, yenum)) != NULL) {
if ((cv = cv_new(CGV_INT32)) == NULL){
clixon_err(OE_YANG, errno, "cv_new");
goto done;
}
if ((yval = yang_find(yenum, Y_VALUE, NULL)) != NULL){
valstr = yang_argument_get(yval);
if (parse_int32(valstr, &v, NULL) < 0)
goto done;
if (v > i)
i = v;
}
cv_int32_set(cv, i++);
yang_cv_set(yenum, cv);
}
retval = 0;
done:
return retval;
}
/*! Sanity check yang type statement
*
* XXX: Replace with generic parent/child type-check
@ -2585,8 +2626,7 @@ ys_populate_type(clixon_handle h,
goto done;
}
}
else
if (strcmp(ys->ys_argument, "identityref") == 0){
else if (strcmp(ys->ys_argument, "identityref") == 0){
if ((ybase = yang_find(ys, Y_BASE, NULL)) == NULL){
clixon_err(OE_YANG, 0, "identityref type requires base sub-statement");
goto done;
@ -2597,6 +2637,10 @@ ys_populate_type(clixon_handle h,
goto done;
}
}
else if (strcmp(ys->ys_argument, "enumeration") == 0){
if (ys_populate_type_enum(h, ys) < 0)
goto done;
}
retval = 0;
done:
return retval;