schema parsers BUGFIX checking default values

Default values of leafs/leaf-lists are supposed to be checked only in data tree,
not inside a grouping. Default values defined in typedefs are checked even in
typedefs inside groupings with exception of leafrefs where we might not have the
target leaf.

Fixes #279

Author: rkrejci

src/parser_yang.c

@@ -3592,7 +3592,8 @@ yang_check_typedef(struct lys_module *module, struct lys_node *parent, struct un
 
         (*ptr_tpdf_size)++;
         /* check default value*/
-        if (unres_schema_add_node(module, unres, &tpdf[i].type, UNRES_TYPE_DFLT, (struct lys_node *)(&tpdf[i].dflt)) == -1)  {
+        if (unres_schema_add_node(module, unres, &tpdf[i].type, UNRES_TYPEDEF_DFLT,
+                                  (struct lys_node *)(&tpdf[i].dflt)) == -1)  {
             ++i;
             goto error;
         }
@@ -3709,7 +3710,8 @@ yang_check_leaf(struct lys_module *module, struct lys_node_leaf *leaf, int optio
         goto error;
     }
 
-    if (unres_schema_add_node(module, unres, &leaf->type, UNRES_TYPE_DFLT, (struct lys_node *)&leaf->dflt) == -1) {
+    if (!(options & LYS_PARSE_OPT_INGRP) &&
+            (unres_schema_add_node(module, unres, &leaf->type, UNRES_TYPE_DFLT, (struct lys_node *)&leaf->dflt) == -1)) {
         goto error;
     }
 
@@ -3764,7 +3766,9 @@ yang_check_leaflist(struct lys_module *module, struct lys_node_leaflist *leaflis
         }
         /* check default value (if not defined, there still could be some restrictions
          * that need to be checked against a default value from a derived type) */
-        if (unres_schema_add_node(module, unres, &leaflist->type, UNRES_TYPE_DFLT, (struct lys_node *)(&leaflist->dflt[i])) == -1) {
+        if (!(options & LYS_PARSE_OPT_INGRP) &&
+                (unres_schema_add_node(module, unres, &leaflist->type, UNRES_TYPE_DFLT,
+                                       (struct lys_node *)(&leaflist->dflt[i])) == -1)) {
             goto error;
         }
     }

src/parser_yin.c

@@ -1601,7 +1601,7 @@ fill_yin_typedef(struct lys_module *module, struct lys_node *parent, struct lyxm
 
     /* check default value (if not defined, there still could be some restrictions
      * that need to be checked against a default value from a derived type) */
-    if (unres_schema_add_node(module, unres, &tpdf->type, UNRES_TYPE_DFLT, (struct lys_node *)(&tpdf->dflt)) == -1) {
+    if (unres_schema_add_node(module, unres, &tpdf->type, UNRES_TYPEDEF_DFLT, (struct lys_node *)(&tpdf->dflt)) == -1) {
         goto error;
     }
 
@@ -4663,7 +4663,9 @@ read_yin_leaf(struct lys_module *module, struct lys_node *parent, struct lyxml_e
 
     /* check default value (if not defined, there still could be some restrictions
      * that need to be checked against a default value from a derived type) */
-    if (unres_schema_add_node(module, unres, &leaf->type, UNRES_TYPE_DFLT, (struct lys_node *)(&leaf->dflt)) == -1) {
+    if (!(options & LYS_PARSE_OPT_INGRP) &&
+            (unres_schema_add_node(module, unres, &leaf->type, UNRES_TYPE_DFLT,
+                                   (struct lys_node *)(&leaf->dflt)) == -1)) {
         goto error;
     }
 
@@ -4969,8 +4971,9 @@ read_yin_leaflist(struct lys_module *module, struct lys_node *parent, struct lyx
     /* check default value (if not defined, there still could be some restrictions
      * that need to be checked against a default value from a derived type) */
     for (r = 0; r < llist->dflt_size; r++) {
-        if (unres_schema_add_node(module, unres, &llist->type, UNRES_TYPE_DFLT,
-                                  (struct lys_node *)(&llist->dflt[r])) == -1) {
+        if (!(options & LYS_PARSE_OPT_INGRP) &&
+                (unres_schema_add_node(module, unres, &llist->type, UNRES_TYPE_DFLT,
+                                       (struct lys_node *)(&llist->dflt[r])) == -1)) {
             goto error;
         }
     }

src/resolve.c

@@ -3029,7 +3029,7 @@ resolve_superior_type(const char *name, const char *mod_name, const struct lys_m
  * @return EXIT_SUCCESS on success, EXIT_FAILURE on forward reference, -1 on error.
  */
 static int
-check_default(struct lys_type *type, const char **value, struct lys_module *module)
+check_default(struct lys_type *type, const char **value, struct lys_module *module, int tpdf)
 {
     struct lys_tpdf *base_tpdf = NULL;
     struct lyd_node_leaf_list node;
@@ -3041,6 +3041,9 @@ check_default(struct lys_type *type, const char **value, struct lys_module *modu
     if (type->base <= LY_TYPE_DER) {
         /* the type was not resolved yet, nothing to do for now */
         return EXIT_FAILURE;
+    } else if (type->base == LY_TYPE_LEAFREF && tpdf) {
+        /* leafref in typedef cannot be checked */
+        return EXIT_SUCCESS;
     }
 
     dflt = *value;
@@ -3142,7 +3145,7 @@ check_default(struct lys_type *type, const char **value, struct lys_module *modu
             ret = EXIT_FAILURE;
             goto finish;
         }
-        ret = check_default(&type->info.lref.target->type, &dflt, module);
+        ret = check_default(&type->info.lref.target->type, &dflt, module, 0);
         if (!ret) {
             /* adopt possibly changed default value to its canonical form */
             if (*value) {
@@ -6539,10 +6542,13 @@ resolve_unres_schema_item(struct lys_module *mod, void *item, enum UNRES_ITEM ty
     case UNRES_USES:
         rc = resolve_unres_schema_uses(item, unres);
         break;
+    case UNRES_TYPEDEF_DFLT:
+        parent_type++;
+        /* no break */
     case UNRES_TYPE_DFLT:
         stype = item;
 
-        rc = check_default(stype, (const char **)str_snode, mod);
+        rc = check_default(stype, (const char **)str_snode, mod, parent_type);
         break;
     case UNRES_CHOICE_DFLT:
         expr = str_snode;
@@ -6764,6 +6770,7 @@ print_unres_schema_item_fail(void *item, enum UNRES_ITEM type, void *str_node)
     case UNRES_USES:
         LOGVRB("Resolving %s \"%s\" failed, it will be attempted later.", "uses", ((struct lys_node_uses *)item)->name);
         break;
+    case UNRES_TYPEDEF_DFLT:
     case UNRES_TYPE_DFLT:
         if (str_node) {
             LOGVRB("Resolving %s \"%s\" failed, it will be attempted later.", "type default", (char *)str_node);

src/resolve.h

@@ -34,7 +34,8 @@ enum UNRES_ITEM {
     UNRES_IDENT,         /* unresolved derived identities */
     UNRES_TYPE_IDENTREF, /* check identityref value */
     UNRES_FEATURE,       /* feature for circular check, it must be postponed when all if-features are resolved */
-    UNRES_TYPE_DFLT,     /* validate default type value */
+    UNRES_TYPEDEF_DFLT,  /* validate default type value (from typedef) */
+    UNRES_TYPE_DFLT,     /* validate default type value (from lys_node) */
     UNRES_LIST_KEYS,     /* list keys */
     UNRES_LIST_UNIQ,     /* list uniques */
     UNRES_XPATH,         /* unchecked XPath expression */