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

More than one restconf input arg

Browse source
This commit is contained in:
Olof Hagsand 2017-10-29 17:03:09 +01:00
parent 7b719cc6db
commit 145f6acd2e
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/restconf/restconf_methods.c
View file

@ -741,9 +741,11 @@ api_operation_post(clicon_handle h,
if ((xinput = xpath_first(xdata, "/input")) != NULL){ if ((xinput = xpath_first(xdata, "/input")) != NULL){
/* Add all input under <rpc>path */ /* Add all input under <rpc>path */
x = NULL; x = NULL;
while ((x = xml_child_each(xinput, x, -1)) != NULL) while (xml_child_nr(xinput)){
x = xml_child_i(xinput, 0);
if (xml_addsub(xbot, x) < 0) if (xml_addsub(xbot, x) < 0)
goto done; goto done;
}
if ((yinput = yang_find((yang_node*)yrpc, Y_INPUT, NULL)) != NULL){ if ((yinput = yang_find((yang_node*)yrpc, Y_INPUT, NULL)) != NULL){
xml_spec_set(xinput, yinput); /* needed for xml_spec_populate */ xml_spec_set(xinput, yinput); /* needed for xml_spec_populate */
if (xml_apply(xinput, CX_ELMNT, xml_spec_populate, yinput) < 0) if (xml_apply(xinput, CX_ELMNT, xml_spec_populate, yinput) < 0)
@ -765,7 +767,7 @@ api_operation_post(clicon_handle h,
if ((cookie = FCGX_GetParam("HTTP_COOKIE", r->envp)) != NULL && if ((cookie = FCGX_GetParam("HTTP_COOKIE", r->envp)) != NULL &&
get_user_cookie(cookie, "c-user", &cookieval) ==0){ get_user_cookie(cookie, "c-user", &cookieval) ==0){
if ((xa = xml_new("cookie", xtop)) == NULL) if ((xa = xml_new("id", xtop)) == NULL)
goto done; goto done;
xml_type_set(xa, CX_ATTR); xml_type_set(xa, CX_ATTR);
if (xml_value_set(xa, cookieval) < 0) if (xml_value_set(xa, cookieval) < 0)

2
lib/src/clixon_xsl.c
View file

@ -1032,7 +1032,7 @@ xpath_each(cxobj *xcur,
* xn = xvec[i]; * xn = xvec[i];
* ... * ...
* } * }
* free(vec); * free(xvec);
* @endcode * @endcode
* @note Although the returned vector must be freed after use, * @note Although the returned vector must be freed after use,
* the returned xml trees should not. * the returned xml trees should not.