Skip to content

Commit 837b06f

Browse files
michalvaskomichalvasko
committed
cmake UPDATE libyang updates
1 parent b698509 commit 837b06f

File tree

4 files changed

+22
-33
lines changed

4 files changed

+22
-33
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ set(LIBNETCONF2_SOVERSION_FULL ${LIBNETCONF2_MAJOR_SOVERSION}.${LIBNETCONF2_MINO
7171
set(LIBNETCONF2_SOVERSION ${LIBNETCONF2_MAJOR_SOVERSION})
7272

7373
# Version of libyang library that this project depends on
74-
set(LIBYANG_DEP_VERSION 5.0.0)
75-
set(LIBYANG_DEP_SOVERSION 5.0.0)
74+
set(LIBYANG_DEP_VERSION 5.1.0)
75+
set(LIBYANG_DEP_SOVERSION 5.1.0)
7676
set(LIBYANG_DEP_SOVERSION_MAJOR 5)
7777

7878
# global C flags

‎examples/server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ get_rpc(struct lyd_node *rpc, struct nc_session *session)
126126
}
127127

128128
/* create the get RPC anyxml "data" output node with the requested data */
129-
if (lyd_new_any(duplicate, NULL, "data", root, LYD_ANYDATA_DATATREE, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
129+
if (lyd_new_any(duplicate, NULL, "data", root, NULL, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
130130
err = nc_err(ctx, NC_ERR_OP_FAILED, NC_ERR_TYPE_APP);
131131
goto error;
132132
}

‎src/session_client.c‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -479,17 +479,10 @@ retrieve_module_data_getschema(const char *name, const char *rev, struct clb_dat
479479
goto cleanup;
480480
}
481481
get_schema_data = (struct lyd_node_any *)lyd_child(op);
482-
switch (get_schema_data->value_type) {
483-
case LYD_ANYDATA_STRING:
484-
case LYD_ANYDATA_XML:
482+
if (get_schema_data->value) {
485483
model_data = strdup(get_schema_data->value);
486-
break;
487-
case LYD_ANYDATA_DATATREE:
484+
} else {
488485
lyd_print_mem(&model_data, get_schema_data->child, LYD_XML, LYD_PRINT_SIBLINGS);
489-
break;
490-
case LYD_ANYDATA_JSON:
491-
ERRINT;
492-
break;
493486
}
494487

495488
if (model_data && !model_data[0]) {
@@ -871,7 +864,7 @@ get_oper_data(struct nc_session *session, int has_get_data, const char *filter,
871864
}
872865

873866
data = (struct lyd_node_any *)lyd_child(op);
874-
if (data->value_type != LYD_ANYDATA_DATATREE) {
867+
if (data->value) {
875868
WRN(session, "Unexpected data in reply to a %s RPC.", rpc_name);
876869
goto cleanup;
877870
} else if (!data->child) {
@@ -2746,10 +2739,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
27462739
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, ncds2str[rpc_gc->source], NULL, 0, NULL));
27472740
if (rpc_gc->filter) {
27482741
if (!rpc_gc->filter[0] || (rpc_gc->filter[0] == '<')) {
2749-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", rpc_gc->filter, LYD_ANYDATA_XML, 0, &node));
2742+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_gc->filter, 0, &node));
27502743
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
27512744
} else {
2752-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, LYD_ANYDATA_STRING, 0, &node));
2745+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
27532746
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
27542747
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_gc->filter, 0, NULL));
27552748
}
@@ -2783,7 +2776,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
27832776
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "error-option", rpcedit_erropt2str[rpc_e->error_opt], 0, NULL));
27842777
}
27852778
if (!rpc_e->edit_cont[0] || (rpc_e->edit_cont[0] == '<')) {
2786-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", rpc_e->edit_cont, LYD_ANYDATA_XML, 0, NULL));
2779+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_e->edit_cont, 0, NULL));
27872780
} else {
27882781
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "url", rpc_e->edit_cont, 0, NULL));
27892782
}
@@ -2803,7 +2796,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
28032796
CHECK_LYRC_BREAK(lyd_new_inner(data, mod, "source", 0, &cont));
28042797
if (rpc_cp->url_config_src) {
28052798
if (!rpc_cp->url_config_src[0] || (rpc_cp->url_config_src[0] == '<')) {
2806-
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", rpc_cp->url_config_src, LYD_ANYDATA_XML, 0, NULL));
2799+
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_cp->url_config_src, 0, NULL));
28072800
} else {
28082801
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, "url", rpc_cp->url_config_src, 0, NULL));
28092802
}
@@ -2856,10 +2849,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
28562849
CHECK_LYRC_BREAK(lyd_new_inner(NULL, mod, "get", 0, &data));
28572850
if (rpc_g->filter) {
28582851
if (!rpc_g->filter[0] || (rpc_g->filter[0] == '<')) {
2859-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", rpc_g->filter, LYD_ANYDATA_XML, 0, &node));
2852+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_g->filter, 0, &node));
28602853
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
28612854
} else {
2862-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, LYD_ANYDATA_STRING, 0, &node));
2855+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
28632856
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
28642857
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_g->filter, 0, NULL));
28652858
}
@@ -2924,7 +2917,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29242917
CHECK_LYRC_BREAK(lyd_new_inner(data, mod, "source", 0, &cont));
29252918
if (rpc_val->url_config_src) {
29262919
if (!rpc_val->url_config_src[0] || (rpc_val->url_config_src[0] == '<')) {
2927-
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", rpc_val->url_config_src, LYD_ANYDATA_XML, 0, NULL));
2920+
CHECK_LYRC_BREAK(lyd_new_any(cont, mod, "config", NULL, rpc_val->url_config_src, 0, NULL));
29282921
} else {
29292922
CHECK_LYRC_BREAK(lyd_new_term(cont, mod, "url", rpc_val->url_config_src, 0, NULL));
29302923
}
@@ -2956,10 +2949,10 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29562949

29572950
if (rpc_sub->filter) {
29582951
if (!rpc_sub->filter[0] || (rpc_sub->filter[0] == '<')) {
2959-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", rpc_sub->filter, LYD_ANYDATA_XML, 0, &node));
2952+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, rpc_sub->filter, 0, &node));
29602953
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "subtree", 0, NULL));
29612954
} else {
2962-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, LYD_ANYDATA_STRING, 0, &node));
2955+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "filter", NULL, NULL, 0, &node));
29632956
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:type", "xpath", 0, NULL));
29642957
CHECK_LYRC_BREAK(lyd_new_meta(NULL, node, NULL, "ietf-netconf:select", rpc_sub->filter, 0, NULL));
29652958
}
@@ -2980,7 +2973,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
29802973

