experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* New XML parsing API:

Browse source 
* `clixon_xml_parse_string()`
   * `clixon_xml_parse_file()`
* New JSON parsing API, with same signature as XML parsing:
   * `clixon_json_parse_string()`
   * `clixon_xml_parse_file()`
* XML YANG binding API have been rearranged as follows:
   * `xml_bind_yang_rpc()`
   * `xml_bind_yang_rpc_reply()`
   * `xml_bind_yang()`
   * `xml_bind_yang0()`
This commit is contained in:
Olof hagsand 2020-03-19 21:32:27 +01:00
parent c4b0491754
commit 09a2e09848
54 changed files with 590 additions and 711 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/restconf/restconf_methods.c
View file

@ -262,7 +262,7 @@ api_data_write(clicon_handle h,
char *namespace = NULL;
char *dname;
cvec *nsc = NULL;
enum yang_bind yb;
yang_bind yb;
char *xpath = NULL;
clicon_debug(1, "%s api_path:\"%s\"", __FUNCTION__, api_path0);
@ -380,7 +380,7 @@ api_data_write(clicon_handle h,
}
}
if (xml_spec(xdata0)==NULL)
yb = YB_TOP;
yb = YB_MODULE;
else
yb = YB_PARENT;
@ -392,7 +392,7 @@ api_data_write(clicon_handle h,
*/
switch (media_in){
case YANG_DATA_XML:
if ((ret = xml_parse_string2(data, yb, yspec, &xdata0, &xerr)) < 0){
if ((ret = clixon_xml_parse_string(data, yb, yspec, &xdata0, &xerr)) < 0){
if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
goto done;
if ((xe = xpath_first(xerr, NULL, "rpc-error")) == NULL){
@ -414,7 +414,7 @@ api_data_write(clicon_handle h,
}
break;
case YANG_DATA_JSON:
if ((ret = json_parse_str2(data, yb, yspec, &xdata0, &xerr)) < 0){
if ((ret = clixon_json_parse_string(data, yb, yspec, &xdata0, &xerr)) < 0){
if (netconf_malformed_message_xml(&xerr, clicon_err_reason) < 0)
goto done;
if ((xe = xpath_first(xerr, NULL, "rpc-error")) == NULL){