Skip to content

Commit cca2b6f

Browse files
committed
cmake UPDATE libyang updates
1 parent 4c353b1 commit cca2b6f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ endif()
4444
set(NP2SRV_VERSION 2.7.7)
4545

4646
# libyang required version
47-
set(LIBYANG_DEP_VERSION 5.1.0)
48-
set(LIBYANG_DEP_SOVERSION 5.1.0)
47+
set(LIBYANG_DEP_VERSION 5.1.1)
48+
set(LIBYANG_DEP_SOVERSION 5.1.1)
4949
set(LIBYANG_DEP_SOVERSION_MAJOR 5)
5050

5151
# libnetconf2 required version

src/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ np_send_notif_rpc(sr_session_ctx_t *sr_session, enum np_rpc_exec_stage stage, co
651651

652652
/* filter */
653653
if (filter_subtree) {
654-
if (lyd_new_any(notif, NULL, "subtree-filter", filter_subtree, NULL, 0, NULL)) {
654+
if (lyd_new_any(notif, NULL, "subtree-filter", filter_subtree, NULL, 0, 0, NULL)) {
655655
rc = -1;
656656
goto cleanup;
657657
}

src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ server_destroy(void)
961961
/* remove all CH clients so they do not reconnect */
962962
ly_ctx = sr_acquire_context(np2srv.sr_conn);
963963
ly_temp_log_options(&temp_lo);
964-
if (!lyd_new_path2(NULL, ly_ctx, "/ietf-netconf-server:netconf-server/call-home", NULL, 0, 0, &data, &node)) {
964+
if (!lyd_new_path2(NULL, ly_ctx, "/ietf-netconf-server:netconf-server/call-home", NULL, 0, 0, 0, &data, &node)) {
965965
lyd_new_meta(ly_ctx, data, NULL, "yang:operation", "none", 0, NULL);
966966
lyd_new_meta(ly_ctx, node, NULL, "yang:operation", "delete", 0, NULL);
967967
nc_server_config_setup_diff(data);

src/netconf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ np2srv_rpc_get_cb(const struct lyd_node *rpc, struct np_user_sess *user_sess)
195195
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
196196
goto cleanup;
197197
}
198-
if (lyd_new_any(output, NULL, "data", data_get, NULL, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
198+
if (lyd_new_any(output, NULL, "data", data_get, NULL, 0, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
199199
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
200200
goto cleanup;
201201
}

src/netconf_monitoring.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ np2srv_rpc_getschema_cb(const struct lyd_node *rpc, struct np_user_sess *UNUSED(
499499
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
500500
goto cleanup;
501501
}
502-
if (lyd_new_any(output, NULL, "data", NULL, model_data, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
502+
if (lyd_new_any(output, NULL, "data", NULL, model_data, 0, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
503503
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
504504
goto cleanup;
505505
}

src/netconf_nmda.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ np2srv_rpc_getdata_cb(const struct lyd_node *rpc, struct np_user_sess *user_sess
203203
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
204204
goto cleanup;
205205
}
206-
if (lyd_new_any(output, NULL, "data", data, NULL, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
206+
if (lyd_new_any(output, NULL, "data", data, NULL, 0, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
207207
reply = np_reply_err_op_failed(NULL, LYD_CTX(rpc), ly_last_logmsg());
208208
goto cleanup;
209209
}

src/netconf_subscribed_notifications.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ sub_ntf_append_params_filter(struct lyd_node *parent, const struct np2srv_sub_nt
767767
} else if (sub->subtree_filter) {
768768
/* stream-subtree-filter */
769769
any = (struct lyd_node_any *)sub->subtree_filter;
770-
if (lyd_new_any(parent, NULL, "stream-subtree-filter", any->child, any->value, 0, &node)) {
770+
if (lyd_new_any(parent, NULL, "stream-subtree-filter", any->child, any->value, any->hints, 0, &node)) {
771771
rc = -1;
772772
goto cleanup;
773773
}
@@ -789,7 +789,7 @@ sub_ntf_append_params_filter(struct lyd_node *parent, const struct np2srv_sub_nt
789789
} else if (sub->subtree_filter) {
790790
/* datastore-subtree-filter */
791791
any = (struct lyd_node_any *)sub->subtree_filter;
792-
if (lyd_new_any(parent, yp_mod, "datastore-subtree-filter", any->child, any->value, 0, &node)) {
792+
if (lyd_new_any(parent, yp_mod, "datastore-subtree-filter", any->child, any->value, any->hints, 0, &node)) {
793793
rc = -1;
794794
goto cleanup;
795795
}

0 commit comments

Comments
 (0)