From 411f509fd867344d2bf7aa1e740e892a4d4ef90a Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Sun, 16 Mar 2025 17:28:11 +0100 Subject: [PATCH] Formatting, whitespace --- apps/backend/backend_client.c | 12 +- apps/backend/backend_commit.c | 14 +- apps/backend/backend_confirm.c | 8 +- apps/backend/backend_get.c | 46 +-- apps/backend/backend_plugin.c | 29 +- apps/backend/backend_startup.c | 6 +- apps/backend/clixon_backend_handle.c | 14 +- apps/netconf/netconf_filter.c | 26 +- apps/netconf/netconf_main.c | 32 +- apps/netconf/netconf_rpc.c | 305 ++++++++++---------- apps/restconf/restconf_main_fcgi.c | 2 +- apps/restconf/restconf_main_native.c | 26 +- apps/restconf/restconf_methods_get.c | 1 - docker/test/Dockerfile.fcgi | 2 +- docker/test/Dockerfile.native | 2 +- lib/src/clixon_xml_nsctx.c | 29 +- lib/src/clixon_yang_parse.y | 1 - yang/clixon/clixon-restconf@2025-02-01.yang | 4 +- yang/mandatory/Makefile.in | 17 +- 19 files changed, 288 insertions(+), 288 deletions(-) diff --git a/apps/backend/backend_client.c b/apps/backend/backend_client.c index f2af11a6..2624a445 100644 --- a/apps/backend/backend_client.c +++ b/apps/backend/backend_client.c @@ -1587,11 +1587,11 @@ from_client_restart_plugin(clixon_handle h, * @retval -1 Error */ static int -from_client_process_control(clixon_handle h, - cxobj *xe, - cbuf *cbret, - void *arg, - void *regarg) +from_client_process_control(clixon_handle h, + cxobj *xe, + cbuf *cbret, + void *arg, + void *regarg) { int retval = -1; cxobj *x; @@ -1631,7 +1631,7 @@ from_client_process_control(clixon_handle h, * @retval -1 Error */ static int -from_client_hello(clixon_handle h, +from_client_hello(clixon_handle h, cxobj *x, struct client_entry *ce, cbuf *cbret) diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c index 16d9106b..223434bc 100644 --- a/apps/backend/backend_commit.c +++ b/apps/backend/backend_commit.c @@ -408,10 +408,10 @@ startup_common(clixon_handle h, * @retval -1 Error - or validation failed (but cbret not set) */ int -startup_validate(clixon_handle h, - char *db, - cxobj **xtr, - cbuf *cbret) +startup_validate(clixon_handle h, + char *db, + cxobj **xtr, + cbuf *cbret) { int retval = -1; int ret; @@ -454,9 +454,9 @@ startup_validate(clixon_handle h, * Only called from startup_mode_startup */ int -startup_commit(clixon_handle h, - char *db, - cbuf *cbret) +startup_commit(clixon_handle h, + char *db, + cbuf *cbret) { int retval = -1; int ret; diff --git a/apps/backend/backend_confirm.c b/apps/backend/backend_confirm.c index 5498bcbb..329c9622 100644 --- a/apps/backend/backend_confirm.c +++ b/apps/backend/backend_confirm.c @@ -137,7 +137,7 @@ confirmed_commit_state_get(clixon_handle h) } static int -confirmed_commit_state_set(clixon_handle h, +confirmed_commit_state_set(clixon_handle h, enum confirmed_commit_state state) { struct confirmed_commit *cc = NULL; @@ -211,8 +211,8 @@ confirmed_commit_fn_arg_get(clixon_handle h, static int confirmed_commit_fn_arg_set(clixon_handle h, - int (*fn)(int, void*), - void *arg) + int (*fn)(int, void*), + void *arg) { struct confirmed_commit *cc = NULL; @@ -325,7 +325,7 @@ cancel_rollback_event(clixon_handle h) * @see do_rollback() */ static int -rollback_fn(int fd, +rollback_fn(int fd, void *arg) { clixon_handle h = arg; diff --git a/apps/backend/backend_get.c b/apps/backend/backend_get.c index f07a005b..60cd87b9 100644 --- a/apps/backend/backend_get.c +++ b/apps/backend/backend_get.c @@ -130,13 +130,13 @@ restconf_client_get_capabilities(clixon_handle h, * @retval -1 Error (fatal) */ static int -client_get_streams(clixon_handle h, - yang_stmt *yspec, - char *xpath, - cvec *nsc, - yang_stmt *ymod, - char *top, - cxobj **xret) +client_get_streams(clixon_handle h, + yang_stmt *yspec, + char *xpath, + cvec *nsc, + yang_stmt *ymod, + char *top, + cxobj **xret) { int retval = -1; yang_stmt *yns = NULL; /* yang namespace */ @@ -396,16 +396,16 @@ filter_xpath_again(clixon_handle h, * @retval -1 Error */ static int -get_nacm_and_reply(clixon_handle h, - cxobj *xret, - cxobj **xvec, - size_t xlen, - char *xpath, - cvec *nsc, - char *username, - int32_t depth, - withdefaults_type wdef, - cbuf *cbret) +get_nacm_and_reply(clixon_handle h, + cxobj *xret, + cxobj **xvec, + size_t xlen, + char *xpath, + cvec *nsc, + char *username, + int32_t depth, + withdefaults_type wdef, + cbuf *cbret) { int retval = -1; cxobj *xnacm = NULL; @@ -447,12 +447,12 @@ get_nacm_and_reply(clixon_handle h, * @retval -1 Error */ static int -element2value(clixon_handle h, - cxobj *xe, - char *name, - char *defaultstr, - cbuf *cbret, - uint32_t *value) +element2value(clixon_handle h, + cxobj *xe, + char *name, + char *defaultstr, + cbuf *cbret, + uint32_t *value) { char *valstr; cxobj *x; diff --git a/apps/backend/backend_plugin.c b/apps/backend/backend_plugin.c index dfc43f54..b3eb45b7 100644 --- a/apps/backend/backend_plugin.c +++ b/apps/backend/backend_plugin.c @@ -75,8 +75,8 @@ */ int clixon_plugin_reset_one(clixon_plugin_t *cp, - clixon_handle h, - char *db) + clixon_handle h, + char *db) { int retval = -1; plgreset_t *fn; /* callback */ @@ -137,7 +137,7 @@ clixon_plugin_reset_all(clixon_handle h, */ static int clixon_plugin_pre_daemon_one(clixon_plugin_t *cp, - clixon_handle h) + clixon_handle h) { int retval = -1; plgdaemon_t *fn; /* Daemonize plugin callback function */ @@ -199,7 +199,7 @@ clixon_plugin_pre_daemon_all(clixon_handle h) */ static int clixon_plugin_daemon_one(clixon_plugin_t *cp, - clixon_handle h) + clixon_handle h) { int retval = -1; 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 */ int -clixon_plugin_statedata_all(clixon_handle h, - yang_stmt *yspec, - cvec *nsc, - char *xpath, - cxobj **xret) +clixon_plugin_statedata_all(clixon_handle h, + yang_stmt *yspec, + cvec *nsc, + char *xpath, + cxobj **xret) { int retval = -1; int ret; @@ -457,8 +457,7 @@ int clixon_plugin_lockdb_all(clixon_handle h, char *db, int lock, - int id - ) + int id) { 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. */ static int -plugin_transaction_commit_failed(clixon_plugin_t *cp, - clixon_handle h, - transaction_data_t *td) +plugin_transaction_commit_failed(clixon_plugin_t *cp, + clixon_handle h, + transaction_data_t *td) { trans_cb_t *fn; @@ -806,7 +805,7 @@ plugin_transaction_commit_failed(clixon_plugin_t *cp, * @retval -1 Error */ int -plugin_transaction_commit_one(clixon_plugin_t *cp, +plugin_transaction_commit_one(clixon_plugin_t *cp, clixon_handle h, transaction_data_t *td) { diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c index 1b861051..34fbe284 100644 --- a/apps/backend/backend_startup.c +++ b/apps/backend/backend_startup.c @@ -130,9 +130,9 @@ startup --+-------------------------------------> BROKEN XML * @note: if commit fails, copy factory to running */ int -startup_mode_startup(clixon_handle h, - char *db, - cbuf *cbret) +startup_mode_startup(clixon_handle h, + char *db, + cbuf *cbret) { int retval = -1; int ret = 0; diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c index 5e8f95bc..c6f8ba67 100644 --- a/apps/backend/clixon_backend_handle.c +++ b/apps/backend/clixon_backend_handle.c @@ -85,15 +85,15 @@ * @see struct clixon_handle, struct cli_handle */ struct backend_handle { - int bh_magic; /* magic (HDR)*/ - clicon_hash_t *bh_copt; /* clicon option list (HDR) */ - clicon_hash_t *bh_data; /* internal clicon data (HDR) */ - clicon_hash_t *ch_db_elmnt; /* xml datastore element cache data */ - event_stream_t *bh_stream; /* notification streams, see clixon_stream.[ch] */ + int bh_magic; /* magic (HDR)*/ + clicon_hash_t *bh_copt; /* clicon option list (HDR) */ + clicon_hash_t *bh_data; /* internal clicon data (HDR) */ + clicon_hash_t *ch_db_elmnt; /* xml datastore element cache data */ + event_stream_t *bh_stream; /* notification streams, see clixon_stream.[ch] */ /* ------ end of common handle ------ */ - struct client_entry *bh_ce_list; /* The client list */ - int bh_ce_nr; /* Number of clients, just increment */ + struct client_entry *bh_ce_list; /* The client list */ + int bh_ce_nr; /* Number of clients, just increment */ }; /*! Creates and returns a clicon config handle for other CLICON API calls diff --git a/apps/netconf/netconf_filter.c b/apps/netconf/netconf_filter.c index 56e942d9..81ad5e54 100644 --- a/apps/netconf/netconf_filter.c +++ b/apps/netconf/netconf_filter.c @@ -1,7 +1,7 @@ /* * ***** BEGIN LICENSE BLOCK ***** - + Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2017-2019 Olof Hagsand Copyright (C) 2020-2022 Olof Hagsand and Rubicon Communications, LLC (Netgate) @@ -25,7 +25,7 @@ in which case the provisions of the GPL are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the GPL, and not to allow others to - use your version of this file under the terms of Apache License version 2, + use your version of this file under the terms of Apache License version 2, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under @@ -67,15 +67,15 @@ /* xf specifices a filter, and xn is an xml tree. * Select the part of xn that matches xf and return it. - * Change xn destructively by removing the parts of the sub-tree that does + * Change xn destructively by removing the parts of the sub-tree that does * not match. * Match according to Section 6 of RFC 4741. - NO_FILTER, select all - EMPTY_FILTER, select nothing - ATTRIBUTE_MATCH, select if attribute match - SELECTION, select this node - CONTENT_MATCH, select all siblings with matching content - CONTAINMENT select + NO_FILTER, select all + EMPTY_FILTER, select nothing + ATTRIBUTE_MATCH, select if attribute match + SELECTION, select this node + CONTENT_MATCH, select all siblings with matching content + CONTAINMENT select */ /* return a string containing leafs value, NULL if no leaf or no value */ @@ -192,10 +192,10 @@ xml_filter_recursive(cxobj *xfilter, /*! Remove parts of configuration xml tree that does not match filter xml tree * - * @param[in] xfilter Filter xml - * @param[out] xconf Configuration xml - * @retval 0 OK - * @retval -1 Error + * @param[in] xfilter Filter xml + * @param[out] xconf Configuration xml + * @retval 0 OK + * @retval -1 Error * This is the top-level function, calls a recursive variant. */ int diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c index 1ade3cd0..19356529 100644 --- a/apps/netconf/netconf_main.c +++ b/apps/netconf/netconf_main.c @@ -1,7 +1,7 @@ /* * ***** BEGIN LICENSE BLOCK ***** - + Copyright (C) 2009-2016 Olof Hagsand and Benny Holmgren Copyright (C) 2017-2019 Olof Hagsand Copyright (C) 2020-2022 Olof Hagsand and Rubicon Communications, LLC(Netgate) @@ -25,7 +25,7 @@ in which case the provisions of the GPL are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the GPL, and not to allow others to - use your version of this file under the terms of Apache License version 2, + use your version of this file under the terms of Apache License version 2, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the GPL. If you do not delete the provisions above, a recipient may use your version of this file under @@ -115,7 +115,7 @@ netconf_add_request_attr(cxobj *xrpc, /* If attribute already exists, dont copy it */ if (xml_find_type(xrep, NULL, xml_name(xa), CX_ATTR) != NULL) continue; /* Skip already present (dont overwrite) */ - /* Filter all clixon-lib attributes and namespace declaration + /* Filter all clixon-lib attributes and namespace declaration * to avoid leaking internal attributes to external NETCONF * note this is only done on top-level. */ @@ -137,7 +137,7 @@ netconf_add_request_attr(cxobj *xrpc, /*! Process netconf hello message * * A server receiving a message with a element MUST - * terminate the NETCONF session. + * terminate the NETCONF session. * @param[in] h Clixon handle * @param[in] xn * @param[out] eof Request termination @@ -175,7 +175,7 @@ netconf_hello_msg(clixon_handle h, continue; if ((body = xml_body(x)) == NULL) continue; - /* When comparing protocol version capability URIs, only the base part is used, in the + /* When comparing protocol version capability URIs, only the base part is used, in the * event any parameters are encoded at the end of the URI string. */ if (strncmp(body, NETCONF_BASE_CAPABILITY_1_0, strlen(NETCONF_BASE_CAPABILITY_1_0)) == 0){ /* RFC 4741 */ foundbase_10++; @@ -201,7 +201,7 @@ netconf_hello_msg(clixon_handle h, return retval; } -/*! Process incoming Netconf RPC netconf message +/*! Process incoming Netconf RPC netconf message * * @param[in] h Clixon handle * @param[in] xreq XML tree containing netconf RPC message @@ -389,7 +389,7 @@ netconf_input_packet(clixon_handle h, return retval; } -/*! Get netconf message: detect end-of-msg +/*! Get netconf message: detect end-of-msg * * @param[in] s Socket where input arrived. read from this. * @param[in] arg Clixon handle. @@ -454,7 +454,7 @@ netconf_input_cb(int s, frame_size = 0; else 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) goto done; p = buf; @@ -570,16 +570,16 @@ send_hello(clixon_handle h, return retval; } -/*! Clean and close all state of netconf process (but dont exit). +/*! Clean and close all state of netconf process (but dont exit). * - * Cannot use h after this + * Cannot use h after this * @param[in] h Clixon handle */ static int netconf_terminate(clixon_handle h) { - cvec *nsctx; - cxobj *x; + cvec *nsctx; + cxobj *x; if (clixon_exit_get() == 0) clixon_exit_set(1); @@ -602,7 +602,7 @@ netconf_terminate(clixon_handle h) /*! Setup signal handlers */ static int -netconf_signal_init (clixon_handle h) +netconf_signal_init(clixon_handle h) { int retval = -1; @@ -616,7 +616,7 @@ netconf_signal_init (clixon_handle h) } static int -timeout_fn(int s, +timeout_fn(int s, void *arg) { clixon_err(OE_EVENTS, ETIMEDOUT, "User request timeout"); @@ -747,7 +747,7 @@ main(int argc, } } - /* + /* * Logs, error and debug to stderr or syslog, set debug level */ clixon_log_init(h, __PROGRAM__, dbg?LOG_DEBUG:LOG_INFO, logdst); @@ -942,7 +942,7 @@ main(int argc, goto done; clicon_session_id_set(h, id); - /* Send hello to northbound client + /* Send hello to northbound client * Note that this is a violation of RDFC 6241 Sec 8.1: * When the NETCONF session is opened, each peer(both client and server) MUST send a - - - */ + * + + +*/ static int netconf_get_config_subtree(clixon_handle h, @@ -100,7 +100,7 @@ netconf_get_config_subtree(clixon_handle h, NETCONF_BASE_NAMESPACE ); } -ok: + ok: retval = 0; // done: return retval; @@ -116,22 +116,22 @@ ok: * @note filter type subtree and xpath is supported, but xpath is preferred, and * better performance and tested. Please use xpath. * - * - * - * | - * - * + * + * + * | + * + * * - * - * - * | - * - * - * - * - * - * - * + * + * + * | + * + * + * + * + * + * + * * * Example: * @@ -147,36 +147,36 @@ ok: * -----------------+-----------+---------------+--------------+ * Example requests of each: * no filter + no config - ]]>]]> + ]]>]]> * filter subnet + no config: - ]]>]]> + ]]>]]> * filter xpath + select all: - ]]>]]> + ]]>]]> * filter subtree + config: - ]]>]]> + ]]>]]> * filter xpath + select: - ]]>]]> - */ + ]]>]]> +*/ static int netconf_get_config(clixon_handle h, cxobj *xn, cxobj **xret) { - int retval = -1; - cxobj *xfilter; /* filter */ - char *ftype = NULL; - cvec *nsc = NULL; - char *prefix = NULL; + int retval = -1; + cxobj *xfilter; /* filter */ + char *ftype = NULL; + cvec *nsc = NULL; + char *prefix = NULL; - if(xml_nsctx_node(xn, &nsc) < 0) - goto done; + if(xml_nsctx_node(xn, &nsc) < 0) + goto done; - /* Get prefix of netconf base namespace in the incoming message */ - if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ - goto done; - } + /* Get prefix of netconf base namespace in the incoming message */ + if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ + goto done; + } - /* ie ... */ + /* ie ... */ if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL) ftype = xml_find_value(xfilter, "type"); if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) { @@ -193,12 +193,12 @@ netconf_get_config(clixon_handle h, } } else { clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "" - "operation-failed" - "applicatio" - "error" - "filter type not supported" - "type" - "", + "operation-failed" + "applicatio" + "error" + "filter type not supported" + "type" + "", NETCONF_BASE_NAMESPACE); } retval = 0; @@ -220,16 +220,16 @@ netconf_get_config(clixon_handle h, * @example * * ... - * (merge | none | replace) - * (stop-on-error | continue-on-error ) - * (set | test-then-set | test-only) + * (merge | none | replace) + * (stop-on-error | continue-on-error ) + * (set | test-then-set | test-only) * */ static int -get_edit_opts(cxobj *xn, - enum test_option *testopt, - enum error_option *erropt, - cxobj **xret) +get_edit_opts(cxobj *xn, + enum test_option *testopt, + enum error_option *erropt, + cxobj **xret) { int retval = -1; cxobj *x; @@ -252,10 +252,10 @@ get_edit_opts(cxobj *xn, if (strcmp(optstr, "stop-on-error") == 0) *erropt = STOP_ON_ERROR; else - if (strcmp(optstr, "continue-on-error") == 0) - *erropt = CONTINUE_ON_ERROR; - else - goto parerr; + if (strcmp(optstr, "continue-on-error") == 0) + *erropt = CONTINUE_ON_ERROR; + else + goto parerr; } } retval = 1; /* hunky dory */ @@ -272,41 +272,41 @@ get_edit_opts(cxobj *xn, /*! 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. + + + + - - - - - + - - - - - - - + + + + + - + - - - - - (merge | none | replace) - (stop-on-error | continue-on-error ) - (set | test-then-set | test-only) - + + + + + -CLIXON addition: - + + + + + + + (merge | none | replace) + (stop-on-error | continue-on-error ) + (set | test-then-set | test-only) + + + CLIXON addition: + * * @param[in] h clicon handle @@ -334,9 +334,9 @@ netconf_edit_config(clixon_handle h, goto done; if (optret == 0) /* error in opt parameters */ goto ok; - /* These constraints are clixon-specific since :validate should - * support all testopts, and erropts should be supported - * And therefore extends the validation + /* These constraints are clixon-specific since :validate should + * support all testopts, and erropts should be supported + * And therefore extends the validation * (implement the features before removing these checks) */ if (testopt!=TEST_THEN_SET || erropt!=STOP_ON_ERROR){ @@ -357,7 +357,7 @@ netconf_edit_config(clixon_handle h, } /*! Get running configuration and device state information - * + * * @param[in] h Clixon handle * @param[in] xn Sub-tree (under xorig) at ... level. * @param[out] xret Return XML, error or OK @@ -375,21 +375,21 @@ netconf_get(clixon_handle h, cxobj *xn, cxobj **xret) { - int retval = -1; - cxobj *xfilter; /* filter */ - char *ftype = NULL; - cvec *nsc = NULL; - char *prefix = NULL; + int retval = -1; + cxobj *xfilter; /* filter */ + char *ftype = NULL; + cvec *nsc = NULL; + char *prefix = NULL; - if(xml_nsctx_node(xn, &nsc) < 0) - goto done; + if(xml_nsctx_node(xn, &nsc) < 0) + goto done; - /* Get prefix of netconf base namespace in the incoming message */ - if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ - goto done; - } + /* Get prefix of netconf base namespace in the incoming message */ + if (xml_nsctx_get_prefix(nsc, NETCONF_BASE_NAMESPACE, &prefix) == 0){ + goto done; + } - /* ie ... */ + /* ie ... */ if ((xfilter = xpath_first(xn, nsc, "%s%sfilter", prefix ? prefix : "", prefix ? ":" : "")) != NULL) ftype = xml_find_value(xfilter, "type"); if (xfilter == NULL || ftype == NULL || strcmp(ftype, "subtree") == 0) { @@ -405,12 +405,12 @@ netconf_get(clixon_handle h, goto done; } else { clixon_xml_parse_va(YB_NONE, NULL, xret, NULL, "" - "operation-failed" - "applicatio" - "error" - "filter type not supported" - "type" - "", + "operation-failed" + "applicatio" + "error" + "filter type not supported" + "type" + "", NETCONF_BASE_NAMESPACE); } retval = 0; @@ -424,16 +424,16 @@ netconf_get(clixon_handle h, * * and this session has registered for that event. * Filter it and forward it. - - 2007-07-08T00:01:00Z - - fault - - Ethernet0 - - major - - + + 2007-07-08T00:01:00Z + + fault + + Ethernet0 + + major + + * @see rfc5277: * An event notification is sent to the client who initiated a * command asynchronously when an event of @@ -518,18 +518,18 @@ netconf_notification_cb(int s, } /* - - RESULT # If not present, events in the default NETCONF stream will be sent. - - # only for replay (NYI) - # only for replay (NYI) - - Dont support replay - * @param[in] h clicon handle - * @param[in] xn Sub-tree (under xorig) at ... level. - * @param[out] xret Return XML, error or OK - * @see netconf_notification_cb for asynchronous stream notifications - */ + + RESULT # If not present, events in the default NETCONF stream will be sent. + + # only for replay (NYI) + # only for replay (NYI) + + Dont support replay + * @param[in] h clicon handle + * @param[in] xn Sub-tree (under xorig) at ... level. + * @param[out] xret Return XML, error or OK + * @see netconf_notification_cb for asynchronous stream notifications + */ static int netconf_create_subscription(clixon_handle h, cxobj *xn, @@ -560,9 +560,9 @@ netconf_create_subscription(clixon_handle h, if (xpath_first(*xret, NULL, "rpc-reply/rpc-error") != NULL) goto ok; if (clixon_event_reg_fd(s, - netconf_notification_cb, - h, - "notification socket") < 0) + netconf_notification_cb, + h, + "notification socket") < 0) goto done; ok: retval = 0; @@ -572,8 +572,8 @@ netconf_create_subscription(clixon_handle h, /*! See if there is any application defined RPC for this tag * - * This may either be local client-side or backend. If backend send as netconf - * RPC. + * This may either be local client-side or backend. If backend send as netconf + * RPC. * Assume already bound and validated. * @param[in] h clicon handle * @param[in] xn Sub-tree (under xorig) at child of rpc: . @@ -588,17 +588,17 @@ netconf_application_rpc(clixon_handle h, cxobj *xn, cxobj **xret) { - int retval = -1; - yang_stmt *yspec = NULL; /* application yspec */ - yang_stmt *yrpc = NULL; - yang_stmt *ymod = NULL; - yang_stmt *youtput; - cxobj *xoutput; - cxobj *xerr = NULL; - cbuf *cb = NULL; - cbuf *cbret = NULL; - int ret; - int nr = 0; + int retval = -1; + yang_stmt *yspec = NULL; /* application yspec */ + yang_stmt *yrpc = NULL; + yang_stmt *ymod = NULL; + yang_stmt *youtput; + cxobj *xoutput; + cxobj *xerr = NULL; + cbuf *cb = NULL; + cbuf *cbret = NULL; + int nr = 0; + int ret; /* First check system / netconf RPC:s */ if ((cb = cbuf_new()) == NULL){ @@ -609,7 +609,7 @@ netconf_application_rpc(clixon_handle h, clixon_err(OE_UNIX, 0, "cbuf_new"); goto done; } - /* Find yang rpc statement, return yang rpc statement if found + /* Find yang rpc statement, return yang rpc statement if found Check application RPC */ if ((yspec = clicon_dbspec_yang(h)) == NULL){ clixon_err(OE_YANG, ENOENT, "No yang spec"); @@ -647,7 +647,7 @@ netconf_application_rpc(clixon_handle h, else /* Send to backend */ if (clicon_rpc_netconf_xml(h, xml_parent(xn), xret, NULL) < 0) goto done; - /* Sanity check of outgoing XML + /* Sanity check of outgoing XML * For now, skip outgoing checks. * (1) Does not handle properly * (2) Uncertain how validation errors should be logged/handled @@ -692,7 +692,7 @@ netconf_application_rpc(clixon_handle h, * @param[in] xn Sub-tree (under xorig) at ... level. * @param[out] xret Return XML, error or OK * @param[out] eof Set to 1 if pending close socket - * @retval 0 OK, can also be netconf error + * @retval 0 OK, can also be netconf error * @retval -1 Error, fatal */ int @@ -707,7 +707,7 @@ netconf_rpc_dispatch(clixon_handle h, cxobj *xa; /* Tag username on all incoming requests in case they are forwarded as internal messages - * This may be unecesary since not all are forwarded. + * This may be unecesary since not all are forwarded. * It may even be wrong if something else is done with the incoming message? */ if ((username = clicon_username_get(h)) != NULL){ @@ -716,7 +716,7 @@ netconf_rpc_dispatch(clixon_handle h, } /* Many of these calls are now calling generic clicon_rpc_netconf_xml * directly, since the validation is generic and done before this place - * in the call. Some call however need extra validation, such as the + * in the call. Some call however need extra validation, such as the * filter parameter to get/get-config and tes- err-opts of edit-config. */ xe = NULL; @@ -782,4 +782,5 @@ netconf_rpc_dispatch(clixon_handle h, if ((xa = xml_find(xn, "username")) != NULL) xml_purge(xa); return retval; + } diff --git a/apps/restconf/restconf_main_fcgi.c b/apps/restconf/restconf_main_fcgi.c index c7e7056f..65f0cbd7 100644 --- a/apps/restconf/restconf_main_fcgi.c +++ b/apps/restconf/restconf_main_fcgi.c @@ -100,7 +100,7 @@ */ static int fcgi_params_set(clixon_handle h, - char **envp) + char **envp) { int retval = -1; int i; diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c index 271ed560..6254a7a1 100644 --- a/apps/restconf/restconf_main_native.c +++ b/apps/restconf/restconf_main_native.c @@ -191,10 +191,10 @@ static int session_id_context = 1; * @retval -1 Error */ static int -restconf_native_handle_set(clixon_handle h, +restconf_native_handle_set(clixon_handle h, 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, 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; } -/* util function to append log string +/*! util function to append log string */ 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 */ } @@ -529,14 +531,14 @@ static int restconf_accept_client(int fd, void *arg) { - int retval = -1; - restconf_socket *rsock; - clixon_handle h; - int s = -1; - struct sockaddr from = {0,}; - socklen_t len; - char *name = NULL; - void *addr; + int retval = -1; + restconf_socket *rsock; + clixon_handle h; + int s = -1; + struct sockaddr from = {0,}; + socklen_t len; + char *name = NULL; + void *addr; clixon_debug(CLIXON_DBG_RESTCONF, "%d", fd); if ((rsock = (restconf_socket *)arg) == NULL){ diff --git a/apps/restconf/restconf_methods_get.c b/apps/restconf/restconf_methods_get.c index 209b6f0d..70c5e965 100644 --- a/apps/restconf/restconf_methods_get.c +++ b/apps/restconf/restconf_methods_get.c @@ -159,7 +159,6 @@ api_data_get2(clixon_handle h, goto ok; } - /* Ad-hoc method to determine json pagination request: * address list and one of "item/offset/.." is defined */ diff --git a/docker/test/Dockerfile.fcgi b/docker/test/Dockerfile.fcgi index 95d75cce..bef6616f 100644 --- a/docker/test/Dockerfile.fcgi +++ b/docker/test/Dockerfile.fcgi @@ -127,7 +127,7 @@ RUN git clone https://github.com/clicon/mib-yangs.git /usr/local/share/mib-yangs # Stage 2 # The second step skips the development environment and builds a runtime system FROM alpine -MAINTAINER Olof Hagsand +LABEL maintainer="Olof Hagsand " # For clixon and cligen RUN apk add --update flex bison fcgi-dev diff --git a/docker/test/Dockerfile.native b/docker/test/Dockerfile.native index ccbcbfe7..f3bec366 100644 --- a/docker/test/Dockerfile.native +++ b/docker/test/Dockerfile.native @@ -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 # 3.20 FROM alpine:latest -MAINTAINER Olof Hagsand +LABEL maintainer="Olof Hagsand " # For clixon and cligen RUN apk add --update flex bison openssl diff --git a/lib/src/clixon_xml_nsctx.c b/lib/src/clixon_xml_nsctx.c index 89f9c6be..cbe30173 100644 --- a/lib/src/clixon_xml_nsctx.c +++ b/lib/src/clixon_xml_nsctx.c @@ -112,8 +112,8 @@ xml_nsctx_namespace_netconf_default(clixon_handle h) * @see xml_nsctx_free Free the reutned handle */ cvec * -xml_nsctx_init(char *prefix, - char *ns) +xml_nsctx_init(char *prefix, + char *ns) { cvec *cvv = NULL; @@ -194,16 +194,16 @@ xml_nsctx_get_prefix(cvec *cvv, /*! Set or replace namespace in namespace context * - * @param[in] cvv Namespace context - * @param[in] prefix Namespace prefix, or NULL for default - * @param[in] ns Cached namespace to set (assume non-null?) - * @retval 0 OK - * @retval -1 Error + * @param[in] cvv Namespace context + * @param[in] prefix Namespace prefix, or NULL for default + * @param[in] ns Cached namespace to set (assume non-null?) + * @retval 0 OK + * @retval -1 Error */ int -xml_nsctx_add(cvec *cvv, - char *prefix, - char *ns) +xml_nsctx_add(cvec *cvv, + char *prefix, + char *ns) { int retval = -1; cg_var *cv; @@ -219,7 +219,7 @@ xml_nsctx_add(cvec *cvv, static int xml_nsctx_node1(cxobj *xn, - cvec *nsc) + cvec *nsc) { int retval = -1; cxobj *xa = NULL; @@ -546,9 +546,10 @@ xml2ns(cxobj *x, /*! Recursively check prefix / namespaces (and populate ns cache) * - * @retval 1 OK - * @retval 0 (Some) prefix not found - * @retval -1 Error + * @param[in] xt XML node + * @retval 1 OK + * @retval 0 (Some) prefix not found + * @retval -1 Error */ int xml2ns_recurse(cxobj *xt) diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y index 1bdb3fbf..3b57dee0 100644 --- a/lib/src/clixon_yang_parse.y +++ b/lib/src/clixon_yang_parse.y @@ -812,7 +812,6 @@ meta_stmt : organization_stmt { _PARSE_DEBUG("meta-stmt -> organization-s | reference_stmt { _PARSE_DEBUG("meta-stmt -> reference-stmt"); } ; - /* length-stmt */ length_stmt : K_LENGTH string ';' /* XXX length-arg-str */ { if (ysp_add(_yy, Y_LENGTH, $2, NULL) == NULL) _YYERROR("length_stmt"); diff --git a/yang/clixon/clixon-restconf@2025-02-01.yang b/yang/clixon/clixon-restconf@2025-02-01.yang index 89e5231c..5b028912 100644 --- a/yang/clixon/clixon-restconf@2025-02-01.yang +++ b/yang/clixon/clixon-restconf@2025-02-01.yang @@ -160,8 +160,8 @@ module clixon-restconf { leaf debug { description "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; default 0; } diff --git a/yang/mandatory/Makefile.in b/yang/mandatory/Makefile.in index 38a8744a..114dfb0a 100644 --- a/yang/mandatory/Makefile.in +++ b/yang/mandatory/Makefile.in @@ -1,6 +1,6 @@ # # ***** BEGIN LICENSE BLOCK ***** -# +# # Copyright (C) 2017-2019 Olof Hagsand # Copyright (C) 2020-2022 Olof Hagsand and Rubicon Communications, LLC(Netgate) # @@ -23,7 +23,7 @@ # in which case the provisions of the GPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of the GPL, and not to allow others to -# use your version of this file under the terms of Apache License version 2, +# use your version of this file under the terms of Apache License version 2, # indicate your decision by deleting the provisions above and replace them with # the notice and other provisions required by the GPL. If you do not delete # the provisions above, a recipient may use your version of this file under @@ -67,26 +67,25 @@ YANGSPECS += ietf-origin@2018-02-14.yang YANGSPECS += ietf-netconf-with-defaults@2011-06-01.yang YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang -# in draft-ietf-netconf-list-pagination-04.html -YANGSPECS += ietf-list-pagination@2024-07-08.yang -# in draft-ietf-netconf-list-pagination-nc-04 -YANGSPECS += ietf-list-pagination-nc@2024-07-08.yang +# IETF list-pagination drafts +YANGSPECS += ietf-list-pagination@2024-10-21.yang +YANGSPECS += ietf-list-pagination-nc@2024-10-21.yang -all: +all: clean: distclean: clean rm -f Makefile *~ .depend -install: $(YANGSPECS) +install: $(YANGSPECS) install -d -m 0755 $(DESTDIR)$(YANG_INSTALLDIR) install -m 0644 $(YANGSPECS) $(DESTDIR)$(YANG_INSTALLDIR) uninstall: (cd $(DESTDIR)$(YANG_INSTALLDIR); rm -rf *.yang) -install-include: +install-include: depend: