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

fix rawmsg-after-pri property

Browse Source 
The index offAfterPRI inside the message object is supposed
to point to the first char in rawmsgs after PRI. Unfortunately,
it seems NOT to be correct/consistent in all cases. imuxsock
and imudp seem to have other values than imptcp. Testbench
covers some of that. As a work-around, we caluculate
the value ourselfes.
This commit is contained in:
Rainer Gerhards 2015-10-09 16:53:02 +02:00
parent 2bb8762053
commit d22d760c0c
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/msg.c
View File

@ -1580,8 +1580,23 @@ getRawMsgAfterPRI(msg_t * const pM, uchar **pBuf, int *piLen)
*pBuf= UCHAR_CONSTANT("");
*piLen = 0;
} else {
*pBuf = pM->pszRawMsg + pM->offAfterPRI;
*piLen = pM->iLenRawMsg - pM->offAfterPRI;
/* unfortunately, pM->offAfterPRI seems NOT to be
* correct/consistent in all cases. imuxsock and imudp
* seem to have other values than imptcp. Testbench
* covers some of that. As a work-around, we caluculate
* the value ourselfes here. -- rgerhards, 2015-10-09
*/
size_t offAfterPRI = 0;
if(pM->pszRawMsg[0] == '<') { /* do we have a PRI? */
if(pM->pszRawMsg[2] == '>')
offAfterPRI = 3;
else if(pM->pszRawMsg[3] == '>')
offAfterPRI = 4;
else if(pM->pszRawMsg[4] == '>')
offAfterPRI = 5;
}
*pBuf = pM->pszRawMsg + offAfterPRI;
*piLen = pM->iLenRawMsg - offAfterPRI;
}
}
}