diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-23 18:05:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-23 18:05:07 +0100 |
| commit | 01405d78f4a8c090d5abe37380d60cff252efdc6 (patch) | |
| tree | 6fcbe263118c29488da28cb1a5893f89cad804a9 /plugins/imklog/imklog.c | |
| parent | ef34821a2737799f48c3032b9616418e4f7fa34f (diff) | |
| download | rsyslog-01405d78f4a8c090d5abe37380d60cff252efdc6.tar.gz rsyslog-01405d78f4a8c090d5abe37380d60cff252efdc6.tar.bz2 rsyslog-01405d78f4a8c090d5abe37380d60cff252efdc6.zip | |
refactored imklog linux driver, now combined with BSD driver
The Linux driver no longer supports outdated kernel symbol resolution,
which was disabled by default for very long. Also overall cleanup,
resulting in much smaller code. Linux and BSD are now covered by a
single small driver.
Diffstat (limited to 'plugins/imklog/imklog.c')
| -rw-r--r-- | plugins/imklog/imklog.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index cb28e68e..40249273 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -200,15 +200,14 @@ rsRetVal Syslog(int priority, uchar *pMsg, struct timeval *tp) DEFiRet; /* then check if we have two PRIs. This can happen in case of systemd, - * in which case the second PRI is the rigth one. - * TODO: added kernel timestamp support to this PoC. -- rgerhards, 2011-03-18 + * in which case the second PRI is the right one. */ - if(pMsg[3] == '<') { /* could be a pri... */ - uchar *pMsgTmp = pMsg + 3; + if(pMsg[3] == '<' || (pMsg[3] == ' ' && pMsg[4] == '<')) { /* could be a pri... */ + uchar *pMsgTmp = pMsg + ((pMsg[3] == '<') ? 3 : 4); localRet = parsePRI(&pMsgTmp, &pri); if(localRet == RS_RET_OK && pri >= 8 && pri <= 192) { /* *this* is our PRI */ - DBGPRINTF("imklog detected secondary PRI in klog msg\n"); + DBGPRINTF("imklog detected secondary PRI(%d) in klog msg\n", pri); pMsg = pMsgTmp; priority = pri; } |