Skip to content

Commit

Permalink
log_systemd: clang-format for coherent indentation and coding style
Browse files Browse the repository at this point in the history
  • Loading branch information
@linuxmaniac
linuxmaniac committed May 18, 2023
1 parent a1a2f82 commit 73972a7
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 78 deletions.
64 changes: 28 additions & 36 deletions src/modules/log_systemd/journal_send.c
View file
Expand Up @@ -38,86 +38,78 @@ int k_sd_journal_send_xavp(str *rname)

rxavp = xavp_get(rname, NULL);

if (!rxavp || rxavp->val.type != SR_XTYPE_XAVP) {
if(!rxavp || rxavp->val.type != SR_XTYPE_XAVP) {
LM_ERR("not a valid xavp: %.*s?\n", rname->len, rname->s);
return -1;
}

/* first, count xavp nodes */
for (nxavp = rxavp->val.v.xavp, cnt = 0;
nxavp;
nxavp = nxavp->next, cnt++);
for(nxavp = rxavp->val.v.xavp, cnt = 0; nxavp; nxavp = nxavp->next, cnt++)
;

if (cnt == 0) {
if(cnt == 0) {
/* nothing to log? */
LM_NOTICE("empty xavp: %.*s?, no log event was sent to journald\n",
rname->len,
rname->s);
rname->len, rname->s);
return 1;
}

logv = pkg_malloc(cnt * sizeof (struct iovec));
logv = pkg_malloc(cnt * sizeof(struct iovec));

if (!logv) {
if(!logv) {
LM_ERR("failed to allocate pkg memory\n");
return -1;
}

ret = -1;

for (nxavp = rxavp->val.v.xavp, cnt = 0;
nxavp;
nxavp = nxavp->next, cnt++)
{
if (nxavp->val.type == SR_XTYPE_LONG) {
buflen = snprintf(NULL, 0,
"%.*s=%ld",
nxavp->name.len, nxavp->name.s,
nxavp->val.v.l);
logv[cnt].iov_base = pkg_malloc(buflen + 1/*snprintf's trailing \0*/);
if (!logv[cnt].iov_base ) {
for(nxavp = rxavp->val.v.xavp, cnt = 0; nxavp; nxavp = nxavp->next, cnt++) {
if(nxavp->val.type == SR_XTYPE_LONG) {
buflen = snprintf(NULL, 0, "%.*s=%ld", nxavp->name.len,
nxavp->name.s, nxavp->val.v.l);
logv[cnt].iov_base =
pkg_malloc(buflen + 1 /*snprintf's trailing \0*/);
if(!logv[cnt].iov_base) {
LM_ERR("failed to allocate pkg memory\n");
goto free;
}
logv[cnt].iov_len = buflen;

snprintf(logv[cnt].iov_base, buflen + 1,
"%.*s=%ld",
nxavp->name.len, nxavp->name.s,
nxavp->val.v.l);
} else if (nxavp->val.type == SR_XTYPE_STR) {
snprintf(logv[cnt].iov_base, buflen + 1, "%.*s=%ld",
nxavp->name.len, nxavp->name.s, nxavp->val.v.l);
} else if(nxavp->val.type == SR_XTYPE_STR) {
buflen = nxavp->name.len + 1 + nxavp->val.v.s.len;
logv[cnt].iov_base = pkg_malloc(buflen);
if (!logv[cnt].iov_base) {
if(!logv[cnt].iov_base) {
LM_ERR("failed to allocate pkg memory\n");
goto free;
}
logv[cnt].iov_len = buflen;

memcpy(logv[cnt].iov_base, nxavp->name.s, nxavp->name.len);
((char*)logv[cnt].iov_base)[nxavp->name.len] = '=';
memcpy(((char*)(logv[cnt].iov_base)) + nxavp->name.len + 1,
nxavp->val.v.s.s,
nxavp->val.v.s.len);
((char *)logv[cnt].iov_base)[nxavp->name.len] = '=';
memcpy(((char *)(logv[cnt].iov_base)) + nxavp->name.len + 1,
nxavp->val.v.s.s, nxavp->val.v.s.len);
} else {
LM_NOTICE("unsupported type %d for field %.*s, skipped...\n",
nxavp->val.type,
nxavp->name.len, nxavp->name.s);
nxavp->val.type, nxavp->name.len, nxavp->name.s);
logv[cnt].iov_len = 0;
logv[cnt].iov_base = NULL;
}
LM_DBG("added io slice %d: %.*s\n", cnt, (int)logv[cnt].iov_len, (char*)logv[cnt].iov_base);
LM_DBG("added io slice %d: %.*s\n", cnt, (int)logv[cnt].iov_len,
(char *)logv[cnt].iov_base);
}

if (sd_journal_sendv(logv, cnt) != 0) {
if(sd_journal_sendv(logv, cnt) != 0) {
LM_ERR("sd_journal_sendv() failed\n");
} else {
ret = 1;
}

free:
for (i = 0 ; i < cnt ; i++) {
if (logv[i].iov_base) pkg_free(logv[i].iov_base);
for(i = 0; i < cnt; i++) {
if(logv[i].iov_base)
pkg_free(logv[i].iov_base);
}
pkg_free(logv);
return ret;
Expand Down
87 changes: 45 additions & 42 deletions src/modules/log_systemd/log_systemd_mod.c
View file
Expand Up @@ -39,37 +39,34 @@ MODULE_VERSION
static int _lc_log_systemd = 0;
void _lc_core_log_systemd(int lpriority, const char *format, ...);

static int mod_init(void);
static int child_init(int);
static int mod_init(void);
static int child_init(int);
static void mod_destroy(void);

static int w_sd_journal_print(struct sip_msg* msg, char* lev, char* txt);
static int w_sd_journal_send_xavp(struct sip_msg* msg, char* xname, char*);
static int w_sd_journal_print(struct sip_msg *msg, char *lev, char *txt);
static int w_sd_journal_send_xavp(struct sip_msg *msg, char *xname, char *);


static cmd_export_t cmds[]={
{"sd_journal_print", (cmd_function)w_sd_journal_print, 2, fixup_spve_spve,
0, ANY_ROUTE},
{"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1, fixup_spve_spve,
0, ANY_ROUTE},
{0, 0, 0, 0, 0, 0}
};
static cmd_export_t cmds[] = {
{"sd_journal_print", (cmd_function)w_sd_journal_print, 2,
fixup_spve_spve, 0, ANY_ROUTE},
{"sd_journal_send_xavp", (cmd_function)w_sd_journal_send_xavp, 1,
fixup_spve_spve, 0, ANY_ROUTE},
{0, 0, 0, 0, 0, 0}};

static param_export_t params[]={
{0, 0, 0}
};
static param_export_t params[] = {{0, 0, 0}};

struct module_exports exports = {
"log_systemd", /* module name */
DEFAULT_DLFLAGS, /* dlopen flags */
cmds, /* cmd (cfg function) exports */
params, /* param exports */
0, /* RPC method exports */
0, /* pseudo-variables exports */
0, /* response handling function */
mod_init, /* module init function */
child_init, /* per-child init function */
mod_destroy /* module destroy function */
"log_systemd", /* module name */
DEFAULT_DLFLAGS, /* dlopen flags */
cmds, /* cmd (cfg function) exports */
params, /* param exports */
0, /* RPC method exports */
0, /* pseudo-variables exports */
0, /* response handling function */
mod_init, /* module init function */
child_init, /* per-child init function */
mod_destroy /* module destroy function */
};

/**
Expand Down Expand Up @@ -97,26 +94,32 @@ static void mod_destroy(void)
/**
*
*/
static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt)
static int ki_sd_journal_print(sip_msg_t *msg, str *slev, str *stxt)
{
int ilev;

/* one of LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR, LOG_WARNING,
* LOG_NOTICE, LOG_INFO, LOG_DEBUG, as defined in syslog.h, see syslog(3) */
ilev = LOG_DEBUG;
if(slev->len==9 && strncasecmp(slev->s, "LOG_EMERG", slev->len)==0) {
if(slev->len == 9 && strncasecmp(slev->s, "LOG_EMERG", slev->len) == 0) {
ilev = LOG_EMERG;
} else if(slev->len==9 && strncasecmp(slev->s, "LOG_ALERT", slev->len)==0) {
} else if(slev->len == 9
&& strncasecmp(slev->s, "LOG_ALERT", slev->len) == 0) {
ilev = LOG_ALERT;
} else if(slev->len==8 && strncasecmp(slev->s, "LOG_CRIT", slev->len)==0) {
} else if(slev->len == 8
&& strncasecmp(slev->s, "LOG_CRIT", slev->len) == 0) {
ilev = LOG_CRIT;
} else if(slev->len==7 && strncasecmp(slev->s, "LOG_ERR", slev->len)==0) {
} else if(slev->len == 7
&& strncasecmp(slev->s, "LOG_ERR", slev->len) == 0) {
ilev = LOG_ERR;
} else if(slev->len==11 && strncasecmp(slev->s, "LOG_WARNING", slev->len)==0) {
} else if(slev->len == 11
&& strncasecmp(slev->s, "LOG_WARNING", slev->len) == 0) {
ilev = LOG_WARNING;
} else if(slev->len==10 && strncasecmp(slev->s, "LOG_NOTICE", slev->len)==0) {
} else if(slev->len == 10
&& strncasecmp(slev->s, "LOG_NOTICE", slev->len) == 0) {
ilev = LOG_NOTICE;
} else if(slev->len==8 && strncasecmp(slev->s, "LOG_INFO", slev->len)==0) {
} else if(slev->len == 8
&& strncasecmp(slev->s, "LOG_INFO", slev->len) == 0) {
ilev = LOG_INFO;
}

Expand All @@ -125,25 +128,25 @@ static int ki_sd_journal_print(sip_msg_t* msg, str* slev, str* stxt)
return 1;
}

static int w_sd_journal_print(struct sip_msg* msg, char* lev, char* txt)
static int w_sd_journal_print(struct sip_msg *msg, char *lev, char *txt)
{
str slev;
str stxt;

if(fixup_get_svalue(msg, (gparam_t*)lev, &slev)!=0) {
if(fixup_get_svalue(msg, (gparam_t *)lev, &slev) != 0) {
LM_ERR("unable to get level parameter\n");
return -1;
}

if(fixup_get_svalue(msg, (gparam_t*)txt, &stxt)!=0) {
if(fixup_get_svalue(msg, (gparam_t *)txt, &stxt) != 0) {
LM_ERR("unable to get text parameter\n");
return -1;
}

return ki_sd_journal_print(msg, &slev, &stxt);
}

#define LC_LOG_MSG_MAX_SIZE 16384
#define LC_LOG_MSG_MAX_SIZE 16384
void _lc_core_log_systemd(int lpriority, const char *format, ...)
{
va_list arglist;
Expand All @@ -156,24 +159,24 @@ void _lc_core_log_systemd(int lpriority, const char *format, ...)

va_start(arglist, format);
n = 0;
n += vsnprintf(obuf+n, LC_LOG_MSG_MAX_SIZE - n, format, arglist);
n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist);
va_end(arglist);
sd_journal_print(priority, "%.*s", n, obuf);
}

static int w_sd_journal_send_xavp(struct sip_msg* msg, char* xname, char* foo)
static int w_sd_journal_send_xavp(struct sip_msg *msg, char *xname, char *foo)
{
str sxname;

if(fixup_get_svalue(msg, (gparam_t*)xname, &sxname)!=0) {
if(fixup_get_svalue(msg, (gparam_t *)xname, &sxname) != 0) {
LM_ERR("unable to get xname parameter\n");
return -1;
}

return k_sd_journal_send_xavp(&sxname);
}

static int ki_sd_journal_send_xavp(sip_msg_t* msg, str* xname)
static int ki_sd_journal_send_xavp(sip_msg_t *msg, str *xname)
{
return k_sd_journal_send_xavp(xname);
}
Expand All @@ -200,10 +203,10 @@ static sr_kemi_t sr_kemi_log_systemd_exports[] = {

int mod_register(char *path, int *dlflags, void *p1, void *p2)
{
if(_km_log_engine_type==0)
if(_km_log_engine_type == 0)
return 0;

if(strcasecmp(_km_log_engine_type, "systemd")!=0)
if(strcasecmp(_km_log_engine_type, "systemd") != 0)
return 0;

km_log_func_set(&_lc_core_log_systemd);
Expand Down

0 comments on commit 73972a7

Please sign in to comment.