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

Fixed a cornercase of RFC 7950 Sec 7.9, a choice witout case with sub-containers

Browse source
This commit is contained in:
Olof hagsand 2022-05-16 13:12:59 +02:00
parent 5bd64712c7
commit 3a336838f7
3 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/src/clixon_datastore_write.c
View file

@ -297,6 +297,7 @@ check_delete_existing_case(cxobj *x0,
{
int retval = -1;
yang_stmt *yp;
yang_stmt *y0p;
yang_stmt *y0case;
yang_stmt *y1case;
yang_stmt *y0choice;
@ -317,28 +318,30 @@ check_delete_existing_case(cxobj *x0,
}
else
goto ok;
/* Now traverse existing tree and compare with choice yang structure of added tree */
x0prev = NULL;
x0c = NULL;
while ((x0c = xml_child_each(x0, x0c, CX_ELMNT)) != NULL) {
if ((y0c = xml_spec(x0c)) == NULL ||
(yp = yang_parent_get(y0c)) == NULL){
yang_parent_get(y0c) == NULL){
x0prev = x0c;
continue;
}
if (yang_keyword_get(yp) == Y_CASE){
y0case = yp;
y0p = yang_parent_get(y0c);
if (yang_keyword_get(y0p) == Y_CASE){
y0case = y0p;
y0choice = yang_parent_get(y0case);
}
else if (yang_keyword_get(yp) == Y_CHOICE){
else if (yang_keyword_get(y0p) == Y_CHOICE){
y0case = NULL;
y0choice = yp;
y0choice = y0p;
}
else{
x0prev = x0c;
continue;
}
if (y0choice == y1choice){
if (y0case == NULL ||
if ((y0case == NULL && y0c != y1c) ||
y0case != y1case){
if (xml_purge(x0c) < 0)
goto done;