diff options
| author | Michael Biebl <biebl@debian.org> | 2014-08-18 17:48:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2014-08-18 17:48:21 +0200 |
| commit | edb958301d8c162cb21278d01d802026a1e1afe7 (patch) | |
| tree | c0a155296fcfb56c4d2a14adadbe2443eb6947c3 /runtime/msg.h | |
| parent | b8bc384c9ff7e258d2d26511302f6feb3e4f5e00 (diff) | |
| parent | 1dfcd909d90f6fad4a612b6fd998d7473a9da399 (diff) | |
| download | rsyslog-edb958301d8c162cb21278d01d802026a1e1afe7.tar.gz | |
Merge tag 'upstream/8.4.0'
Upstream version 8.4.0
Diffstat (limited to 'runtime/msg.h')
| -rw-r--r-- | runtime/msg.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/msg.h b/runtime/msg.h index 2d3e995..ec22545 100644 --- a/runtime/msg.h +++ b/runtime/msg.h @@ -177,12 +177,12 @@ void MsgSetRcvFrom(msg_t *pMsg, prop_t*); void MsgSetRcvFromStr(msg_t *const pMsg, const uchar* pszRcvFrom, const int, prop_t **); rsRetVal MsgSetRcvFromIP(msg_t *pMsg, prop_t*); rsRetVal MsgSetRcvFromIPStr(msg_t *const pThis, const uchar *psz, const int len, prop_t **ppProp); -void MsgSetHOSTNAME(msg_t *pMsg, uchar* pszHOSTNAME, int lenHOSTNAME); +void MsgSetHOSTNAME(msg_t *pMsg, const uchar* pszHOSTNAME, const int lenHOSTNAME); rsRetVal MsgSetAfterPRIOffs(msg_t *pMsg, short offs); void MsgSetMSGoffs(msg_t *pMsg, short offs); void MsgSetRawMsgWOSize(msg_t *pMsg, char* pszRawMsg); -void MsgSetRawMsg(msg_t *pMsg, char* pszRawMsg, size_t lenMsg); -rsRetVal MsgReplaceMSG(msg_t *pThis, uchar* pszMSG, int lenMSG); +void MsgSetRawMsg(msg_t *pMsg, const char* pszRawMsg, size_t lenMsg); +rsRetVal MsgReplaceMSG(msg_t *pThis, const uchar* pszMSG, int lenMSG); uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, msgPropDescr_t *pProp, rs_size_t *pPropLen, unsigned short *pbMustBeFreed, struct syslogTime *ttNow); uchar *getRcvFrom(msg_t *pM); @@ -193,6 +193,8 @@ void getRawMsg(msg_t *pM, uchar **pBuf, int *piLen); rsRetVal msgAddJSON(msg_t *pM, uchar *name, struct json_object *json); rsRetVal MsgGetSeverity(msg_t *pThis, int *piSeverity); rsRetVal MsgDeserialize(msg_t *pMsg, strm_t *pStrm); +rsRetVal MsgSetPropsViaJSON(msg_t *__restrict__ const pMsg, const uchar *__restrict__ const json); +const uchar* msgGetJSONMESG(msg_t *__restrict__ const pMsg); /* TODO: remove these five (so far used in action.c) */ uchar *getMSG(msg_t *pM); |