diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-01 08:46:20 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-01 08:46:20 +0100 |
| commit | b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf (patch) | |
| tree | 96a93ba0f76797fa9a52cccd18a3cfeab47250e6 /runtime | |
| parent | d1ccc0302653017782a59c3ff9e5f7e69811173e (diff) | |
| download | rsyslog-b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf.tar.gz rsyslog-b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf.tar.xz rsyslog-b9d3cdceabf91bc28f8f6d31cfe9332724e37bbf.zip | |
milestone: added mmnormalize (compiles, but untested)
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/msg.c | 2 | ||||
| -rw-r--r-- | runtime/msg.h | 3 | ||||
| -rw-r--r-- | runtime/rsyslog.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 82565f18..346389fc 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1198,7 +1198,7 @@ char *getProtocolVersionString(msg_t *pM) } -static inline void +void getRawMsg(msg_t *pM, uchar **pBuf, int *piLen) { if(pM == NULL) { diff --git a/runtime/msg.h b/runtime/msg.h index 4897959c..b699366e 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -33,6 +33,7 @@ #include "syslogd-types.h" #include "template.h" #include "atomic.h" +#include "libee/libee.h" /* rgerhards 2004-11-08: The following structure represents a @@ -105,6 +106,7 @@ struct msg { it obviously is solved in way or another...). */ struct syslogTime tRcvdAt;/* time the message entered this program */ struct syslogTime tTIMESTAMP;/* (parsed) value of the timestamp */ + struct ee_event *event; /**< libee event */ /* 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]; @@ -170,6 +172,7 @@ uchar *getRcvFrom(msg_t *pM); void getTAG(msg_t *pM, uchar **ppBuf, int *piLen); char *getTimeReported(msg_t *pM, enum tplFormatTypes eFmt); char *getPRI(msg_t *pMsg); +void getRawMsg(msg_t *pM, uchar **pBuf, int *piLen); /* TODO: remove these five (so far used in action.c) */ diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index c2f6463c..686b9ba1 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -346,6 +346,9 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_FILE_NOT_SPECIFIED = -2180, /**< file name not configured where this was required */ RS_RET_INVLD_CONF_OBJ= -2200, /**< invalid config object (e.g. $Begin conf statement) */ + RS_RET_ERR_LIBEE_INIT = -2201, /**< cannot obtain libee ctx */ + RS_RET_ERR_LIBLOGNORM_INIT = -2202,/**< cannot obtain liblognorm ctx */ + RS_RET_ERR_LIBLOGNORM_SAMPDB_LOAD = -2203,/**< liblognorm sampledb load failed */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |