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

Restconf: Notify ssl version on start

Browse source 
SNMP: rm unused variables
This commit is contained in:
Olof hagsand 2024-09-15 11:34:28 +02:00
parent cc194ac7c5
commit f1d9e26755
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/restconf/restconf_main_native.c
View file

@ -1249,7 +1249,8 @@ main(int argc,
goto done; goto done;
#endif #endif
clixon_debug_init(h, dbg); clixon_debug_init(h, dbg);
clixon_log(h, LOG_NOTICE, "%s native %u Started", __PROGRAM__, getpid()); clixon_log(h, LOG_NOTICE, "%s native %u Started, SSL version:%lx", __PROGRAM__, getpid(), OPENSSL_VERSION_NUMBER);
if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){ if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){
clixon_err(OE_DAEMON, errno, "Setting signal"); clixon_err(OE_DAEMON, errno, "Setting signal");
goto done; goto done;

1
apps/snmp/snmp_main.c
View file

@ -108,7 +108,6 @@ clixon_snmp_sig_term(int arg)
static int static int
snmp_terminate(clixon_handle h) snmp_terminate(clixon_handle h)
{ {
yang_stmt *yspec;
cvec *nsctx; cvec *nsctx;
cxobj *x = NULL; cxobj *x = NULL;
char *pidfile = clicon_snmp_pidfile(h); char *pidfile = clicon_snmp_pidfile(h);

5
apps/snmp/snmp_stream.c
View file

@ -83,7 +83,6 @@ get_oid_for_yang_node(yang_stmt *ys,
int retval = -1; int retval = -1;
int exist = 0; int exist = 0;
char *oidstr = NULL; char *oidstr = NULL;
char *path;
yang_stmt *ytype; yang_stmt *ytype;
yang_stmt *ypath; yang_stmt *ypath;
yang_stmt *yref; yang_stmt *yref;
@ -293,7 +292,6 @@ snmp_stream_cb(int s,
int eof; int eof;
cxobj *xtop = NULL; /* top xml */ cxobj *xtop = NULL; /* top xml */
cxobj *xncont = NULL; /* notification content xml */ cxobj *xncont = NULL; /* notification content xml */
cxobj *xn; /* notification xml */
cbuf *cbmsg = NULL; cbuf *cbmsg = NULL;
int ret; int ret;
@ -321,8 +319,6 @@ snmp_stream_cb(int s,
goto done; goto done;
} }
} }
ok:
retval = 0; retval = 0;
done: done:
clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval); clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval);
@ -372,7 +368,6 @@ snmp_stream_subscribe(clixon_handle h,
} }
*socket = s; *socket = s;
retval = 0; retval = 0;
done: done:
clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval); clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval);
if (xret) if (xret)

5
test/test_restconf_plain_patch.sh
View file

@ -197,8 +197,9 @@ wait_restconf
new "Create album London Calling with PUT" new "Create album London Calling with PUT"
expectpart "$(curl -u andy:bar $CURLOPTS -X PUT -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Clash/album=London%20Calling -d '{"example-jukebox:album":{"name":"London Calling"}}')" 0 "HTTP/$HVER 201" expectpart "$(curl -u andy:bar $CURLOPTS -X PUT -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Clash/album=London%20Calling -d '{"example-jukebox:album":{"name":"London Calling"}}')" 0 "HTTP/$HVER 201"
new "The message-body for a plain patch MUST be present" #new "The message-body for a plain patch MUST be present"
expectpart "$(curl -u andy:bar $CURLOPTS -X PATCH -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Beatles -d '')" 0 "HTTP/$HVER 400" # XXX Hangs in SSL 3.3.2
#expectpart "$(curl -u andy:bar $CURLOPTS -X PATCH -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Beatles -d '')" 0 "HTTP/$HVER 400" kalle
# Plain patch can be used to create or update, but not delete, a child # Plain patch can be used to create or update, but not delete, a child
# resource within the target resource. # resource within the target resource.