rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 07:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

milestone/mmnormalize: support configurable cookies and target containers

Browse Source 
code looks ok and compiles, but has NOT yet undergone real testing
This commit is contained in:
Rainer Gerhards 2014-07-15 14:29:53 +02:00
parent eb1517e107
commit 00abf92b4c
1 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
plugins/mmjsonparse/mmjsonparse.c
View File

@ -58,7 +58,9 @@ DEFobjCurrIf(errmsg);
DEF_OMOD_STATIC_DATA
typedef struct _instanceData {
int dummy; /* not needed, but some compilers do not support empty structs */
char *cookie;
uchar *container;
int lenCookie;
/* REMOVE dummy when real data items are to be added! */
} instanceData;
@ -73,6 +75,19 @@ struct modConfData_s {
static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current exec process */
/* tables for interfacing with the v6 config system */
/* action (instance) parameters */
static struct cnfparamdescr actpdescr[] = {
{ "cookie", eCmdHdlrString, 0 },
{ "container", eCmdHdlrString, 0 }
};
static struct cnfparamblk actpblk =
{ CNFPARAMBLK_VERSION,
sizeof(actpdescr)/sizeof(struct cnfparamdescr),
actpdescr
};
BEGINbeginCnfLoad
CODESTARTbeginCnfLoad
@ -100,6 +115,10 @@ ENDfreeCnf
BEGINcreateInstance
CODESTARTcreateInstance
CHKmalloc(pData->container = (uchar*)strdup("!"));
CHKmalloc(pData->cookie = strdup("@cee:"));
pData->lenCookie = strlen(pData->cookie);
finalize_it:
ENDcreateInstance
BEGINcreateWrkrInstance
@ -121,6 +140,8 @@ ENDisCompatibleWithFeature
BEGINfreeInstance
CODESTARTfreeInstance
free(pData->cookie);
free(pData->container);
ENDfreeInstance
BEGINfreeWrkrInstance
@ -183,15 +204,15 @@ finalize_it:
RETiRet;
}
#define COOKIE "@cee:"
#define LEN_COOKIE (sizeof(COOKIE)-1)
BEGINdoAction
msg_t *pMsg;
uchar *buf;
int bSuccess = 0;
struct json_object *jval;
struct json_object *json;
instanceData *pData;
CODESTARTdoAction
pData = pWrkrData->pData;
pMsg = (msg_t*) ppString[0];
/* note that we can performance-optimize the interface, but this also
* requires changes to the libraries. For now, we accept message
@ -203,11 +224,11 @@ CODESTARTdoAction
++buf;
}
if(*buf == '\0' || strncmp((char*)buf, COOKIE, LEN_COOKIE)) {
if(*buf == '\0' || strncmp((char*)buf, pData->cookie, pData->lenCookie)) {
DBGPRINTF("mmjsonparse: no JSON cookie: '%s'\n", buf);
ABORT_FINALIZE(RS_RET_NO_CEE_MSG);
}
buf += LEN_COOKIE;
buf += pData->lenCookie;
CHKiRet(processJSON(pWrkrData, pMsg, (char*) buf, strlen((char*)buf)));
bSuccess = 1;
finalize_it:
@ -216,27 +237,54 @@ finalize_it:
json = json_object_new_object();
jval = json_object_new_string((char*)buf);
json_object_object_add(json, "msg", jval);
msgAddJSON(pMsg, (uchar*)"!", json);
msgAddJSON(pMsg, pData->container, json);
iRet = RS_RET_OK;
}
MsgSetParseSuccess(pMsg, bSuccess);
ENDdoAction
static inline void
setInstParamDefaults(instanceData *pData)
{
pData->cookie = NULL;
}
BEGINnewActInst
struct cnfparamvals *pvals;
int i;
CODESTARTnewActInst
/* Note: we currently do not have any parameters, so we do not need
* the lst ptr. However, we will most probably need params in the
* future.
*/
DBGPRINTF("newActInst (mmjsonparse)\n");
if((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
}
CODE_STD_STRING_REQUESTnewActInst(1)
CHKiRet(OMSRsetEntry(*ppOMSR, 0, NULL, OMSR_TPL_AS_MSG));
CHKiRet(createInstance(&pData));
/*setInstParamDefaults(pData);*/
setInstParamDefaults(pData);
for(i = 0 ; i < actpblk.nParams ; ++i) {
if(!pvals[i].bUsed)
continue;
if(!strcmp(actpblk.descr[i].name, "cookie")) {
free(pData->cookie);
pData->cookie = es_str2cstr(pvals[i].val.d.estr, NULL);
} else if(!strcmp(actpblk.descr[i].name, "container")) {
free(pData->container);
pData->container = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
} else {
dbgprintf("mmjsonparse: program error, non-handled param '%s'\n", actpblk.descr[i].name);
}
}
if(pData->container == NULL)
CHKmalloc(pData->container = (uchar*) strdup("!"));
if(pData->cookie == NULL)
CHKmalloc(pData->cookie = strdup("@cee:"));
pData->lenCookie = strlen(pData->cookie);
CODE_STD_FINALIZERnewActInst
/* cnfparamvalsDestruct(pvals, &actpblk);*/
cnfparamvalsDestruct(pvals, &actpblk);
ENDnewActInst
BEGINparseSelectorAct