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

Fixed Debug -D msg: dont show length in detailed debug

Browse source
This commit is contained in:
Olof hagsand 2024-11-27 10:55:34 +01:00
parent 4c57edfc57
commit be5a7c418a
5 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/backend/backend_client.c
View file

@ -739,7 +739,7 @@ from_client_edit_config(clixon_handle h,
} }
/* Clixon extension: copy */ /* Clixon extension: copy */
if ((attr = xml_find_value(xn, "copystartup")) != NULL && if ((attr = xml_find_value(xn, "copystartup")) != NULL &&
strcmp(attr,"true") == 0){ strcmp(attr, "true") == 0){
if (xmldb_copy(h, "running", "startup") < 0){ if (xmldb_copy(h, "running", "startup") < 0){
if (netconf_operation_failed(cbret, "application", clixon_err_reason())< 0) if (netconf_operation_failed(cbret, "application", clixon_err_reason())< 0)
goto done; goto done;

2
apps/netconf/netconf_main.c
View file

@ -476,7 +476,7 @@ netconf_input_cb(int s,
cbmsg = NULL; cbmsg = NULL;
break; break;
} }
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv ext: %s", cbuf_get(cbmsg));
else else
clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg)); clixon_debug(CLIXON_DBG_MSG, "Recv ext len: %lu", cbuf_len(cbmsg));

9
lib/clixon/clixon_debug.h
View file

@ -139,6 +139,7 @@ int clixon_debug_init(clixon_handle h, int dbglevel);
int clixon_debug_get(void); int clixon_debug_get(void);
int clixon_debug_fn(clixon_handle h, const char *fn, const int line, int dbglevel, cxobj *x, const char *format, ...) __attribute__ ((format (printf, 6, 7))); int clixon_debug_fn(clixon_handle h, const char *fn, const int line, int dbglevel, cxobj *x, const char *format, ...) __attribute__ ((format (printf, 6, 7)));
/* Is subject set ? */
static inline int clixon_debug_isset(unsigned n) static inline int clixon_debug_isset(unsigned n)
{ {
unsigned level = clixon_debug_get(); unsigned level = clixon_debug_get();
@ -151,4 +152,12 @@ static inline int clixon_debug_isset(unsigned n)
return ((level & CLIXON_DBG_DMASK) >= detail); return ((level & CLIXON_DBG_DMASK) >= detail);
} }
/* Is detail set ?, return detail level 0-7 */
static inline int clixon_debug_detail()
{
unsigned level = clixon_debug_get();
return (level & CLIXON_DBG_DMASK) >> CLIXON_DBG_DSHIFT;
}
#endif /* _CLIXON_DEBUG_H_ */ #endif /* _CLIXON_DEBUG_H_ */

2
lib/src/clixon_netconf_lib.c
View file

@ -2203,7 +2203,7 @@ netconf_output(int s,
char *buf = cbuf_get(cb); char *buf = cbuf_get(cb);
int len = cbuf_len(cb); int len = cbuf_len(cb);
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send ext: %s", cbuf_get(cb));
else else
clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb)); clixon_debug(CLIXON_DBG_MSG, "Send ext len: %lu", cbuf_len(cb));

12
lib/src/clixon_proto.c
View file

@ -354,13 +354,13 @@ clixon_msg_send(int s,
int retval = -1; int retval = -1;
if (descr){ if (descr){
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send [%s] %s", descr, cbuf_get(cb));
else else
clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb)); clixon_debug(CLIXON_DBG_MSG, "Send [%s] len: %lu", descr, cbuf_len(cb));
} }
else{ else{
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Send %s", cbuf_get(cb));
else else
clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb)); clixon_debug(CLIXON_DBG_MSG, "Send len: %lu", cbuf_len(cb));
@ -437,13 +437,13 @@ clixon_msg_rcv10(int s,
} }
else { else {
if (descr){ if (descr){
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cb));
else else
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb)); clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cb));
} }
else{ else{
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cb));
else else
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb)); clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cb));
@ -620,13 +620,13 @@ clixon_msg_rcv11(int s,
} }
else { else {
if (descr){ if (descr){
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv [%s]: %s", descr, cbuf_get(cbmsg));
else else
clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg)); clixon_debug(CLIXON_DBG_MSG, "Recv [%s] len: %lu", descr, cbuf_len(cbmsg));
} }
else{ else{
if (clixon_debug_isset(CLIXON_DBG_DETAIL)) if (clixon_debug_detail())
clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg)); clixon_debug(CLIXON_DBG_MSG | CLIXON_DBG_DETAIL, "Recv: %s", cbuf_get(cbmsg));
else else
clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg)); clixon_debug(CLIXON_DBG_MSG, "Recv len: %lu", cbuf_len(cbmsg));