diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-20 14:54:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-07-20 14:54:06 +0200 |
| commit | db5c9793205232b0c0e6ba4a85baec9e26e37264 (patch) | |
| tree | 9ab136c6554de454262b01c073978bb98e8704ad /runtime/msg.h | |
| parent | 3885eb7a350389c3f4dd823351ec3de34382615d (diff) | |
| parent | 58b5616b41cd2cacf0b3039c8ebbd204d8918201 (diff) | |
| download | rsyslog-db5c9793205232b0c0e6ba4a85baec9e26e37264.tar.gz rsyslog-db5c9793205232b0c0e6ba4a85baec9e26e37264.tar.bz2 rsyslog-db5c9793205232b0c0e6ba4a85baec9e26e37264.zip | |
Merge branch 'master-localvars'
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index 6faf066a..f9ffc5e3 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -108,6 +108,7 @@ struct msg { struct syslogTime tRcvdAt;/* time the message entered this program */ struct syslogTime tTIMESTAMP;/* (parsed) value of the timestamp */ struct json_object *json; + struct json_object *localvars; /* some fixed-size buffers to save malloc()/free() for frequently used fields (from the default templates) */ uchar szRawMsg[CONF_RAWMSG_BUFSIZE]; /* most messages are small, and these are stored here (without malloc/free!) */ uchar szHOSTNAME[CONF_HOSTNAME_BUFSIZE]; @@ -186,6 +187,7 @@ char *getPRI(msg_t *pMsg); void getRawMsg(msg_t *pM, uchar **pBuf, int *piLen); rsRetVal msgGetCEEVar(msg_t *pThis, cstr_t *propName, var_t **ppVar); es_str_t* msgGetCEEVarNew(msg_t *pMsg, char *name); +es_str_t* msgGetLocalVarNew(msg_t *pMsg, char *name); rsRetVal msgAddJSON(msg_t *pM, uchar *name, struct json_object *json); rsRetVal getCEEPropVal(msg_t *pM, es_str_t *propName, uchar **pRes, rs_size_t *buflen, unsigned short *pbMustBeFreed); rsRetVal MsgGetSeverity(msg_t *pThis, int *piSeverity); @@ -206,9 +208,10 @@ uchar *getRcvFrom(msg_t *pM); rsRetVal propNameToID(cstr_t *pCSPropName, propid_t *pPropID); uchar *propIDToName(propid_t propID); rsRetVal msgGetCEEPropJSON(msg_t *pM, es_str_t *propName, struct json_object **pjson); +rsRetVal msgGetLocalVarJSON(msg_t *pM, es_str_t *propName, struct json_object **pjson); rsRetVal msgSetJSONFromVar(msg_t *pMsg, uchar *varname, struct var *var); rsRetVal msgDelJSON(msg_t *pMsg, uchar *varname); -rsRetVal jsonFind(msg_t *pM, es_str_t *propName, struct json_object **jsonres); +rsRetVal jsonFind(struct json_object *jroot, es_str_t *propName, struct json_object **jsonres); static inline rsRetVal msgUnsetJSON(msg_t *pMsg, uchar *varname) { |