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

pmrfc3164: add support for slashes in hostname

Browse Source 
added parameter "permit.slashesinhostname" to support this
This commit is contained in:
Rainer Gerhards 2016-07-11 08:41:43 +02:00
parent 3336b911b2
commit 2bbe16b3c0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/pmrfc3164.c
View File

@ -64,7 +64,8 @@ static int bParseHOSTNAMEandTAG; /* cache for the equally-named global param - p
/* parser instance parameters */
static struct cnfparamdescr parserpdescr[] = {
{ "detect.yearaftertimestamp", eCmdHdlrBinary, 0 },
{ "permit.squarebracketsinhostname", eCmdHdlrBinary, 0 }
{ "permit.squarebracketsinhostname", eCmdHdlrBinary, 0 },
{ "permit.slashesinhostname", eCmdHdlrBinary, 0 }
};
static struct cnfparamblk parserpblk =
{ CNFPARAMBLK_VERSION,
@ -73,8 +74,9 @@ static struct cnfparamblk parserpblk =
};
struct instanceConf_s {
int bDetectYearAfterTimestamp; /* is ORIGIN field present? */
int bPermitSquareBracketsInHostname; /* is ORIGIN field present? */
int bDetectYearAfterTimestamp;
int bPermitSquareBracketsInHostname;
int bPermitSlashesInHostname;
};
@ -98,6 +100,7 @@ createInstance(instanceConf_t **pinst)
CHKmalloc(inst = MALLOC(sizeof(instanceConf_t)));
inst->bDetectYearAfterTimestamp = 0;
inst->bPermitSquareBracketsInHostname = 0;
inst->bPermitSlashesInHostname = 0;
*pinst = inst;
finalize_it:
RETiRet;
@ -131,6 +134,8 @@ CODESTARTnewParserInst
inst->bDetectYearAfterTimestamp = (int) pvals[i].val.d.n;
} else if(!strcmp(parserpblk.descr[i].name, "permit.squarebracketsinhostname")) {
inst->bPermitSquareBracketsInHostname = (int) pvals[i].val.d.n;
} else if(!strcmp(parserpblk.descr[i].name, "permit.slashesinhostname")) {
inst->bPermitSlashesInHostname = (int) pvals[i].val.d.n;
} else {
dbgprintf("pmrfc3164: program error, non-handled "
"param '%s'\n", parserpblk.descr[i].name);
@ -239,7 +244,8 @@ CODESTARTparse
while(i < lenMsg
&& (isalnum(p2parse[i]) || p2parse[i] == '.'
|| p2parse[i] == '_' || p2parse[i] == '-'
|| (p2parse[i] == ']' && bHadSBracket) )
|| (p2parse[i] == ']' && bHadSBracket)
|| (p2parse[i] == '/' && pInst->bPermitSlashesInHostname) )
&& i < (CONF_HOSTNAME_MAXSIZE - 1)) {
bufParseHOSTNAME[i] = p2parse[i];
++i;