summaryrefslogtreecommitdiffstats
path: root/tools/pmrfc3164.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-25 14:23:02 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-25 14:23:02 +0100
commit3644fb4b8aa0e44c9ce8e32e04c518a538e57224 (patch)
treec9d9ca3c4a540735152a38df6e978165eb2514fb /tools/pmrfc3164.c
parentff0f04561286ba3635f128083b46501831368701 (diff)
downloadrsyslog-3644fb4b8aa0e44c9ce8e32e04c518a538e57224.zip
rsyslog-3644fb4b8aa0e44c9ce8e32e04c518a538e57224.tar.gz
rsyslog-3644fb4b8aa0e44c9ce8e32e04c518a538e57224.tar.xz
fully integrated parser fixes from v4.6.0
This also made necessary some parser test case updates. Acutally, the test case was wrong, but I did not notice that before.
Diffstat (limited to 'tools/pmrfc3164.c')
-rw-r--r--tools/pmrfc3164.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/pmrfc3164.c b/tools/pmrfc3164.c
index 5b684af..38f556a 100644
--- a/tools/pmrfc3164.c
+++ b/tools/pmrfc3164.c
@@ -77,12 +77,12 @@ BEGINparse
int bTAGCharDetected;
int i; /* general index for parsing */
uchar bufParseTAG[CONF_TAG_MAXSIZE];
- uchar bufParseHOSTNAME[CONF_TAG_HOSTNAME];
+ uchar bufParseHOSTNAME[CONF_HOSTNAME_MAXSIZE];
CODESTARTparse
dbgprintf("Message will now be parsed by the legacy syslog parser (one size fits all... ;)).\n");
assert(pMsg != NULL);
assert(pMsg->pszRawMsg != NULL);
- lenMsg = pMsg->iLenRawMsg - (pMsg->offAfterPRI + 1);
+ lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* note: offAfterPRI is already the number of PRI chars (do not add one!) */
p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI; /* point to start of text, after PRI */
setProtocolVersion(pMsg, 0);
@@ -140,12 +140,20 @@ CODESTARTparse
if(lenMsg > 0 && pMsg->msgFlags & PARSE_HOSTNAME) {
i = 0;
while(i < lenMsg && (isalnum(p2parse[i]) || p2parse[i] == '.' || p2parse[i] == '.'
- || p2parse[i] == '_' || p2parse[i] == '-') && i < CONF_TAG_MAXSIZE) {
+ || p2parse[i] == '_' || p2parse[i] == '-') && i < (CONF_HOSTNAME_MAXSIZE - 1)) {
bufParseHOSTNAME[i] = p2parse[i];
++i;
}
- if(i > 0 && p2parse[i] == ' ' && isalnum(p2parse[i-1])) {
+ if(i == lenMsg) {
+ /* we have a message that is empty immediately after the hostname,
+ * but the hostname thus is valid! -- rgerhards, 2010-02-22
+ */
+ p2parse += i;
+ lenMsg -= i;
+ bufParseHOSTNAME[i] = '\0';
+ MsgSetHOSTNAME(pMsg, bufParseHOSTNAME, i);
+ } else if(i > 0 && p2parse[i] == ' ' && isalnum(p2parse[i-1])) {
/* we got a hostname! */
p2parse += i + 1; /* "eat" it (including SP delimiter) */
lenMsg -= i + 1;