lib UPDATE remove binary internal modules

michalvasko · michalvasko · commit 3bacfb41c0ad · 2026-04-13T11:59:15.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,8 +71,8 @@ set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINO
 set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
 
 # Version of libyang library that this project depends on
-set(LIBYANG_DEP_VERSION 5.1.1)
-set(LIBYANG_DEP_SOVERSION 5.1.1)
+set(LIBYANG_DEP_VERSION 5.6.0)
+set(LIBYANG_DEP_SOVERSION 5.3.4)
 set(LIBYANG_DEP_SOVERSION_MAJOR 5)
 
 # global C flags
diff --git a/modules/ietf_netconf@2013-09-29_yang.h b/modules/ietf_netconf@2013-09-29_yang.h
diff --git a/modules/ietf_netconf_monitoring@2010-10-04_yang.h b/modules/ietf_netconf_monitoring@2010-10-04_yang.h
diff --git a/src/server_config.c b/src/server_config.c
@@ -486,11 +486,16 @@ nc_server_config_load_modules(struct ly_ctx **ctx)
     int i, new_ctx = 0;
 
     if (!*ctx) {
-        if (ly_ctx_new(NC_SERVER_SEARCH_DIR, 0, ctx)) {
-            ERR(NULL, "Couldn't create new libyang context.\n");
+        if (ly_ctx_new(ly_yang_module_dir(), 0, ctx)) {
+            ERR(NULL, "Failed to create new libyang context.");
             goto error;
         }
         new_ctx = 1;
+
+        if (ly_ctx_set_searchdir(*ctx, nc_yang_module_dir())) {
+            ERR(NULL, "Failed to set new searchdir for a context.");
+            goto error;
+        }
     }
 
     /* all features */
@@ -555,7 +560,7 @@ nc_server_config_load_modules(struct ly_ctx **ctx)
 
     for (i = 0; module_names[i]; i++) {
         if (!ly_ctx_load_module(*ctx, module_names[i], NULL, module_features[i])) {
-            ERR(NULL, "Loading module \"%s\" failed.\n", module_names[i]);
+            ERR(NULL, "Loading module \"%s\" failed.", module_names[i]);
             goto error;
         }
     }
diff --git a/src/session.c b/src/session.c
@@ -1948,3 +1948,9 @@ nc_session_tls_crl_from_cert_ext_fetch(void *leaf_cert, void *cert_store, void *
 }
 
 #endif
+
+API const char *
+nc_yang_module_dir(void)
+{
+    return NC_SERVER_SEARCH_DIR;
+}
diff --git a/src/session.h b/src/session.h
@@ -249,6 +249,13 @@ int nc_session_is_callhome(const struct nc_session *session);
  */
 void nc_session_free(struct nc_session *session, void (*data_free)(void *));
 
+/**
+ * @brief Get the directory with internal libnetconf2 YANG modules.
+ *
+ * @return YANG module dir.
+ */
+const char *nc_yang_module_dir(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/session_client.c b/src/session_client.c
@@ -52,9 +52,6 @@
 #include "session_client_ch.h"
 #include "session_p.h"
 
-#include "../modules/ietf_netconf@2013-09-29_yang.h"
-#include "../modules/ietf_netconf_monitoring@2010-10-04_yang.h"
-
 static const char *ncds2str[] = {NULL, "config", "url", "running", "startup", "candidate"};
 
 #ifdef NC_ENABLED_SSH_TLS
@@ -241,7 +238,7 @@ nc_client_session_new_ctx(struct nc_session *session, struct ly_ctx *ctx)
 {
     /* assign context (dicionary needed for handshake) */
     if (!ctx) {
-        if (ly_ctx_new(NULL, LY_CTX_NO_YANGLIBRARY, &ctx)) {
+        if (ly_ctx_new(ly_yang_module_dir(), LY_CTX_NO_YANGLIBRARY, &ctx)) {
             return EXIT_FAILURE;
         }
 
@@ -1179,7 +1176,6 @@ nc_ctx_fill_ietf_netconf(struct nc_session *session, struct module_info *modules
 {
     uint32_t u;
     const char **features = NULL;
-    struct ly_in *in;
     struct lys_module *ietfnc;
 
     /* find supported features (capabilities) in ietf-netconf */
@@ -1202,11 +1198,6 @@ nc_ctx_fill_ietf_netconf(struct nc_session *session, struct module_info *modules
     } else {
         /* load the module */
         nc_ctx_load_module(session, "ietf-netconf", NULL, features, modules, user_clb, user_data, has_get_schema, &ietfnc);
-        if (!ietfnc) {
-            ly_in_new_memory(ietf_netconf_2013_09_29_yang, &in);
-            lys_parse(session->ctx, in, LYS_IN_YANG, features, &ietfnc);
-            ly_in_free(in, 0);
-        }
     }
     if (!ietfnc) {
         ERR(session, "Loading base NETCONF module failed.");
@@ -1265,7 +1256,8 @@ nc_ctx_check_and_fill(struct nc_session *session)
     }
 
     /* get-schema is supported, load local ietf-netconf-monitoring so we can create <get-schema> RPCs */
-    if (get_schema_support && lys_parse_mem(session->ctx, ietf_netconf_monitoring_2010_10_04_yang, LYS_IN_YANG, NULL)) {
+    if (get_schema_support &&
+            nc_ctx_load_module(session, "ietf-netconf-monitoring", NULL, NULL, server_modules, old_clb, old_data, 0, &mod)) {
         WRN(session, "Loading NETCONF monitoring module failed, cannot use <get-schema>.");
         get_schema_support = 0;
     }
diff --git a/src/session_server.c b/src/session_server.c
@@ -165,24 +165,30 @@ nc_server_init_ctx(struct ly_ctx **ctx)
 
     if (!*ctx) {
         /* context not given, create a new one */
-        if (ly_ctx_new(NC_SERVER_SEARCH_DIR, 0, ctx)) {
-            ERR(NULL, "Couldn't create new libyang context.\n");
+        if (ly_ctx_new(ly_yang_module_dir(), 0, ctx)) {
+            ERR(NULL, "Failed to create a new libyang context.");
             ret = 1;
             goto cleanup;
         }
         new_ctx = 1;
+
+        if (ly_ctx_set_searchdir(*ctx, nc_yang_module_dir())) {
+            ERR(NULL, "Failed to set searchdir for a context.");
+            ret = 1;
+            goto cleanup;
+        }
     }
 
     if (new_ctx) {
         /* new context created, implement both modules */
         if (!ly_ctx_load_module(*ctx, "ietf-netconf", NULL, ietf_netconf_features)) {
-            ERR(NULL, "Loading module \"ietf-netconf\" failed.\n");
+            ERR(NULL, "Loading module \"ietf-netconf\" failed.");
             ret = 1;
             goto cleanup;
         }
 
         if (!ly_ctx_load_module(*ctx, "ietf-netconf-monitoring", NULL, ietf_netconf_monitoring_features)) {
-            ERR(NULL, "Loading module \"ietf-netconf-monitoring\" failed.\n");
+            ERR(NULL, "Loading module \"ietf-netconf-monitoring\" failed.");
             ret = 1;
             goto cleanup;
         }
@@ -197,7 +203,7 @@ nc_server_init_ctx(struct ly_ctx **ctx)
             if (lys_feature_value(module, ietf_netconf_features[i])) {
                 /* feature not found, enable all of them */
                 if (!ly_ctx_load_module(*ctx, "ietf-netconf", NULL, ietf_netconf_features)) {
-                    ERR(NULL, "Loading module \"ietf-netconf\" failed.\n");
+                    ERR(NULL, "Loading module \"ietf-netconf\" failed.");
                     ret = 1;
                     goto cleanup;
                 }
@@ -208,7 +214,7 @@ nc_server_init_ctx(struct ly_ctx **ctx)
     } else {
         /* ietf-netconf module not found, add it */
         if (!ly_ctx_load_module(*ctx, "ietf-netconf", NULL, ietf_netconf_features)) {
-            ERR(NULL, "Loading module \"ietf-netconf\" failed.\n");
+            ERR(NULL, "Loading module \"ietf-netconf\" failed.");
             ret = 1;
             goto cleanup;
         }
@@ -218,7 +224,7 @@ nc_server_init_ctx(struct ly_ctx **ctx)
     if (!module) {
         /* ietf-netconf-monitoring module not found, add it */
         if (!ly_ctx_load_module(*ctx, "ietf-netconf-monitoring", NULL, ietf_netconf_monitoring_features)) {
-            ERR(NULL, "Loading module \"ietf-netconf-monitoring\" failed.\n");
+            ERR(NULL, "Loading module \"ietf-netconf-monitoring\" failed.");
             ret = 1;
             goto cleanup;
         }
diff --git a/tests/ln2_test.c b/tests/ln2_test.c
@@ -153,11 +153,12 @@ ln2_glob_test_setup(struct ln2_test_ctx **test_ctx)
     }
 
     /* create libyang context */
-    ret = ly_ctx_new(MODULES_DIR, 0, &(*test_ctx)->ctx);
+    ret = ly_ctx_new(ly_yang_module_dir(), 0, &(*test_ctx)->ctx);
     if (ret) {
         SETUP_FAIL_LOG;
         goto cleanup;
     }
+    ly_ctx_set_searchdir((*test_ctx)->ctx, MODULES_DIR);
 
     /* load default yang modules */
     ret = nc_server_init_ctx(&(*test_ctx)->ctx);
diff --git a/tests/test_cert_exp_notif.c b/tests/test_cert_exp_notif.c
@@ -541,8 +541,9 @@ init_test_ctx(struct ly_ctx **ctx)
     struct lys_module *mod;
     const char *ietf_ct_features[] = {"cleartext-passwords", "cleartext-private-keys", "certificate-expiration-notification", NULL};
 
-    ret = ly_ctx_new(MODULES_DIR, 0, ctx);
+    ret = ly_ctx_new(ly_yang_module_dir(), 0, ctx);
     assert_int_equal(ret, 0);
+    ly_ctx_set_searchdir(*ctx, MODULES_DIR);
 
     ret = nc_server_init_ctx(ctx);
     assert_int_equal(ret, 0);
diff --git a/tests/test_fd_comm.c b/tests/test_fd_comm.c
@@ -565,8 +565,9 @@ main(void)
     pthread_barrier_init(&barrier, NULL, 2);
 
     /* create ctx */
-    ly_ctx_new(TESTS_DIR "/data/modules", 0, &ctx);
+    ly_ctx_new(ly_yang_module_dir(), 0, &ctx);
     assert_non_null(ctx);
+    ly_ctx_set_searchdir(ctx, TESTS_DIR "/data/modules");
 
     /* load modules */
     module = ly_ctx_load_module(ctx, "ietf-netconf-acm", NULL, NULL);
diff --git a/tests/test_io.c b/tests/test_io.c
@@ -48,7 +48,8 @@ setup_write(void **state)
 
     w = malloc(sizeof *w);
     w->session = calloc(1, sizeof *w->session);
-    ly_ctx_new(TESTS_DIR "/data/modules", 0, &w->session->ctx);
+    ly_ctx_new(ly_yang_module_dir(), 0, &w->session->ctx);
+    ly_ctx_set_searchdir(w->session->ctx, TESTS_DIR "/data/modules");
 
     /* ietf-netconf */
     fd = open(TESTS_DIR "/data/modules/ietf-netconf.yin", O_RDONLY);
diff --git a/tests/test_runtime_changes.c b/tests/test_runtime_changes.c
@@ -375,8 +375,9 @@ setup_f(void **state)
     test_state->tree = NULL;
     *state = test_state;
 
-    ret = ly_ctx_new(MODULES_DIR, 0, &ctx);
+    ret = ly_ctx_new(ly_yang_module_dir(), 0, &ctx);
     assert_int_equal(ret, 0);
+    ly_ctx_set_searchdir(ctx, MODULES_DIR);
 
     ret = nc_server_init_ctx(&ctx);
     assert_int_equal(ret, 0);
diff --git a/tests/test_thread_messages.c b/tests/test_thread_messages.c
@@ -163,14 +163,16 @@ main(void)
     thread_arg.out = pipes[3];
 
     /* create both contexts */
-    nc_assert(ly_ctx_new(TESTS_DIR "/data/modules", 0, &server_ctx) == LY_SUCCESS);
+    nc_assert(ly_ctx_new(ly_yang_module_dir(), 0, &server_ctx) == LY_SUCCESS);
+    nc_assert(ly_ctx_set_searchdir(server_ctx, TESTS_DIR "/data/modules") == LY_SUCCESS);
     nc_assert(ly_ctx_load_module(server_ctx, "ietf-netconf", NULL, features));
     nc_assert(ly_ctx_load_module(server_ctx, "notif1", NULL, NULL));
     nc_assert(ly_ctx_load_module(server_ctx, "module-a", NULL, NULL));
     thread_arg.ctx = server_ctx;
     nc_set_global_rpc_clb(rpc_clb);
 
-    nc_assert(ly_ctx_new(TESTS_DIR "/data/modules", 0, &client_ctx) == LY_SUCCESS);
+    nc_assert(ly_ctx_new(ly_yang_module_dir(), 0, &client_ctx) == LY_SUCCESS);
+    nc_assert(ly_ctx_set_searchdir(client_ctx, TESTS_DIR "/data/modules") == LY_SUCCESS);
     nc_assert(ly_ctx_load_module(client_ctx, "ietf-netconf", NULL, features));
     nc_assert(ly_ctx_load_module(client_ctx, "notif1", NULL, NULL));
     nc_assert(ly_ctx_load_module(client_ctx, "module-a", NULL, NULL));

Original file line number	Diff line number	Diff line change
`@@ -486,11 +486,16 @@ nc_server_config_load_modules(struct ly_ctx **ctx)`
`486`	`486`	`int i, new_ctx = 0;`
`487`	`487`
`488`	`488`	`if (!*ctx) {`
`489`		`- if (ly_ctx_new(NC_SERVER_SEARCH_DIR, 0, ctx)) {`
`490`		`- ERR(NULL, "Couldn't create new libyang context.\n");`
	`489`	`+ if (ly_ctx_new(ly_yang_module_dir(), 0, ctx)) {`
	`490`	`+ ERR(NULL, "Failed to create new libyang context.");`
`491`	`491`	`goto error;`
`492`	`492`	`}`
`493`	`493`	`new_ctx = 1;`
	`494`	`+`
	`495`	`+ if (ly_ctx_set_searchdir(*ctx, nc_yang_module_dir())) {`
	`496`	`+ ERR(NULL, "Failed to set new searchdir for a context.");`
	`497`	`+ goto error;`
	`498`	`+ }`
`494`	`499`	`}`
`495`	`500`
`496`	`501`	`/* all features */`
`@@ -555,7 +560,7 @@ nc_server_config_load_modules(struct ly_ctx **ctx)`
`555`	`560`
`556`	`561`	`for (i = 0; module_names[i]; i++) {`
`557`	`562`	`if (!ly_ctx_load_module(*ctx, module_names[i], NULL, module_features[i])) {`
`558`		`- ERR(NULL, "Loading module \"%s\" failed.\n", module_names[i]);`
	`563`	`+ ERR(NULL, "Loading module \"%s\" failed.", module_names[i]);`
`559`	`564`	`goto error;`
`560`	`565`	`}`
`561`	`566`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1948,3 +1948,9 @@ nc_session_tls_crl_from_cert_ext_fetch(void leaf_cert, void cert_store, void *`
`1948`	`1948`	`}`
`1949`	`1949`
`1950`	`1950`	`#endif`
	`1951`	`+`
	`1952`	`+API const char *`
	`1953`	`+nc_yang_module_dir(void)`
	`1954`	`+{`
	`1955`	`+ return NC_SERVER_SEARCH_DIR;`
	`1956`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -153,11 +153,12 @@ ln2_glob_test_setup(struct ln2_test_ctx **test_ctx)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/* create libyang context */`
`156`		`- ret = ly_ctx_new(MODULES_DIR, 0, &(*test_ctx)->ctx);`
	`156`	`+ ret = ly_ctx_new(ly_yang_module_dir(), 0, &(*test_ctx)->ctx);`
`157`	`157`	`if (ret) {`
`158`	`158`	`SETUP_FAIL_LOG;`
`159`	`159`	`goto cleanup;`
`160`	`160`	`}`
	`161`	`+ ly_ctx_set_searchdir((*test_ctx)->ctx, MODULES_DIR);`
`161`	`162`
`162`	`163`	`/* load default yang modules */`
`163`	`164`	`ret = nc_server_init_ctx(&(*test_ctx)->ctx);`