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

Corrected "No yang spec" printed on tty on leafref CLI usage

Browse source
This commit is contained in:
Olof hagsand 2018-01-06 13:40:14 +01:00
parent 071667102c
commit 83cb696d0e
5 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/src/clixon_proto_client.c
View file

@ -71,10 +71,11 @@
/*! Send internal netconf rpc from client to backend
* @param[in] h CLICON handle
* @param[in] msg Encoded message. Deallocate woth free
* @param[out] xret Return value from backend as netconf xml tree. Free w xml_free
* @param[out] xret Return value from backend as xml tree. Free w xml_free
* @param[inout] sock0 If pointer exists, do not close socket to backend on success
* and return it here. For keeping a notify socket open
* Note: sock0 is if connection should be persistent, like a notification/subscribe api
* @note sock0 is if connection should be persistent, like a notification/subscribe api
* @note xret is populated with yangspec according to standard handle yangspec
*/
int
clicon_rpc_msg(clicon_handle h,
@ -87,6 +88,7 @@ clicon_rpc_msg(clicon_handle h,
int port;
char *retdata = NULL;
cxobj *xret = NULL;
yang_spec *yspec;
if ((sock = clicon_sock(h)) == NULL){
clicon_err(OE_FATAL, 0, "CLICON_SOCK option not set");
@ -119,9 +121,12 @@ clicon_rpc_msg(clicon_handle h,
break;
}
clicon_debug(1, "%s retdata:%s", __FUNCTION__, retdata);
if (retdata &&
xml_parse_string(retdata, NULL, &xret) < 0)
goto done;
if (retdata){
yspec = clicon_dbspec_yang(h);
if (xml_parse_string(retdata, yspec, &xret) < 0)
goto done;
}
if (xret0){
*xret0 = xret;
xret = NULL;