Formatting, whitespace
This commit is contained in:
parent
f26ea043c7
commit
411f509fd8
19 changed files with 288 additions and 288 deletions
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
|
|
@ -597,8 +597,8 @@ netconf_application_rpc(clixon_handle h,
|
||||||
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;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 */
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -546,6 +546,7 @@ xml2ns(cxobj *x,
|
||||||
|
|
||||||
/*! Recursively check prefix / namespaces (and populate ns cache)
|
/*! Recursively check prefix / namespaces (and populate ns cache)
|
||||||
*
|
*
|
||||||
|
* @param[in] xt XML node
|
||||||
* @retval 1 OK
|
* @retval 1 OK
|
||||||
* @retval 0 (Some) prefix not found
|
* @retval 0 (Some) prefix not found
|
||||||
* @retval -1 Error
|
* @retval -1 Error
|
||||||
|
|
|
||||||
|
|
@ -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");
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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:
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue