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

Formatting, whitespace

Browse source
This commit is contained in:
Olof hagsand 2025-03-16 17:28:11 +01:00
parent f26ea043c7
commit 411f509fd8
19 changed files with 288 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/backend/backend_client.c
View file

@ -1587,11 +1587,11 @@ from_client_restart_plugin(clixon_handle h,
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
from_client_process_control(clixon_handle h, from_client_process_control(clixon_handle h,
cxobj *xe, cxobj *xe,
cbuf *cbret, cbuf *cbret,
void *arg, void *arg,
void *regarg) void *regarg)
{ {
int retval = -1; int retval = -1;
cxobj *x; cxobj *x;
@ -1631,7 +1631,7 @@ from_client_process_control(clixon_handle h,
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
from_client_hello(clixon_handle h, from_client_hello(clixon_handle h,
cxobj *x, cxobj *x,
struct client_entry *ce, struct client_entry *ce,
cbuf *cbret) cbuf *cbret)

14
apps/backend/backend_commit.c
View file

@ -408,10 +408,10 @@ startup_common(clixon_handle h,
* @retval -1 Error - or validation failed (but cbret not set) * @retval -1 Error - or validation failed (but cbret not set)
*/ */
int int
startup_validate(clixon_handle h, startup_validate(clixon_handle h,
char *db, char *db,
cxobj **xtr, cxobj **xtr,
cbuf *cbret) cbuf *cbret)
{ {
int retval = -1; int retval = -1;
int ret; int ret;
@ -454,9 +454,9 @@ startup_validate(clixon_handle h,
* Only called from startup_mode_startup * Only called from startup_mode_startup
*/ */
int int
startup_commit(clixon_handle h, startup_commit(clixon_handle h,
char *db, char *db,
cbuf *cbret) cbuf *cbret)
{ {
int retval = -1; int retval = -1;
int ret; int ret;

8
apps/backend/backend_confirm.c
View file

@ -137,7 +137,7 @@ confirmed_commit_state_get(clixon_handle h)
} }
static int static int
confirmed_commit_state_set(clixon_handle h, confirmed_commit_state_set(clixon_handle h,
enum confirmed_commit_state state) enum confirmed_commit_state state)
{ {
struct confirmed_commit *cc = NULL; struct confirmed_commit *cc = NULL;
@ -211,8 +211,8 @@ confirmed_commit_fn_arg_get(clixon_handle h,
static int static int
confirmed_commit_fn_arg_set(clixon_handle h, confirmed_commit_fn_arg_set(clixon_handle h,
int (*fn)(int, void*), int (*fn)(int, void*),
void *arg) void *arg)
{ {
struct confirmed_commit *cc = NULL; struct confirmed_commit *cc = NULL;
@ -325,7 +325,7 @@ cancel_rollback_event(clixon_handle h)
* @see do_rollback() * @see do_rollback()
*/ */
static int static int
rollback_fn(int fd, rollback_fn(int fd,
void *arg) void *arg)
{ {
clixon_handle h = arg; clixon_handle h = arg;

46
apps/backend/backend_get.c
View file

@ -130,13 +130,13 @@ restconf_client_get_capabilities(clixon_handle h,
* @retval -1 Error (fatal) * @retval -1 Error (fatal)
*/ */
static int static int
client_get_streams(clixon_handle h, client_get_streams(clixon_handle h,
yang_stmt *yspec, yang_stmt *yspec,
char *xpath, char *xpath,
cvec *nsc, cvec *nsc,
yang_stmt *ymod, yang_stmt *ymod,
char *top, char *top,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
yang_stmt *yns = NULL; /* yang namespace */ yang_stmt *yns = NULL; /* yang namespace */
@ -396,16 +396,16 @@ filter_xpath_again(clixon_handle h,
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
get_nacm_and_reply(clixon_handle h, get_nacm_and_reply(clixon_handle h,
cxobj *xret, cxobj *xret,
cxobj **xvec, cxobj **xvec,
size_t xlen, size_t xlen,
char *xpath, char *xpath,
cvec *nsc, cvec *nsc,
char *username, char *username,
int32_t depth, int32_t depth,
withdefaults_type wdef, withdefaults_type wdef,
cbuf *cbret) cbuf *cbret)
{ {
int retval = -1; int retval = -1;
cxobj *xnacm = NULL; cxobj *xnacm = NULL;
@ -447,12 +447,12 @@ get_nacm_and_reply(clixon_handle h,
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
element2value(clixon_handle h, element2value(clixon_handle h,
cxobj *xe, cxobj *xe,
char *name, char *name,
char *defaultstr, char *defaultstr,
cbuf *cbret, cbuf *cbret,
uint32_t *value) uint32_t *value)
{ {
char *valstr; char *valstr;
cxobj *x; cxobj *x;

29
apps/backend/backend_plugin.c
View file

@ -75,8 +75,8 @@
*/ */
int int
clixon_plugin_reset_one(clixon_plugin_t *cp, clixon_plugin_reset_one(clixon_plugin_t *cp,
clixon_handle h, clixon_handle h,
char *db) char *db)
{ {
int retval = -1; int retval = -1;
plgreset_t *fn; /* callback */ plgreset_t *fn; /* callback */
@ -137,7 +137,7 @@ clixon_plugin_reset_all(clixon_handle h,
*/ */
static int static int
clixon_plugin_pre_daemon_one(clixon_plugin_t *cp, clixon_plugin_pre_daemon_one(clixon_plugin_t *cp,
clixon_handle h) clixon_handle h)
{ {
int retval = -1; int retval = -1;
plgdaemon_t *fn; /* Daemonize plugin callback function */ plgdaemon_t *fn; /* Daemonize plugin callback function */
@ -199,7 +199,7 @@ clixon_plugin_pre_daemon_all(clixon_handle h)
*/ */
static int static int
clixon_plugin_daemon_one(clixon_plugin_t *cp, clixon_plugin_daemon_one(clixon_plugin_t *cp,
clixon_handle h) clixon_handle h)
{ {
int retval = -1; int retval = -1;
plgdaemon_t *fn; /* Daemonize plugin callback function */ plgdaemon_t *fn; /* Daemonize plugin callback function */
@ -332,11 +332,11 @@ clixon_plugin_statedata_one(clixon_plugin_t *cp,
* @note xret can be replaced in this function * @note xret can be replaced in this function
*/ */
int int
clixon_plugin_statedata_all(clixon_handle h, clixon_plugin_statedata_all(clixon_handle h,
yang_stmt *yspec, yang_stmt *yspec,
cvec *nsc, cvec *nsc,
char *xpath, char *xpath,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
int ret; int ret;
@ -457,8 +457,7 @@ int
clixon_plugin_lockdb_all(clixon_handle h, clixon_plugin_lockdb_all(clixon_handle h,
char *db, char *db,
int lock, int lock,
int id int id)
)
{ {
int retval = -1; int retval = -1;
@ -786,9 +785,9 @@ plugin_transaction_revert_all(clixon_handle h,
* The commit failed is called for only failed plugin before revert all cb. * The commit failed is called for only failed plugin before revert all cb.
*/ */
static int static int
plugin_transaction_commit_failed(clixon_plugin_t *cp, plugin_transaction_commit_failed(clixon_plugin_t *cp,
clixon_handle h, clixon_handle h,
transaction_data_t *td) transaction_data_t *td)
{ {
trans_cb_t *fn; trans_cb_t *fn;
@ -806,7 +805,7 @@ plugin_transaction_commit_failed(clixon_plugin_t *cp,
* @retval -1 Error * @retval -1 Error
*/ */
int int
plugin_transaction_commit_one(clixon_plugin_t *cp, plugin_transaction_commit_one(clixon_plugin_t *cp,
clixon_handle h, clixon_handle h,
transaction_data_t *td) transaction_data_t *td)
{ {

6
apps/backend/backend_startup.c
View file

@ -130,9 +130,9 @@ startup --+-------------------------------------> BROKEN XML
* @note: if commit fails, copy factory to running * @note: if commit fails, copy factory to running
*/ */
int int
startup_mode_startup(clixon_handle h, startup_mode_startup(clixon_handle h,
char *db, char *db,
cbuf *cbret) cbuf *cbret)
{ {
int retval = -1; int retval = -1;
int ret = 0; int ret = 0;

14
apps/backend/clixon_backend_handle.c
View file

@ -85,15 +85,15 @@
* @see struct clixon_handle, struct cli_handle * @see struct clixon_handle, struct cli_handle
*/ */
struct backend_handle { struct backend_handle {
int bh_magic; /* magic (HDR)*/ int bh_magic; /* magic (HDR)*/
clicon_hash_t *bh_copt; /* clicon option list (HDR) */ clicon_hash_t *bh_copt; /* clicon option list (HDR) */
clicon_hash_t *bh_data; /* internal clicon data (HDR) */ clicon_hash_t *bh_data; /* internal clicon data (HDR) */
clicon_hash_t *ch_db_elmnt; /* xml datastore element cache data */ clicon_hash_t *ch_db_elmnt; /* xml datastore element cache data */
event_stream_t *bh_stream; /* notification streams, see clixon_stream.[ch] */ event_stream_t *bh_stream; /* notification streams, see clixon_stream.[ch] */
/* ------ end of common handle ------ */ /* ------ end of common handle ------ */
struct client_entry *bh_ce_list; /* The client list */ struct client_entry *bh_ce_list; /* The client list */
int bh_ce_nr; /* Number of clients, just increment */ int bh_ce_nr; /* Number of clients, just increment */
}; };
/*! Creates and returns a clicon config handle for other CLICON API calls /*! Creates and returns a clicon config handle for other CLICON API calls

8
apps/netconf/netconf_filter.c
View file

@ -192,10 +192,10 @@ xml_filter_recursive(cxobj *xfilter,
/*! Remove parts of configuration xml tree that does not match filter xml tree /*! Remove parts of configuration xml tree that does not match filter xml tree
* *
* @param[in] xfilter Filter xml * @param[in] xfilter Filter xml
* @param[out] xconf Configuration xml * @param[out] xconf Configuration xml
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
* This is the top-level function, calls a recursive variant. * This is the top-level function, calls a recursive variant.
*/ */
int int

10
apps/netconf/netconf_main.c
View file

@ -454,7 +454,7 @@ netconf_input_cb(int s,
frame_size = 0; frame_size = 0;
else else
frame_size = i32; frame_size = i32;
/* Read input data from socket and append to cbbuf */ /* Read input data from socket and append to cbuf */
if ((len = netconf_input_read2(s, buf, buflen, &eof)) < 0) if ((len = netconf_input_read2(s, buf, buflen, &eof)) < 0)
goto done; goto done;
p = buf; p = buf;
@ -578,8 +578,8 @@ send_hello(clixon_handle h,
static int static int
netconf_terminate(clixon_handle h) netconf_terminate(clixon_handle h)
{ {
cvec *nsctx; cvec *nsctx;
cxobj *x; cxobj *x;
if (clixon_exit_get() == 0) if (clixon_exit_get() == 0)
clixon_exit_set(1); clixon_exit_set(1);
@ -602,7 +602,7 @@ netconf_terminate(clixon_handle h)
/*! Setup signal handlers /*! Setup signal handlers
*/ */
static int static int
netconf_signal_init (clixon_handle h) netconf_signal_init(clixon_handle h)
{ {
int retval = -1; int retval = -1;
@ -616,7 +616,7 @@ netconf_signal_init (clixon_handle h)
} }
static int static int
timeout_fn(int s, timeout_fn(int s,
void *arg) void *arg)
{ {
clixon_err(OE_EVENTS, ETIMEDOUT, "User request timeout"); clixon_err(OE_EVENTS, ETIMEDOUT, "User request timeout");

235
apps/netconf/netconf_rpc.c
View file

@ -75,9 +75,9 @@
/* /*
* <rpc [attributes]> * <rpc [attributes]>
<!- - tag elements in a request from a client application - -> <!- - tag elements in a request from a client application - ->
</rpc> </rpc>
*/ */
static int static int
netconf_get_config_subtree(clixon_handle h, netconf_get_config_subtree(clixon_handle h,
@ -100,7 +100,7 @@ netconf_get_config_subtree(clixon_handle h,
NETCONF_BASE_NAMESPACE NETCONF_BASE_NAMESPACE
); );
} }
ok: ok:
retval = 0; retval = 0;
// done: // done:
return retval; return retval;
@ -147,36 +147,36 @@ ok:
* -----------------+-----------+---------------+--------------+ * -----------------+-----------+---------------+--------------+
* Example requests of each: * Example requests of each:
* no filter + no config * no filter + no config
<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]> <rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>
* filter subnet + no config: * filter subnet + no config:
<rpc><get-config><source><candidate/></source><filter/></get-config></rpc>]]>]]> <rpc><get-config><source><candidate/></source><filter/></get-config></rpc>]]>]]>
* filter xpath + select all: * filter xpath + select all:
<rpc><get-config><source><candidate/></source><filter type="xpath" select="/"/></get-config></rpc>]]>]]> <rpc><get-config><source><candidate/></source><filter type="xpath" select="/"/></get-config></rpc>]]>]]>
* filter subtree + config: * filter subtree + config:
<rpc><get-config><source><candidate/></source><filter type="subtree"><configuration><interfaces><interface><ipv4><enabled/></ipv4></interface></interfaces></configuration></filter></get-config></rpc>]]>]]> <rpc><get-config><source><candidate/></source><filter type="subtree"><configuration><interfaces><interface><ipv4><enabled/></ipv4></interface></interfaces></configuration></filter></get-config></rpc>]]>]]>
* filter xpath + select: * filter xpath + select:
<rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface/ipv4"/></get-config></rpc>]]>]]> <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface/ipv4"/></get-config></rpc>]]>]]>
*/ */
static int static int
netconf_get_config(clixon_handle h, netconf_get_config(clixon_handle h,
cxobj *xn, cxobj *xn,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
cxobj *xfilter; /* filter */ cxobj *xfilter; /* filter */
char *ftype = NULL; char *ftype = NULL;
cvec *nsc = NULL; cvec *nsc = NULL;
char *prefix = NULL; char *prefix = NULL;
if(xml_nsctx_node(xn, &nsc) < 0) if(xml_nsctx_node(xn, &nsc) < 0)
goto done; goto done;
/* Get prefix of netconf base namespace in the incoming message */ /* Get prefix of netconf base namespace in the incoming message */
if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){
goto done; goto done;
} }
/* ie <filter>...</filter> */ /* ie <filter>...</filter> */
if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL) if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
ftype = xml_find_value(xfilter, "type"); ftype = xml_find_value(xfilter, "type");
if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) { if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) {
@ -193,12 +193,12 @@ netconf_get_config(clixon_handle h,
} }
} else { } else {
clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>" clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>"
"<error-tag>operation-failed</error-tag>" "<error-tag>operation-failed</error-tag>"
"<error-type>applicatio</error-type>" "<error-type>applicatio</error-type>"
"<error-severity>error</error-severity>" "<error-severity>error</error-severity>"
"<error-message>filter type not supported</error-message>" "<error-message>filter type not supported</error-message>"
"<error-info>type</error-info>" "<error-info>type</error-info>"
"</rpc-error></rpc-reply>", "</rpc-error></rpc-reply>",
NETCONF_BASE_NAMESPACE); NETCONF_BASE_NAMESPACE);
} }
retval = 0; retval = 0;
@ -226,10 +226,10 @@ netconf_get_config(clixon_handle h,
* </edit-config> * </edit-config>
*/ */
static int static int
get_edit_opts(cxobj *xn, get_edit_opts(cxobj *xn,
enum test_option *testopt, enum test_option *testopt,
enum error_option *erropt, enum error_option *erropt,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
cxobj *x; cxobj *x;
@ -252,10 +252,10 @@ get_edit_opts(cxobj *xn,
if (strcmp(optstr, "stop-on-error") == 0) if (strcmp(optstr, "stop-on-error") == 0)
*erropt = STOP_ON_ERROR; *erropt = STOP_ON_ERROR;
else else
if (strcmp(optstr, "continue-on-error") == 0) if (strcmp(optstr, "continue-on-error") == 0)
*erropt = CONTINUE_ON_ERROR; *erropt = CONTINUE_ON_ERROR;
else else
goto parerr; goto parerr;
} }
} }
retval = 1; /* hunky dory */ retval = 1; /* hunky dory */
@ -272,41 +272,41 @@ get_edit_opts(cxobj *xn,
/*! Netconf edit configuration /*! Netconf edit configuration
* *
Write the change on a tmp file, then load that into candidate configuration. Write the change on a tmp file, then load that into candidate configuration.
<edit-config> <edit-config>
<target> <target>
<candidate/> <candidate/>
</target> </target>
<!- - EITHER - -> <!- - EITHER - ->
<config> <config>
<configuration> <configuration>
<!- - tag elements representing the data to incorporate - -> <!- - tag elements representing the data to incorporate - ->
</configuration> </configuration>
</config> </config>
<!- - OR - -> <!- - OR - ->
<config-text> <config-text>
<configuration-text> <configuration-text>
<!- - tag elements inline configuration data in text format - -> <!- - tag elements inline configuration data in text format - ->
</configuration-text> </configuration-text>
</config-text> </config-text>
<!- - OR - -> <!- - OR - ->
<url> <url>
<!- - location specifier for file containing data - -> <!- - location specifier for file containing data - ->
</url> </url>
<default-operation>(merge | none | replace)</default-operation> <default-operation>(merge | none | replace)</default-operation>
<error-option>(stop-on-error | continue-on-error )</error-option> <error-option>(stop-on-error | continue-on-error )</error-option>
<test-option>(set | test-then-set | test-only)</test-option> <test-option>(set | test-then-set | test-only)</test-option>
<edit-config> <edit-config>
CLIXON addition: CLIXON addition:
<filter type="restconf" select="/data/profile=a" /> <filter type="restconf" select="/data/profile=a" />
* *
* @param[in] h clicon handle * @param[in] h clicon handle
@ -375,21 +375,21 @@ netconf_get(clixon_handle h,
cxobj *xn, cxobj *xn,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
cxobj *xfilter; /* filter */ cxobj *xfilter; /* filter */
char *ftype = NULL; char *ftype = NULL;
cvec *nsc = NULL; cvec *nsc = NULL;
char *prefix = NULL; char *prefix = NULL;
if(xml_nsctx_node(xn, &nsc) < 0) if(xml_nsctx_node(xn, &nsc) < 0)
goto done; goto done;
/* Get prefix of netconf base namespace in the incoming message */ /* Get prefix of netconf base namespace in the incoming message */
if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){
goto done; goto done;
} }
/* ie <filter>...</filter> */ /* ie <filter>...</filter> */
if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL) if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL)
ftype = xml_find_value(xfilter, "type"); ftype = xml_find_value(xfilter, "type");
if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) { if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) {
@ -405,12 +405,12 @@ netconf_get(clixon_handle h,
goto done; goto done;
} else { } else {
clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>" clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "<rpc-reply xmlns=\"%s\"><rpc-error>"
"<error-tag>operation-failed</error-tag>" "<error-tag>operation-failed</error-tag>"
"<error-type>applicatio</error-type>" "<error-type>applicatio</error-type>"
"<error-severity>error</error-severity>" "<error-severity>error</error-severity>"
"<error-message>filter type not supported</error-message>" "<error-message>filter type not supported</error-message>"
"<error-info>type</error-info>" "<error-info>type</error-info>"
"</rpc-error></rpc-reply>", "</rpc-error></rpc-reply>",
NETCONF_BASE_NAMESPACE); NETCONF_BASE_NAMESPACE);
} }
retval = 0; retval = 0;
@ -424,16 +424,16 @@ netconf_get(clixon_handle h,
* *
* and this session has registered for that event. * and this session has registered for that event.
* Filter it and forward it. * Filter it and forward it.
<notification> <notification>
<eventTime>2007-07-08T00:01:00Z</eventTime> <eventTime>2007-07-08T00:01:00Z</eventTime>
<event xmlns="http://example.com/event/1.0"> <event xmlns="http://example.com/event/1.0">
<eventClass>fault</eventClass> <eventClass>fault</eventClass>
<reportingEntity> <reportingEntity>
<card>Ethernet0</card> <card>Ethernet0</card>
</reportingEntity> </reportingEntity>
<severity>major</severity> <severity>major</severity>
</event> </event>
</notification> </notification>
* @see rfc5277: * @see rfc5277:
* An event notification is sent to the client who initiated a * An event notification is sent to the client who initiated a
* <create-subscription> command asynchronously when an event of * <create-subscription> command asynchronously when an event of
@ -518,18 +518,18 @@ netconf_notification_cb(int s,
} }
/* /*
<create-subscription> <create-subscription>
<stream>RESULT</stream> # If not present, events in the default NETCONF stream will be sent. <stream>RESULT</stream> # If not present, events in the default NETCONF stream will be sent.
<filter type="xpath" select="XPATHEXPR"/> <filter type="xpath" select="XPATHEXPR"/>
<startTime/> # only for replay (NYI) <startTime/> # only for replay (NYI)
<stopTime/> # only for replay (NYI) <stopTime/> # only for replay (NYI)
</create-subscription> </create-subscription>
Dont support replay Dont support replay
* @param[in] h clicon handle * @param[in] h clicon handle
* @param[in] xn Sub-tree (under xorig) at <rpc>...</rpc> level. * @param[in] xn Sub-tree (under xorig) at <rpc>...</rpc> level.
* @param[out] xret Return XML, error or OK * @param[out] xret Return XML, error or OK
* @see netconf_notification_cb for asynchronous stream notifications * @see netconf_notification_cb for asynchronous stream notifications
*/ */
static int static int
netconf_create_subscription(clixon_handle h, netconf_create_subscription(clixon_handle h,
cxobj *xn, cxobj *xn,
@ -560,9 +560,9 @@ netconf_create_subscription(clixon_handle h,
if (xpath_first(*xret, NULL, "rpc-reply/rpc-error") != NULL) if (xpath_first(*xret, NULL, "rpc-reply/rpc-error") != NULL)
goto ok; goto ok;
if (clixon_event_reg_fd(s, if (clixon_event_reg_fd(s,
netconf_notification_cb, netconf_notification_cb,
h, h,
"notification socket") < 0) "notification socket") < 0)
goto done; goto done;
ok: ok:
retval = 0; retval = 0;
@ -588,17 +588,17 @@ netconf_application_rpc(clixon_handle h,
cxobj *xn, cxobj *xn,
cxobj **xret) cxobj **xret)
{ {
int retval = -1; int retval = -1;
yang_stmt *yspec = NULL; /* application yspec */ yang_stmt *yspec = NULL; /* application yspec */
yang_stmt *yrpc = NULL; yang_stmt *yrpc = NULL;
yang_stmt *ymod = NULL; yang_stmt *ymod = NULL;
yang_stmt *youtput; yang_stmt *youtput;
cxobj *xoutput; cxobj *xoutput;
cxobj *xerr = NULL; cxobj *xerr = NULL;
cbuf *cb = NULL; cbuf *cb = NULL;
cbuf *cbret = NULL; cbuf *cbret = NULL;
int ret; int nr = 0;
int nr = 0; int ret;
/* First check system / netconf RPC:s */ /* First check system / netconf RPC:s */
if ((cb = cbuf_new()) == NULL){ if ((cb = cbuf_new()) == NULL){
@ -782,4 +782,5 @@ netconf_rpc_dispatch(clixon_handle h,
if ((xa = xml_find(xn, "username")) != NULL) if ((xa = xml_find(xn, "username")) != NULL)
xml_purge(xa); xml_purge(xa);
return retval; return retval;
} }

2
apps/restconf/restconf_main_fcgi.c
View file

@ -100,7 +100,7 @@
*/ */
static int static int
fcgi_params_set(clixon_handle h, fcgi_params_set(clixon_handle h,
char **envp) char **envp)
{ {
int retval = -1; int retval = -1;
int i; int i;

26
apps/restconf/restconf_main_native.c
View file

@ -191,10 +191,10 @@ static int session_id_context = 1;
* @retval -1 Error * @retval -1 Error
*/ */
static int static int
restconf_native_handle_set(clixon_handle h, restconf_native_handle_set(clixon_handle h,
restconf_native_handle *rh) restconf_native_handle *rh)
{ {
clicon_hash_t *cdat = clicon_data(h); clicon_hash_t *cdat = clicon_data(h);
/* It is the pointer to ys that should be copied by hash, /* It is the pointer to ys that should be copied by hash,
so we send a ptr to the ptr to indicate what to copy. so we send a ptr to the ptr to indicate what to copy.
@ -204,10 +204,12 @@ restconf_native_handle_set(clixon_handle h,
return 0; return 0;
} }
/* util function to append log string /*! util function to append log string
*/ */
static int static int
print_cb(const char *str, size_t len, void *cb) print_cb(const char *str,
size_t len,
void *cb)
{ {
return cbuf_append_str((cbuf*)cb, (char*)str); /* Assume string */ return cbuf_append_str((cbuf*)cb, (char*)str); /* Assume string */
} }
@ -529,14 +531,14 @@ static int
restconf_accept_client(int fd, restconf_accept_client(int fd,
void *arg) void *arg)
{ {
int retval = -1; int retval = -1;
restconf_socket *rsock; restconf_socket *rsock;
clixon_handle h; clixon_handle h;
int s = -1; int s = -1;
struct sockaddr from = {0,}; struct sockaddr from = {0,};
socklen_t len; socklen_t len;
char *name = NULL; char *name = NULL;
void *addr; void *addr;
clixon_debug(CLIXON_DBG_RESTCONF, "%d", fd); clixon_debug(CLIXON_DBG_RESTCONF, "%d", fd);
if ((rsock = (restconf_socket *)arg) == NULL){ if ((rsock = (restconf_socket *)arg) == NULL){

1
apps/restconf/restconf_methods_get.c
View file

@ -159,7 +159,6 @@ api_data_get2(clixon_handle h,
goto ok; goto ok;
} }
/* Ad-hoc method to determine json pagination request: /* Ad-hoc method to determine json pagination request:
* address list and one of "item/offset/.." is defined * address list and one of "item/offset/.." is defined
*/ */

2
docker/test/Dockerfile.fcgi
View file

@ -127,7 +127,7 @@ RUN git clone https://github.com/clicon/mib-yangs.git /usr/local/share/mib-yangs
# Stage 2 # Stage 2
# The second step skips the development environment and builds a runtime system # The second step skips the development environment and builds a runtime system
FROM alpine FROM alpine
MAINTAINER Olof Hagsand <olof@hagsand.se> LABEL maintainer="Olof Hagsand <olof@hagsand.se>"
# For clixon and cligen # For clixon and cligen
RUN apk add --update flex bison fcgi-dev RUN apk add --update flex bison fcgi-dev

2
docker/test/Dockerfile.native
View file

@ -127,7 +127,7 @@ RUN git clone https://github.com/clicon/mib-yangs.git /usr/local/share/mib-yangs
# The second step skips the development environment and builds a runtime system # The second step skips the development environment and builds a runtime system
# 3.20 # 3.20
FROM alpine:latest FROM alpine:latest
MAINTAINER Olof Hagsand <olof@hagsand.se> LABEL maintainer="Olof Hagsand <olof@hagsand.se>"
# For clixon and cligen # For clixon and cligen
RUN apk add --update flex bison openssl RUN apk add --update flex bison openssl

29
lib/src/clixon_xml_nsctx.c
View file

@ -112,8 +112,8 @@ xml_nsctx_namespace_netconf_default(clixon_handle h)
* @see xml_nsctx_free Free the reutned handle * @see xml_nsctx_free Free the reutned handle
*/ */
cvec * cvec *
xml_nsctx_init(char *prefix, xml_nsctx_init(char *prefix,
char *ns) char *ns)
{ {
cvec *cvv = NULL; cvec *cvv = NULL;
@ -194,16 +194,16 @@ xml_nsctx_get_prefix(cvec *cvv,
/*! Set or replace namespace in namespace context /*! Set or replace namespace in namespace context
* *
* @param[in] cvv Namespace context * @param[in] cvv Namespace context
* @param[in] prefix Namespace prefix, or NULL for default * @param[in] prefix Namespace prefix, or NULL for default
* @param[in] ns Cached namespace to set (assume non-null?) * @param[in] ns Cached namespace to set (assume non-null?)
* @retval 0 OK * @retval 0 OK
* @retval -1 Error * @retval -1 Error
*/ */
int int
xml_nsctx_add(cvec *cvv, xml_nsctx_add(cvec *cvv,
char *prefix, char *prefix,
char *ns) char *ns)
{ {
int retval = -1; int retval = -1;
cg_var *cv; cg_var *cv;
@ -219,7 +219,7 @@ xml_nsctx_add(cvec *cvv,
static int static int
xml_nsctx_node1(cxobj *xn, xml_nsctx_node1(cxobj *xn,
cvec *nsc) cvec *nsc)
{ {
int retval = -1; int retval = -1;
cxobj *xa = NULL; cxobj *xa = NULL;
@ -546,9 +546,10 @@ xml2ns(cxobj *x,
/*! Recursively check prefix / namespaces (and populate ns cache) /*! Recursively check prefix / namespaces (and populate ns cache)
* *
* @retval 1 OK * @param[in] xt XML node
* @retval 0 (Some) prefix not found * @retval 1 OK
* @retval -1 Error * @retval 0 (Some) prefix not found
* @retval -1 Error
*/ */
int int
xml2ns_recurse(cxobj *xt) xml2ns_recurse(cxobj *xt)

1
lib/src/clixon_yang_parse.y
View file

@ -812,7 +812,6 @@ meta_stmt : organization_stmt { _PARSE_DEBUG("meta-stmt -> organization-s
| reference_stmt { _PARSE_DEBUG("meta-stmt -> reference-stmt"); } | reference_stmt { _PARSE_DEBUG("meta-stmt -> reference-stmt"); }
; ;
/* length-stmt */ /* length-stmt */
length_stmt : K_LENGTH string ';' /* XXX length-arg-str */ length_stmt : K_LENGTH string ';' /* XXX length-arg-str */
{ if (ysp_add(_yy, Y_LENGTH, $2, NULL) == NULL) _YYERROR("length_stmt"); { if (ysp_add(_yy, Y_LENGTH, $2, NULL) == NULL) _YYERROR("length_stmt");

4
yang/clixon/clixon-restconf@2025-02-01.yang
View file

@ -160,8 +160,8 @@ module clixon-restconf {
leaf debug { leaf debug {
description description
"Set debug level of restconf daemon. "Set debug level of restconf daemon.
0 is no debug, 1 is debugging, more is detailed debug. Debug logs will be directed to log-destination with LOG_DEBUG level (for syslog)
Debug logs will be directed to log-destination with LOG_DEBUG level (for syslog)"; Note: must be decimal";
type uint32; type uint32;
default 0; default 0;
} }

7
yang/mandatory/Makefile.in
View file

@ -67,10 +67,9 @@ YANGSPECS += ietf-origin@2018-02-14.yang
YANGSPECS += ietf-netconf-with-defaults@2011-06-01.yang YANGSPECS += ietf-netconf-with-defaults@2011-06-01.yang
YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang
# in draft-ietf-netconf-list-pagination-04.html # IETF list-pagination drafts
YANGSPECS += ietf-list-pagination@2024-07-08.yang YANGSPECS += ietf-list-pagination@2024-10-21.yang
# in draft-ietf-netconf-list-pagination-nc-04 YANGSPECS += ietf-list-pagination-nc@2024-10-21.yang
YANGSPECS += ietf-list-pagination-nc@2024-07-08.yang
all: all: