commit 630d98952f1b35d0a7734f9a691b492ca580bbbf
author Michal Vasko <mvasko@cesnet.cz> Tue Dec 08 17:11:08 2020 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Wed Dec 09 11:42:25 2020 +0100
tree 35bfe7ae695c47d491327583b64c4c00c37343d3
parent 2552ea3651b7b173ab877ae50b4f6e99d682be88

data tree FEATURE implicit output flag

For adding output implicit nodes
instead of input.

src/tree_data.c

diff --git a/src/tree_data.c b/src/tree_data.c
index f6e10d4..97cd4de 100644
--- a/src/tree_data.c
+++ b/src/tree_data.c
@@ -1453,10 +1453,11 @@
         struct lyd_node **diff)
 {
     LY_ERR ret;
-    const struct lysc_node *iter = NULL;
+    const struct lysc_node *iter = NULL, *sp;
     struct lyd_node *node = NULL;
     struct lyd_value **dflts;
     LY_ARRAY_COUNT_TYPE u;
+    uint32_t getnext_opts;
 
     assert(first && (parent || sparent || mod));
 
@@ -1464,7 +1465,19 @@
         sparent = parent->schema;
     }
 
-    while ((iter = lys_getnext(iter, sparent, mod ? mod->compiled : NULL, LYS_GETNEXT_WITHCHOICE))) {
+    for (sp = sparent; sp && !(sp->nodetype & (LYS_RPC | LYS_ACTION | LYS_NOTIF)); sp = sp->parent) {}
+    if (sp) {
+        /* these options lose meaning in operations and could cause skipping some nodes
+         * (because LYS_CONFIG* flags are set in the schema nodes with a different meaning) */
+        impl_opts &= ~(LYD_IMPLICIT_NO_STATE | LYD_IMPLICIT_NO_CONFIG);
+    }
+
+    getnext_opts = LYS_GETNEXT_WITHCHOICE;
+    if (impl_opts & LYD_IMPLICIT_OUTPUT) {
+        getnext_opts |= LYS_GETNEXT_OUTPUT;
+    }
+
+    while ((iter = lys_getnext(iter, sparent, mod ? mod->compiled : NULL, getnext_opts))) {
         if ((impl_opts & LYD_IMPLICIT_NO_STATE) && (iter->flags & LYS_CONFIG_R)) {
             continue;
         } else if ((impl_opts & LYD_IMPLICIT_NO_CONFIG) && (iter->flags & LYS_CONFIG_W)) {