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

clixon-config@2024-01-01.yang: Changed semantics of CLICON_VALIDATE_STATE_XML

Browse source 
Minor optimizations
This commit is contained in:
Olof hagsand 2024-02-22 09:23:09 +01:00
parent a8773fad82
commit 278def125c
6 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/src/clixon_log.c
View file

@ -254,7 +254,7 @@ flogtime(FILE *f)
gettimeofday(&tv, NULL);
localtime_r((time_t*)&tv.tv_sec, &tm);
fprintf(f, "%s %2d %02d:%02d:%02d.%06d: ",
fprintf(f, "%s %2d %02d:%02d:%02d.%06ld: ",
mon2name(tm.tm_mon), tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec,
tv.tv_usec);

4
lib/src/clixon_plugin.c
View file

@ -1292,7 +1292,9 @@ rpc_callback_call(clixon_handle h,
rc = NEXTQ(rpc_callback_t *, rc);
} while (rc != ms->ms_rpc_callbacks);
/* action reply checked in action_callback_call */
if (nr && !xml_rpc_isaction(xe)){
if (nr &&
clicon_option_bool(h, "CLICON_VALIDATE_STATE_XML") &&
!xml_rpc_isaction(xe)){
if ((ret = rpc_reply_check(h, name, cbret)) < 0)
goto done;
if (ret == 0)

10
lib/src/clixon_yang.c
View file

@ -3537,14 +3537,18 @@ yang_config(yang_stmt *ys)
int
yang_config_ancestor(yang_stmt *ys)
{
yang_stmt *yp;
yang_stmt *yp;
enum rfc_6020 keyw;
yp = ys;
do {
if (yang_flag_get(yp, YANG_FLAG_STATE_LOCAL) != 0)
return 0;
else if (yang_keyword_get(yp) == Y_INPUT || yang_keyword_get(yp) == Y_OUTPUT || yang_keyword_get(yp) == Y_NOTIFICATION){
return 0;
else {
keyw = yang_keyword_get(yp);
if (keyw == Y_INPUT || keyw == Y_OUTPUT || keyw == Y_NOTIFICATION){
return 0;
}
}
} while((yp = yang_parent_get(yp)) != NULL);
return 1;