Skip to content

Commit

Permalink
lib: libyang.so.3 compatibilty layers
Browse files Browse the repository at this point in the history 
Let's support libyang 2.2.8 using libyang.so.3.0.8
It requires the commit ed277585ea from the libyang.

Signed-off-by: Vincent Jardin <vjardin@free.fr>
  • Loading branch information
@vjardin
vjardin committed Apr 7, 2024
1 parent 30dcd79 commit 05b0b69
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 15 deletions.
23 changes: 17 additions & 6 deletions lib/vty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
#include "libfrr.h"
#include "frrstr.h"
#include "lib_errors.h"
#include <libyang/version.h>
#include "northbound_cli.h"
#include "printfrr.h"
#include "json.h"
Expand Down Expand Up @@ -3670,15 +3671,24 @@ static ssize_t vty_mgmt_libyang_print(void *user_data, const void *buf,
}

static void vty_out_yang_error(struct vty *vty, LYD_FORMAT format,
struct ly_err_item *ei)
const struct ly_err_item *ei)
{
#if (LY_VERSION_MAJOR < 3)
#define data_path path
#else
#define data_path data_path
#endif
bool have_apptag = ei->apptag && ei->apptag[0] != 0;
bool have_path = ei->path && ei->path[0] != 0;
bool have_path = ei->data_path && ei->data_path[0] != 0;
bool have_msg = ei->msg && ei->msg[0] != 0;
const char *severity = NULL;
const char *evalid = NULL;
const char *ecode = NULL;
#if (LY_VERSION_MAJOR < 3)
LY_ERR err = ei->no;
#else
LY_ERR err = ei->err;
#endif

if (ei->level == LY_LLERR)
severity = "error";
Expand All @@ -3703,7 +3713,7 @@ static void vty_out_yang_error(struct vty *vty, LYD_FORMAT format,
vty_out(vty, "<error-validation>%s</error-validation>\n",
evalid);
if (have_path)
vty_out(vty, "<error-path>%s</error-path>\n", ei->path);
vty_out(vty, "<error-path>%s</error-path>\n", ei->data_path);
if (have_apptag)
vty_out(vty, "<error-app-tag>%s</error-app-tag>\n",
ei->apptag);
Expand All @@ -3722,7 +3732,7 @@ static void vty_out_yang_error(struct vty *vty, LYD_FORMAT format,
if (evalid)
vty_out(vty, ", \"error-validation\": \"%s\"", evalid);
if (have_path)
vty_out(vty, ", \"error-path\": \"%s\"", ei->path);
vty_out(vty, ", \"error-path\": \"%s\"", ei->data_path);
if (have_apptag)
vty_out(vty, ", \"error-app-tag\": \"%s\"", ei->apptag);
if (have_msg)
Expand All @@ -3739,18 +3749,19 @@ static void vty_out_yang_error(struct vty *vty, LYD_FORMAT format,
if (evalid)
vty_out(vty, " invalid: %s", evalid);
if (have_path)
vty_out(vty, " path: %s", ei->path);
vty_out(vty, " path: %s", ei->data_path);
if (have_apptag)
vty_out(vty, " app-tag: %s", ei->apptag);
if (have_msg)
vty_out(vty, " msg: %s", ei->msg);
break;
}
#undef data_path
}

static uint vty_out_yang_errors(struct vty *vty, LYD_FORMAT format)
{
struct ly_err_item *ei = ly_err_first(ly_native_ctx);
const struct ly_err_item *ei = ly_err_first(ly_native_ctx);
uint count;

if (!ei)
Expand Down
52 changes: 43 additions & 9 deletions lib/yang.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@
#include "lib_errors.h"
#include "yang.h"
#include "yang_translator.h"
#include <libyang/version.h>
#include "northbound.h"

#include "lib/config_paths.h"

DEFINE_MTYPE_STATIC(LIB, YANG_MODULE, "YANG module");
DEFINE_MTYPE_STATIC(LIB, YANG_DATA, "YANG data structure");

/* Safe to remove after libyang 2.2.8 */
#if (LY_VERSION_MAJOR < 3)
#define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, set) \
lyd_find_xpath3(ctx_node, tree, xpath, vars, set)
#else
#define yang_lyd_find_xpath3(ctx_node, tree, xpath, format, prefix_data, vars, set) \
lyd_find_xpath3(ctx_node, tree, xpath, LY_VALUE_JSON, NULL, vars, set)
#endif

/* libyang container. */
struct ly_ctx *ly_native_ctx;

Expand Down Expand Up @@ -701,7 +711,12 @@ struct yang_data *yang_data_list_find(const struct list *list,
}

/* Make libyang log its errors using FRR logging infrastructure. */
static void ly_log_cb(LY_LOG_LEVEL level, const char *msg, const char *path)
static void ly_zlog_cb(LY_LOG_LEVEL level, const char *msg, const char *data_path
#if !(LY_VERSION_MAJOR < 3)
,
const char *schema_path, uint64_t line
#endif
)
{
int priority = LOG_ERR;

Expand All @@ -718,8 +733,14 @@ static void ly_log_cb(LY_LOG_LEVEL level, const char *msg, const char *path)
break;
}

if (path)
zlog(priority, "libyang: %s (%s)", msg, path);
if (data_path)
zlog(priority, "libyang: %s (%s)", msg, data_path);
#if !(LY_VERSION_MAJOR < 3)
else if (schema_path)
zlog(priority, "libyang %s (%s)\n", msg, schema_path);
else if (line)
zlog(priority, "libyang %s (line %" PRIu64 ")\n", msg, line);
#endif
else
zlog(priority, "libyang: %s", msg);
}
Expand All @@ -746,7 +767,8 @@ LY_ERR yang_parse_notification(const char *xpath, LYD_FORMAT format,
return err;
}

err = lyd_find_xpath3(NULL, tree, xpath, NULL, &set);
err = yang_lyd_find_xpath3(NULL, tree, xpath, LY_VALUE_JSON, NULL, NULL,
&set);
if (err) {
zlog_err("Failed to parse notification: %s", ly_last_errmsg());
lyd_free_all(tree);
Expand Down Expand Up @@ -839,23 +861,29 @@ char *yang_convert_lyd_format(const char *data, size_t data_len,

const char *yang_print_errors(struct ly_ctx *ly_ctx, char *buf, size_t buf_len)
{
struct ly_err_item *ei;
const struct ly_err_item *ei;

ei = ly_err_first(ly_ctx);
if (!ei)
return "";

strlcpy(buf, "YANG error(s):\n", buf_len);
#if (LY_VERSION_MAJOR < 3)
#define data_path path
#else
#define data_path data_path
#endif
for (; ei; ei = ei->next) {
if (ei->path) {
if (ei->data_path) {
strlcat(buf, " Path: ", buf_len);
strlcat(buf, ei->path, buf_len);
strlcat(buf, ei->data_path, buf_len);
strlcat(buf, "\n", buf_len);
}
strlcat(buf, " Error: ", buf_len);
strlcat(buf, ei->msg, buf_len);
strlcat(buf, "\n", buf_len);
}
#undef data_path

ly_err_clean(ly_ctx, NULL);

Expand Down Expand Up @@ -907,7 +935,12 @@ struct ly_ctx *yang_ctx_new_setup(bool embedded_modules, bool explicit_compile)
void yang_init(bool embedded_modules, bool defer_compile)
{
/* Initialize libyang global parameters that affect all containers. */
ly_set_log_clb(ly_log_cb, 1);
ly_set_log_clb(ly_zlog_cb
#if (LY_VERSION_MAJOR < 3)
,
1
#endif
);
ly_log_options(LY_LOLOG | LY_LOSTORE);

/* Initialize libyang container for native models. */
Expand Down Expand Up @@ -1219,7 +1252,8 @@ LY_ERR yang_lyd_trim_xpath(struct lyd_node **root, const char *xpath)

*root = lyd_first_sibling(*root);

err = lyd_find_xpath3(NULL, *root, xpath, NULL, &set);
err = yang_lyd_find_xpath3(NULL, *root, xpath, LY_VALUE_JSON, NULL, NULL,
&set);
if (err) {
flog_err_sys(EC_LIB_LIBYANG,
"cannot obtain specific result for xpath \"%s\": %s",
Expand Down

0 comments on commit 05b0b69

Please sign in to comment.