lyb CHANGE learing lyb data length refactored

Author: michalvasko

src/parser_lyb.c

@@ -247,17 +247,15 @@ lyb_parse_model(const char *data, const struct lys_module **mod, struct lyb_stat
 {
     int r, ret = 0;
     char *mod_name = NULL, mod_rev[11];
-    uint16_t rev = 0;
-    uint8_t tmp_buf[2];
+    uint16_t rev;
 
     /* model name */
     ret += (r = lyb_read_string(data, &mod_name, 1, lybs));
     LYB_HAVE_READ_GOTO(r, data, error);
 
     /* revision */
-    ret += (r = lyb_read(data, tmp_buf, sizeof tmp_buf, lybs));
+    ret += (r = lyb_read(data, (uint8_t *)&rev, 2, lybs));
     LYB_HAVE_READ_GOTO(r, data, error);
-    rev = tmp_buf[0] | (tmp_buf[1] << 8);
 
     if (rev) {
         sprintf(mod_rev, "%04u-%02u-%02u", ((rev & 0xFE00) >> 9) + 2000, (rev & 0x01E0) >> 5, (rev & 0x001F));
@@ -991,6 +989,24 @@ lyb_parse_schema_hash(const struct lys_node *sparent, const struct lys_module *m
     return ret;
 }
 
+static int
+lyb_skip_subtree(const char *data, struct lyb_state *lybs)
+{
+    int r, ret = 0;
+
+    do {
+        ret += (r = lyb_read(data, NULL, lybs->written[lybs->used - 1], lybs));
+        LYB_HAVE_READ_RETURN(r, data, -1);
+
+        /* also skip the meta information inside */
+        r = lybs->inner_chunks[lybs->used - 1] * LYB_META_BYTES;
+        data += r;
+        ret += r;
+    } while (lybs->written[lybs->used - 1]);
+
+    return ret;
+}
+
 static int
 lyb_parse_subtree(const char *data, struct lyd_node *parent, struct lyd_node **first_sibling, const char *yang_data_name,
         int options, struct unres_data *unres, struct lyb_state *lybs)
@@ -1026,13 +1042,8 @@ lyb_parse_subtree(const char *data, struct lyd_node *parent, struct lyd_node **f
 
     if (!mod || !snode) {
         /* unknown data subtree, skip it whole */
-        do {
-            ret += (r = lyb_read(data, NULL, lybs->written[lybs->used - 1], lybs));
-            /* also skip the meta information inside */
-            r = lybs->inner_chunks[lybs->used - 1] * LYB_META_BYTES;
-            data += r;
-            ret += r;
-        } while (lybs->written[lybs->used - 1]);
+        ret += (r = lyb_skip_subtree(data, lybs));
+        LYB_HAVE_READ_GOTO(r, data, error);
         goto stop_subtree;
     }
 
@@ -1293,3 +1304,77 @@ lyd_parse_lyb(struct ly_ctx *ctx, const char *data, int options, const struct ly
     }
     return node;
 }
+
+API int
+lyd_lyb_data_length(const char *data)
+{
+    struct lyb_state lybs;
+    int r = 0, ret = 0, i;
+    size_t len;
+    uint8_t buf[LYB_SIZE_MAX];
+
+    if (!data) {
+        return -1;
+    }
+
+    lybs.written = malloc(LYB_STATE_STEP * sizeof *lybs.written);
+    lybs.position = malloc(LYB_STATE_STEP * sizeof *lybs.position);
+    lybs.inner_chunks = malloc(LYB_STATE_STEP * sizeof *lybs.inner_chunks);
+    LY_CHECK_ERR_GOTO(!lybs.written || !lybs.position || !lybs.inner_chunks, LOGMEM(NULL), finish);
+    lybs.used = 0;
+    lybs.size = LYB_STATE_STEP;
+    lybs.models = NULL;
+    lybs.mod_count = 0;
+    lybs.ctx = NULL;
+
+    /* read magic number */
+    ret += (r = lyb_parse_magic_number(data, &lybs));
+    LYB_HAVE_READ_GOTO(r, data, finish);
+
+    /* read header */
+    ret += (r = lyb_parse_header(data, &lybs));
+    LYB_HAVE_READ_GOTO(r, data, finish);
+
+    /* read model count */
+    ret += (r = lyb_read_number((uint64_t *)&lybs.mod_count, 2, data, &lybs));
+    LYB_HAVE_READ_GOTO(r, data, finish);
+
+    /* read all models */
+    for (i = 0; i < lybs.mod_count; ++i) {
+        /* module name length */
+        len = 0;
+        ret += (r = lyb_read_number(&len, 2, data, &lybs));
+        LYB_HAVE_READ_GOTO(r, data, finish);
+
+        /* model name */
+        ret += (r = lyb_read(data, buf, len, &lybs));
+        LYB_HAVE_READ_GOTO(r, data, finish);
+
+        /* revision */
+        ret += (r = lyb_read(data, buf, 2, &lybs));
+        LYB_HAVE_READ_GOTO(r, data, finish);
+    }
+
+    while (data[0]) {
+        /* register a new subtree */
+        ret += (r = lyb_read_start_subtree(data, &lybs));
+        LYB_HAVE_READ_GOTO(r, data, finish);
+
+        /* skip it */
+        ret += (r = lyb_skip_subtree(data, &lybs));
+        LYB_HAVE_READ_GOTO(r, data, finish);
+
+        /* subtree finished */
+        lyb_read_stop_subtree(&lybs);
+    }
+
+    /* read the last zero, parsing finished */
+    ++ret;
+
+finish:
+    free(lybs.written);
+    free(lybs.position);
+    free(lybs.inner_chunks);
+    free(lybs.models);
+    return ret;
+}

src/printer_lyb.c

@@ -739,6 +739,8 @@ lyb_print_anydata(struct lyd_node_anydata *anydata, struct lyout *out, struct ly
         len = lyd_lyb_data_length(anydata->value.mem);
         if (len > -1) {
             ret += lyb_write_string(anydata->value.str, (size_t)len, 0, out, lybs);
+        } else {
+            ret = len;
         }
     } else {
         ret += lyb_write_string(anydata->value.str, 0, 0, out, lybs);

src/tree_data.c

@@ -7767,65 +7767,6 @@ lyd_leaf_type(const struct lyd_node_leaf_list *leaf)
     return type;
 }
 
-API int
-lyd_lyb_data_length(const char *data)
-{
-    const char *ptr;
-    uint16_t i, mod_count, str_len;
-    uint8_t tmp_buf[2];
-    LYB_META meta;
-
-    if (!data) {
-        return -1;
-    }
-
-    ptr = data;
-
-    /* magic number */
-    if ((ptr[0] != 'l') || (ptr[1] != 'y') || (ptr[2] != 'b')) {
-        return -1;
-    }
-    ptr += 3;
-
-    /* header */
-    ++ptr;
-
-    /* models */
-    memcpy(tmp_buf, ptr, 2);
-    ptr += 2;
-    mod_count = tmp_buf[0] | (tmp_buf[1] << 8);
-
-    for (i = 0; i < mod_count; ++i) {
-        /* model name */
-        memcpy(tmp_buf, ptr, 2);
-        ptr += 2;
-        str_len = tmp_buf[0] | (tmp_buf[1] << 8);
-
-        ptr += str_len;
-
-        /* revision */
-        ptr += 2;
-    }
-
-    if (ptr[0]) {
-        /* subtrees */
-        do {
-            memcpy(&meta, ptr, LYB_META_BYTES);
-            ptr += LYB_META_BYTES;
-
-            /* read whole subtree (chunk size) */
-            ptr += *((uint8_t *)&meta);
-            /* skip inner chunks (inner chunk count) */
-            ptr += *(((uint8_t *)&meta) + LYB_SIZE_BYTES) * LYB_META_BYTES;
-        } while ((*((uint8_t *)&meta) == LYB_SIZE_MAX) || ptr[0]);
-    }
-
-    /* ending zero */
-    ++ptr;
-
-    return ptr - data;
-}
-
 #ifdef LY_ENABLED_LYD_PRIV
 
 API void *