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

* Second fix of https://github.com/clicon/clixon/issues/158

Browse source 
* Actually there is an error of duplicate rpc-replies, but it should be detected in the backend not here
This commit is contained in:
Olof Hagsand 2020-12-06 11:22:26 +00:00
parent 3c014184f7
commit 344dcacf6f
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/restconf/restconf_err.c
View file

@ -418,6 +418,10 @@ api_return_err(clicon_handle h,
goto done;
}
}
#if 1
if (clicon_debug_get())
clicon_log_xml(LOG_DEBUG, xerr, "%s Send error:", __FUNCTION__);
#endif
if (xml_name_set(xerr, "error") < 0)
goto done;
tagstr = xml_body(xtag);
@ -431,7 +435,7 @@ api_return_err(clicon_handle h,
goto done;
switch (media){
case YANG_DATA_XML:
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
clicon_debug(1, "%s code:%d", __FUNCTION__, code);
if (pretty){
cprintf(cb, " <errors xmlns=\"urn:ietf:params:xml:ns:yang:ietf-restconf\">\n");
if (clicon_xml2cbuf(cb, xerr, 2, pretty, -1) < 0)
@ -446,7 +450,7 @@ api_return_err(clicon_handle h,
}
break;
case YANG_DATA_JSON:
clicon_debug(1, "%s code:%d err:%s", __FUNCTION__, code, cbuf_get(cb));
clicon_debug(1, "%s code:%d", __FUNCTION__, code);
if (pretty){
cprintf(cb, "{\n\"ietf-restconf:errors\" : ");
if (xml2json_cbuf(cb, xerr, pretty) < 0)