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

Restconf native stream support

Browse source
This commit is contained in:
Olof hagsand 2024-04-22 14:17:29 +02:00
parent 2d5a646b51
commit 2b2a2ec1ad
14 changed files with 626 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/backend/backend_client.c
View file

@ -1153,9 +1153,14 @@ from_client_create_subscription(clixon_handle h,
/* XXX should use prefix cf edit_config */
if ((nsc = xml_nsctx_init(NULL, EVENT_RFC5277_NAMESPACE)) == NULL)
goto done;
if ((x = xpath_first(xe, nsc, "//stream")) != NULL)
stream = xml_find_value(x, "body");
if ((x = xpath_first(xe, nsc, "//stopTime")) != NULL){
if ((x = xpath_first(xe, nsc, "stream")) != NULL){
if ((stream = xml_find_value(x, "body")) == NULL){
if (netconf_bad_element(cbret, "application", "stream", "Expected stream name") < 0)
goto done;
goto ok;
}
}
if ((x = xpath_first(xe, nsc, "stopTime")) != NULL){
if ((stoptime = xml_find_value(x, "body")) != NULL &&
str2time(stoptime, &stop) < 0){
if (netconf_bad_element(cbret, "application", "stopTime", "Expected timestamp") < 0)
@ -1163,7 +1168,7 @@ from_client_create_subscription(clixon_handle h,
goto ok;
}
}
if ((x = xpath_first(xe, nsc, "//startTime")) != NULL){
if ((x = xpath_first(xe, nsc, "startTime")) != NULL){
if ((starttime = xml_find_value(x, "body")) != NULL &&
str2time(starttime, &start) < 0){
if (netconf_bad_element(cbret, "application", "startTime", "Expected timestamp") < 0)
@ -1171,7 +1176,7 @@ from_client_create_subscription(clixon_handle h,
goto ok;
}
}
if ((xfilter = xpath_first(xe, nsc, "//filter")) != NULL){
if ((xfilter = xpath_first(xe, nsc, "filter")) != NULL){
if ((ftype = xml_find_value(xfilter, "type")) != NULL){
/* Only accept xpath as filter type */
if (strcmp(ftype, "xpath") != 0){

4
apps/backend/backend_get.c
View file

@ -72,7 +72,7 @@
#include "backend_handle.h"
#include "backend_get.h"
/*! restrconf get capabilities
/*! Restconf get capabilities
*
* Maybe should be in the restconf client instead of backend?
* @param[in] h Clixon handle
@ -154,7 +154,7 @@ client_get_streams(clixon_handle h,
/* Second argument is a hack to have the same function for the
* RFC5277 and 8040 stream cases
*/
if (stream_get_xml(h, strcmp(top,"restconf-state")==0, cb) < 0)
if (stream_get_xml(h, strcmp(top, "restconf-state")==0, cb) < 0)
goto done;
cprintf(cb,"</%s>", top);