reformat: restructured the code to match the current format

- arranged all the high level parser code in parser_cbor.c
- added all the common high level ctx variables to parser_internal.h
- added lcbor.c and lcbor.h as a wrapper over libcbor but to keep the coding style consistent

Author: MeherRushi

CMakeLists.txt

@@ -327,10 +327,10 @@ if(ENABLE_CBOR_SUPPORT)
             add_definitions(-DENABLE_CBOR_SUPPORT)
             include_directories(${LIBCBOR_INCLUDE_DIRS})
             # Add CBOR parser files to the library sources
-            list(APPEND libsrc src/parser_cbor.c)
-            list(APPEND headers src/parser_cbor.h)
+            list(APPEND libsrc src/parser_cbor.c src/lcbor.c)
+            list(APPEND headers src/lcbor.h)
             # Add CBOR files to format sources
-            list(APPEND format_sources src/parser_cbor.c src/parser_cbor.h)
+            list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c)
         else()
             message(FATAL_ERROR "libcbor not found! Please install libcbor development package or disable CBOR support with -DENABLE_CBOR_SUPPORT=OFF")
         endif()
@@ -344,10 +344,10 @@ if(ENABLE_CBOR_SUPPORT)
             include_directories(${LIBCBOR_INCLUDE_DIR})
             set(LIBCBOR_LIBRARIES ${LIBCBOR_LIBRARY})
             # Add CBOR parser files to the library sources
-            list(APPEND libsrc src/parser_cbor.c)
-            list(APPEND headers src/parser_cbor.h)
+            list(APPEND libsrc src/parser_cbor.c src/lcbor.c)
+            list(APPEND headers src/lcbor.h)
             # Add CBOR files to format sources
-            list(APPEND format_sources src/parser_cbor.c src/parser_cbor.h)
+            list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c)
         else()
             message(FATAL_ERROR "libcbor not found! Please install libcbor development package or disable CBOR support with -DENABLE_CBOR_SUPPORT=OFF")
         endif()

src/lcbor.c

@@ -0,0 +1,89 @@
+/**
+ * @file lcbor.h
+ * @author MeherRushi <[email protected]>
+ * @brief CBOR data parser for libyang (abstraction over libcbor)
+ *
+ * Copyright (c) 2020 - 2023 CESNET, z.s.p.o.
+ *
+ * This source code is licensed under BSD 3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://opensource.org/licenses/BSD-3-Clause
+ */
+
+#ifdef ENABLE_CBOR_SUPPORT
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include "in_internal.h"
+#include "lcbor.h"
+#include "log.h"
+#include "ly_common.h"
+
+/**
+ * @brief Free CBOR context.
+ *
+ * @param[in] cbor_ctx CBOR context to free.
+ */
+void lycbor_ctx_free(struct lycbor_ctx *cbor_ctx)
+{
+    if (cbor_ctx)
+    {
+        free(cbor_ctx);
+    }
+}
+
+/**
+ * @brief Detect CBOR format variant from input data.
+ *
+ * @param[in] in Input structure to analyze.
+ * @param[out] format Detected format.
+ * @return LY_ERR value.
+ */
+static LY_ERR
+lydcbor_detect_format(struct ly_in *in, enum lyd_cbor_format *format)
+{
+    /* Simple heuristic: try to parse as CBOR and examine structure */
+    /* For now, default to named format */
+    (void)in;
+    *format = LYD_CBOR_NAMED;
+    return LY_SUCCESS;
+}
+
+/**
+ * @brief Create new CBOR context for parsing.
+ *
+ * @param[in] ctx libyang context.
+ * @param[in] in Input handler.
+ * @param[out] cbor_ctx_p Pointer to store the created CBOR context.
+ * @return LY_ERR value.
+ */
+LY_ERR
+lycbor_ctx_new(const struct ly_ctx *ctx, struct ly_in *in, struct lycbor_ctx **cbor_ctx_p)
+{
+    /* TODO : Need to restructure error handling here */
+    LY_ERR ret = LY_SUCCESS;
+    struct lycbor_ctx *cbor_ctx;
+    enum lyd_cbor_format format;
+
+    assert(ctx && in && cbor_ctx_p);
+
+    /* TODO : error handling after the detect_format function call */
+    ret = lydcbor_detect_format(in, &format);
+
+    /* Allocate and initialize CBOR context */
+    cbor_ctx = calloc(1, sizeof *cbor_ctx);
+    LY_CHECK_ERR_RET(!cbor_ctx, LOGMEM(ctx), LY_EMEM);
+
+    cbor_ctx->ctx = ctx;
+    cbor_ctx->in = in;
+    cbor_ctx->format = format;
+
+    *cbor_ctx_p = cbor_ctx;
+    return ret;
+}
+
+#endif /* ENABLE_CBOR_SUPPORT */

src/lcbor.h

@@ -0,0 +1,71 @@
+/**
+ * @file lcbor.h
+ * @author MeherRushi <[email protected]>
+ * @brief CBOR data parser routines for libyang (abstraction over libcbor)
+ *
+ * Copyright (c) 2020 - 2023 CESNET, z.s.p.o.
+ *
+ * This source code is licensed under BSD 3-Clause License (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://opensource.org/licenses/BSD-3-Clause
+ */
+
+#ifndef LY_LCBOR_H_
+#define LY_LCBOR_H_
+
+#ifdef ENABLE_CBOR_SUPPORT
+
+#include <stddef.h>
+#include <stdint.h>
+/* using libcbor as the low-level parser */
+#include <cbor.h>
+
+
+#include "log.h"
+#include "set.h"
+
+struct ly_ctx;
+struct ly_in;
+
+/**
+ * @brief CBOR format variants for different encoding schemes
+ */
+enum lyd_cbor_format
+{
+    LYD_CBOR_NAMED, /**< CBOR with named identifiers (JSON-like) */
+    LYD_CBOR_SID    /**< CBOR with Schema Item identifiers (future implementation) */
+};
+
+struct lycbor_ctx {
+    const struct ly_ctx *ctx; /**< libyang context */
+    struct ly_in *in;   /**< input structure */
+    cbor_item_t *cbor_data; /**< parsed CBOR data */
+    enum lyd_cbor_format format; /**< CBOR format variant */
+    uint32_t parse_opts; /**< parser options */
+    uint32_t val_opts;   /**< validation options */
+};
+
+/**
+ * @brief Create new CBOR context for parsing.
+ *
+ * @param[in] ctx libyang context.
+ * @param[in] in Input handler.
+ * @param[out] cbor_ctx_p Pointer to store the created CBOR context.
+ * @return LY_ERR value.
+ */
+LY_ERR
+lycbor_ctx_new(const struct ly_ctx *ctx, struct ly_in *in, struct lycbor_ctx **cbor_ctx_p);
+
+/**
+ * @brief Free CBOR context.
+ *
+ * @param[in] cbor_ctx CBOR context to free.
+ */
+void
+lycbor_ctx_free(struct lycbor_ctx *cbor_ctx);
+
+#endif /* ENABLE_CBOR_SUPPORT */
+
+#endif /* LY_LCBOR_H_ */