29812974
if (rpc_getd->filter) {
29822975
if (!rpc_getd->filter[0] || (rpc_getd->filter[0] == '<')) {
2983-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "subtree-filter", rpc_getd->filter, LYD_ANYDATA_XML, 0, NULL));
2976+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "subtree-filter", NULL, rpc_getd->filter, 0, NULL));
29842977
} else {
29852978
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "xpath-filter", rpc_getd->filter, 0, NULL));
29862979
}
@@ -3017,7 +3010,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30173010
NULL));
30183011
}
30193012
if (!rpc_editd->edit_cont[0] || (rpc_editd->edit_cont[0] == '<')) {
3020-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", rpc_editd->edit_cont, LYD_ANYDATA_XML, 0, NULL));
3013+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "config", NULL, rpc_editd->edit_cont, 0, NULL));
30213014
} else {
30223015
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "url", rpc_editd->edit_cont, 0, NULL));
30233016
}
@@ -3030,8 +3023,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30303023

30313024
if (rpc_estsub->filter) {
30323025
if (!rpc_estsub->filter[0] || (rpc_estsub->filter[0] == '<')) {
3033-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", rpc_estsub->filter, LYD_ANYDATA_XML,
3034-
0, NULL));
3026+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_estsub->filter, 0, NULL));
30353027
} else if (rpc_estsub->filter[0] == '/') {
30363028
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "stream-xpath-filter", rpc_estsub->filter, 0, NULL));
30373029
} else {
@@ -3061,8 +3053,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
30613053

30623054
if (rpc_modsub->filter) {
30633055
if (!rpc_modsub->filter[0] || (rpc_modsub->filter[0] == '<')) {
3064-
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", rpc_modsub->filter, LYD_ANYDATA_XML,
3065-
0, NULL));
3056+
CHECK_LYRC_BREAK(lyd_new_any(data, mod, "stream-subtree-filter", NULL, rpc_modsub->filter, 0, NULL));
30663057
} else if (rpc_modsub->filter[0] == '/') {
30673058
CHECK_LYRC_BREAK(lyd_new_term(data, mod, "stream-xpath-filter", rpc_modsub->filter, 0, NULL));
30683059
} else {
@@ -3100,8 +3091,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
31003091

31013092
if (rpc_estpush->filter) {
31023093
if (!rpc_estpush->filter[0] || (rpc_estpush->filter[0] == '<')) {
3103-
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", rpc_estpush->filter,
3104-
LYD_ANYDATA_XML, 0, NULL));
3094+
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_estpush->filter, 0, NULL));
31053095
} else if (rpc_estpush->filter[0] == '/') {
31063096
CHECK_LYRC_BREAK(lyd_new_term(data, mod2, "datastore-xpath-filter", rpc_estpush->filter, 0, NULL));
31073097
} else {
@@ -3151,8 +3141,7 @@ nc_send_rpc(struct nc_session *session, struct nc_rpc *rpc, int timeout, uint64_
31513141

31523142
if (rpc_modpush->filter) {
31533143
if (!rpc_modpush->filter[0] || (rpc_modpush->filter[0] == '<')) {
3154-
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", rpc_modpush->filter,
3155-
LYD_ANYDATA_XML, 0, NULL));
3144+
CHECK_LYRC_BREAK(lyd_new_any(data, mod2, "datastore-subtree-filter", NULL, rpc_modpush->filter, 0, NULL));
31563145
} else if (rpc_modpush->filter[0] == '/') {
31573146
CHECK_LYRC_BREAK(lyd_new_term(data, mod2, "datastore-xpath-filter", rpc_modpush->filter, 0, NULL));
31583147
} else {

‎src/session_server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ nc_clb_default_get_schema(struct lyd_node *rpc, struct nc_session *session)
904904
nc_err_set_msg(err, ly_last_logmsg(), "en");
905905
goto error;
906906
}
907-
if (lyd_new_any(data, NULL, "data", model_data, LYD_ANYDATA_STRING, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
907+
if (lyd_new_any(data, NULL, "data", NULL, model_data, LYD_NEW_ANY_USE_VALUE | LYD_NEW_VAL_OUTPUT, NULL)) {
908908
err = nc_err(session->ctx, NC_ERR_OP_FAILED, NC_ERR_TYPE_APP);
909909
nc_err_set_msg(err, ly_last_logmsg(), "en");
910910
goto error;

0 commit comments

Comments
 (0)