printer sid BUGFIX: include nodes augmented into other modules

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
             options: "-DENABLE_TESTS=ON",
             packager: "sudo apt-get",
             # no expect because stdout seems to be redirected
-            packages: "libcmocka-dev libxxhash-dev",
+            packages: "libcmocka-dev libxxhash-dev libcbor-dev",
             snaps: "",
             build-cmd: "make"
           }
@@ -36,7 +36,7 @@ jobs:
             cc: "clang",
             options: "-DENABLE_TESTS=ON",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev libxxhash-dev",
+            packages: "libcmocka-dev libxxhash-dev libcbor-dev",
             snaps: "",
             build-cmd: "make"
           }
@@ -47,7 +47,7 @@ jobs:
             cc: "gcc",
             options: "",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev libxxhash-dev valgrind",
+            packages: "libcmocka-dev libxxhash-dev libcbor-dev valgrind",
             snaps: "",
             build-cmd: "make"
           }
@@ -59,7 +59,7 @@ jobs:
             options: "",
             packager: "sudo apt-get",
             # no valgrind because it does not support DWARF5 yet generated by clang 14
-            packages: "libcmocka-dev libxxhash-dev",
+            packages: "libcmocka-dev libxxhash-dev libcbor-dev",
             snaps: "",
             build-cmd: "make"
           }
@@ -70,7 +70,7 @@ jobs:
             cc: "clang",
             options: "-DENABLE_TESTS=ON -DPATH_EXPECT=",
             packager: "brew",
-            packages: "cmocka xxhash tcl-tk",
+            packages: "cmocka xxhash tcl-tk libcbor",
             snaps: "",
             build-cmd: "make"
           }
@@ -81,7 +81,7 @@ jobs:
             cc: "clang",
             options: "-DCMAKE_C_FLAGS=-fsanitize=address,undefined -DENABLE_TESTS=ON -DENABLE_VALGRIND_TESTS=OFF",
             packager: "sudo apt-get",
-            packages: "libcmocka-dev libxxhash-dev",
+            packages: "libcmocka-dev libxxhash-dev libcbor-dev",
             snaps: "",
             build-cmd: "make"
           }
@@ -282,7 +282,7 @@ jobs:
           prepare: |
             echo "Installing dependencies..."
             pkg update -f
-            pkg install -y cmake cmocka xxhash bash git pcre2
+            pkg install -y cmake cmocka xxhash bash git pcre2 libcbor
 
           run: |
             set -e
@@ -308,7 +308,7 @@ jobs:
             i386/ubuntu \
             /bin/bash -c " \
               apt-get update -q && \
-              apt-get install -y -q git cmake gcc libcmocka-dev libxxhash-dev libpcre2-dev && \
+              apt-get install -y -q git cmake gcc libcmocka-dev libxxhash-dev libpcre2-dev libcbor-dev && \
               mkdir build && cd build && \
               cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=ON .. && \
               make && \
@@ -338,7 +338,7 @@ jobs:
           # install dependencies inside the emulated container
           install: |
             apt-get update -q -y
-            apt-get install -q -y git cmake gcc libcmocka-dev libxxhash-dev libpcre2-dev
+            apt-get install -q -y git cmake gcc libcmocka-dev libxxhash-dev libpcre2-dev libcbor-dev
 
           # run the build
           run: |

CMakeLists.txt

@@ -59,15 +59,15 @@ set(CMAKE_MACOSX_RPATH TRUE)
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # set version of the project
-set(LIBYANG_MAJOR_VERSION 5)
-set(LIBYANG_MINOR_VERSION 8)
-set(LIBYANG_MICRO_VERSION 6)
+set(LIBYANG_MAJOR_VERSION 6)
+set(LIBYANG_MINOR_VERSION 2)
+set(LIBYANG_MICRO_VERSION 0)
 set(LIBYANG_VERSION ${LIBYANG_MAJOR_VERSION}.${LIBYANG_MINOR_VERSION}.${LIBYANG_MICRO_VERSION})
 
 # set version of the library
 set(LIBYANG_MAJOR_SOVERSION 5)
-set(LIBYANG_MINOR_SOVERSION 5)
-set(LIBYANG_MICRO_SOVERSION 5)
+set(LIBYANG_MINOR_SOVERSION 7)
+set(LIBYANG_MICRO_SOVERSION 0)
 set(LIBYANG_SOVERSION_FULL ${LIBYANG_MAJOR_SOVERSION}.${LIBYANG_MINOR_SOVERSION}.${LIBYANG_MICRO_SOVERSION})
 set(LIBYANG_SOVERSION ${LIBYANG_MAJOR_SOVERSION})
 
