diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-23 12:15:15 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-23 12:15:15 +0200 |
| commit | d5f3ab3117e56136dbef2fc974916fc991b02fec (patch) | |
| tree | ef3d90b8768d57bba81ab73b7df0f228641b950d /runtime/msg.c | |
| parent | 9e040ff4596a1791c7cd8e99ba9f77f455881167 (diff) | |
| download | rsyslog-d5f3ab3117e56136dbef2fc974916fc991b02fec.tar.gz rsyslog-d5f3ab3117e56136dbef2fc974916fc991b02fec.tar.bz2 rsyslog-d5f3ab3117e56136dbef2fc974916fc991b02fec.zip | |
mmrfc5424addhmac milestone: do not process non-rfc5424 messages
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 03906070..47ff240f 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -377,13 +377,6 @@ MsgSetRulesetByName(msg_t *pMsg, cstr_t *rulesetName) rulesetGetRuleset(runConf, &(pMsg->pRuleset), rsCStrGetSzStrNoNULL(rulesetName)); } - -static inline int getProtocolVersion(msg_t *pM) -{ - return(pM->iProtocolVersion); -} - - /* do a DNS reverse resolution, if not already done, reflect status * rgerhards, 2009-11-16 */ @@ -1292,7 +1285,7 @@ static rsRetVal aquirePROCIDFromTAG(msg_t *pM) if(pM->pCSPROCID != NULL) return RS_RET_OK; /* we are already done ;) */ - if(getProtocolVersion(pM) != 0) + if(msgGetProtocolVersion(pM) != 0) return RS_RET_OK; /* we can only emulate if we have legacy format */ pszTag = (uchar*) ((pM->iLenTAG < CONF_TAG_BUFSIZE) ? pM->TAG.szBuf : pM->TAG.pszTAG); @@ -1975,7 +1968,7 @@ static inline void tryEmulateTAG(msg_t *pM, sbool bLockMutex) return; /* done, no need to emulate */ } - if(getProtocolVersion(pM) == 1) { + if(msgGetProtocolVersion(pM) == 1) { if(!strcmp(getPROCID(pM, MUTEX_ALREADY_LOCKED), "-")) { /* no process ID, use APP-NAME only */ MsgSetTAG(pM, (uchar*) getAPPNAME(pM, MUTEX_ALREADY_LOCKED), getAPPNAMELen(pM, MUTEX_ALREADY_LOCKED)); @@ -2145,7 +2138,7 @@ static void tryEmulateAPPNAME(msg_t *pM) if(pM->pCSAPPNAME != NULL) return; /* we are already done */ - if(getProtocolVersion(pM) == 0) { + if(msgGetProtocolVersion(pM) == 0) { /* only then it makes sense to emulate */ MsgSetAPPNAME(pM, (char*)getProgramName(pM, MUTEX_ALREADY_LOCKED)); } |