proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 11:18:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: set YANG search directory when creating libyang context

Browse Source 
Minor code simplification.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2018-11-16 11:13:48 -02:00
parent 98d8359fe7
commit f3e5b71cc1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/yang.c
View File

@ -609,13 +609,13 @@ void yang_init(void)
ly_log_options(LY_LOLOG | LY_LOSTORE); ly_log_options(LY_LOLOG | LY_LOSTORE);
/* Initialize libyang container for native models. */ /* Initialize libyang container for native models. */
ly_native_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD); ly_native_ctx =
ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
if (!ly_native_ctx) { if (!ly_native_ctx) {
flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__); flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
exit(1); exit(1);
} }
ly_ctx_set_module_imp_clb(ly_native_ctx, yang_module_imp_clb, NULL); ly_ctx_set_module_imp_clb(ly_native_ctx, yang_module_imp_clb, NULL);
ly_ctx_set_searchdir(ly_native_ctx, YANG_MODELS_PATH);
ly_ctx_set_priv_dup_clb(ly_native_ctx, ly_dup_cb); ly_ctx_set_priv_dup_clb(ly_native_ctx, ly_dup_cb);
/* Detect if the required libyang plugin(s) were loaded successfully. */ /* Detect if the required libyang plugin(s) were loaded successfully. */

8
lib/yang_translator.c
View File

@ -162,12 +162,12 @@ struct yang_translator *yang_translator_load(const char *path)
RB_INSERT(yang_translators, &yang_translators, translator); RB_INSERT(yang_translators, &yang_translators, translator);
/* Initialize the translator libyang context. */ /* Initialize the translator libyang context. */
translator->ly_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD); translator->ly_ctx =
ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
if (!translator->ly_ctx) { if (!translator->ly_ctx) {
flog_warn(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__); flog_warn(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
goto error; goto error;
} }
ly_ctx_set_searchdir(translator->ly_ctx, YANG_MODELS_PATH);
/* Load modules and deviations. */ /* Load modules and deviations. */
set = lyd_find_path(dnode, "./module"); set = lyd_find_path(dnode, "./module");
@ -515,12 +515,12 @@ static void str_replace(char *o_string, const char *s_string,
void yang_translator_init(void) void yang_translator_init(void)
{ {
ly_translator_ctx = ly_ctx_new(NULL, LY_CTX_DISABLE_SEARCHDIR_CWD); ly_translator_ctx =
ly_ctx_new(YANG_MODELS_PATH, LY_CTX_DISABLE_SEARCHDIR_CWD);
if (!ly_translator_ctx) { if (!ly_translator_ctx) {
flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__); flog_err(EC_LIB_LIBYANG, "%s: ly_ctx_new() failed", __func__);
exit(1); exit(1);
} }
ly_ctx_set_searchdir(ly_translator_ctx, YANG_MODELS_PATH);
if (!ly_ctx_load_module(ly_translator_ctx, "frr-module-translator", if (!ly_ctx_load_module(ly_translator_ctx, "frr-module-translator",
NULL)) { NULL)) {