@@ -149,6 +149,7 @@ set(libsrc
     src/parser_yang.c
     src/parser_yin.c
     src/printer_schema.c
+    src/printer_sid.c
     src/printer_yang.c
     src/printer_yin.c
     src/printer_tree.c
@@ -238,6 +239,7 @@ set(format_sources
     src/*.h
     src/plugins_exts/*
     src/plugins_types/*)
+
 #
 # options
 #
@@ -323,11 +325,30 @@ if(ENABLE_COVERAGE)
     gen_coverage_enable(${ENABLE_TESTS})
 endif()
 
+find_package(CBOR)
+if(CBOR_FOUND)
+    list(APPEND libsrc src/parser_cbor.c src/lcbor.c src/printer_cbor.c)
+    list(APPEND headers src/lcbor.h)
+    list(APPEND format_sources src/parser_cbor.c src/lcbor.h src/lcbor.c src/printer_cbor.c)
+else()
+    message(STATUS "libcbor not found, CBOR support disabled")
+endif()
+
 if ("${BUILD_TYPE_UPPER}" STREQUAL "DEBUG")
     # enable before adding tests to let them detect that format checking is available - one of the tests is format checking
     source_format_enable(0.77)
 endif()
 
+if(ENABLE_FUZZ_TARGETS)
+    set(FUZZER "AFL" CACHE STRING "fuzzer type")
+    if(FUZZER STREQUAL "LibFuzzer")
+        if (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
+            message(FATAL_ERROR "LibFuzzer works only with clang")
+        endif()
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer")
+    endif()
+endif()
+
 # check regex compatibility
 check_include_file("regex.h" LY_HAVE_REGEX_H)
 if(LY_HAVE_REGEX_H)
@@ -427,6 +448,17 @@ find_package(PCRE2 10.21 REQUIRED)
 include_directories(${PCRE2_INCLUDE_DIRS})
 target_link_libraries(yang ${PCRE2_LIBRARIES})
 
+# link libcbor if found
+if(CBOR_FOUND)
+    if(TARGET yangobj)
+        target_compile_definitions(yangobj PRIVATE ENABLE_CBOR_SUPPORT)
+        target_include_directories(yangobj PRIVATE ${CBOR_INCLUDE_DIR})
+    endif()
+    target_compile_definitions(yang PRIVATE ENABLE_CBOR_SUPPORT)
+    target_include_directories(yang PRIVATE ${CBOR_INCLUDE_DIR})
+    target_link_libraries(yang ${CBOR_LIBRARY})
+endif()
+
 # XXHash include and library
 find_package(XXHash)
 if(XXHASH_FOUND)
@@ -477,16 +509,8 @@ endif()
 if(ENABLE_TESTS)
     enable_testing()
     add_subdirectory(tests)
-endif()
-
-if(ENABLE_FUZZ_TARGETS)
-    set(FUZZER "AFL" CACHE STRING "fuzzer type")
-    if(FUZZER STREQUAL "LibFuzzer")
-        if (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
-            message(FATAL_ERROR "LibFuzzer works only with clang")
-        endif()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer")
-    endif()
+elseif(ENABLE_FUZZ_TARGETS AND NOT WIN32)
+    add_subdirectory(tests/fuzz)
 endif()
 
 # create coverage target for generating coverage reports

CMakeModules/FindCBOR.cmake

@@ -0,0 +1,37 @@
+# Try to find libcbor
+# Once done this will define
+#
+# Read-Only variables:
+#  CBOR_FOUND - system has libcbor
+#  CBOR_INCLUDE_DIR - the libcbor include directory
+#  CBOR_LIBRARY - Link these to use libcbor
+
+find_path(CBOR_INCLUDE_DIR
+    NAMES
+        cbor.h
+    PATHS
+        /usr/include
+        /usr/local/include
+        /opt/local/include
+        /sw/include
+        ${CMAKE_INCLUDE_PATH}
+        ${CMAKE_INSTALL_PREFIX}/include
+)
+
+find_library(CBOR_LIBRARY
+    NAMES
+        cbor
+        libcbor
+    PATHS
+        /usr/lib
+        /usr/lib64
+        /usr/local/lib
+        /usr/local/lib64
+        /opt/local/lib
+        /sw/lib
+        ${CMAKE_LIBRARY_PATH}
+        ${CMAKE_INSTALL_PREFIX}/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CBOR FOUND_VAR CBOR_FOUND REQUIRED_VARS CBOR_INCLUDE_DIR CBOR_LIBRARY)

README.md

@@ -51,6 +51,10 @@ as well as YANG 1.1 ([RFC 7950](https://tools.ietf.org/html/rfc7950)).
 Binary RPM or DEB packages of the latest release can be built locally using `apkg`, look into `README` in
 the `distro` directory.
 
+### Mac OS
+
+libyang & yanglint can be installed using [homebrew](https://brew.sh/) with ```brew install libyang``` (community maintained)
+
 ## Requirements
 
 ### Unix Build Requirements