diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | doc/imudp.html | 4 | ||||
| -rw-r--r-- | doc/multi_ruleset.html | 2 | ||||
| -rw-r--r-- | doc/multi_ruleset_legacy_format.html | 2 | ||||
| -rw-r--r-- | doc/rsconf1_rulesetcreatemainqueue.html | 2 | ||||
| -rw-r--r-- | plugins/imfile/imfile.c | 2 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 4 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 3 | ||||
| -rw-r--r-- | runtime/msg.c | 2 | ||||
| -rw-r--r-- | runtime/stream.c | 1 | ||||
| -rw-r--r-- | runtime/strmsrv.h | 2 | ||||
| -rw-r--r-- | runtime/typedefs.h | 5 | ||||
| -rw-r--r-- | tcpsrv.h | 4 |
13 files changed, 22 insertions, 15 deletions
@@ -33,6 +33,10 @@ Version 7.4.2 [v7.4-stable] 2013-06-?? checked - this clould result to segfaults on startup if parameters were missing. - bugfix: small memory leak when $uptime property was used +- bugfix: potential segfault on rsyslog termination in imudp + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=456 +- imtcp: fix typo in "listner" parameter, which is "listener" + Currently, both names are accepted. - solved build problems on FreeBSD closes: http://bugzilla.adiscon.com/show_bug.cgi?id=457 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=458 diff --git a/doc/imudp.html b/doc/imudp.html index 6c949536..a8dbca31 100644 --- a/doc/imudp.html +++ b/doc/imudp.html @@ -72,7 +72,7 @@ the default of "imudp" is used and the port is appended to that default. So, for example, a listner port of 514 in that case will lead to an inputname of "imudp514". The ability to append a port is most useful when multiple ports are defined for a single input and each of the inputnames shall be unique. -Note that there currently is no differentiation between IPv4/v6 listners on +Note that there currently is no differentiation between IPv4/v6 listeners on the same port. </li> </ul> @@ -91,7 +91,7 @@ user account. input(type="imudp" port="514") </textarea> -<p>In the next example, we set up three listners at ports 10514, 10515 and 10516 +<p>In the next example, we set up three listeners at ports 10514, 10515 and 10516 and assign a listner name of "udp" to it, followed by the port number: </p> <textarea rows="4" cols="60">module(load="imudp") diff --git a/doc/multi_ruleset.html b/doc/multi_ruleset.html index 37c54065..83c495ca 100644 --- a/doc/multi_ruleset.html +++ b/doc/multi_ruleset.html @@ -191,7 +191,7 @@ ruleset(name="test1"){ } -# and now define listners bound to the relevant ruleset +# and now define listeners bound to the relevant ruleset input(type="imptcp" port="10514" ruleset="remote10514") input(type="imptcp" port="10515" ruleset="remote10515") input(type="imptcp" port="10516" ruleset="remote10516") diff --git a/doc/multi_ruleset_legacy_format.html b/doc/multi_ruleset_legacy_format.html index 5a9e7a4a..273a4a09 100644 --- a/doc/multi_ruleset_legacy_format.html +++ b/doc/multi_ruleset_legacy_format.html @@ -168,7 +168,7 @@ mail.* /var/log/mail10516 # being written to the remote10516 file - as usual... *.* /var/log/remote10516 -# and now define listners bound to the relevant ruleset +# and now define listeners bound to the relevant ruleset $InputTCPServerBindRuleset remote10514 $InputTCPServerRun 10514 diff --git a/doc/rsconf1_rulesetcreatemainqueue.html b/doc/rsconf1_rulesetcreatemainqueue.html index 5c1e0dec..d09f95ce 100644 --- a/doc/rsconf1_rulesetcreatemainqueue.html +++ b/doc/rsconf1_rulesetcreatemainqueue.html @@ -58,7 +58,7 @@ mail.* /var/log/mail10516 # being written to the remote10516 file - as usual... *.* /var/log/remote10516 -# and now define listners bound to the relevant ruleset +# and now define listeners bound to the relevant ruleset $InputTCPServerBindRuleset remote10514 $InputTCPServerRun 10514 diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 349acead..89846dad 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -596,7 +596,7 @@ CODESTARTactivateCnf for(inst = runModConf->root ; inst != NULL ; inst = inst->next) { addListner(inst); } - /* if we could not set up any listners, there is no point in running... */ + /* if we could not set up any listeners, there is no point in running... */ if(iFilPtr == 0) { errmsg.LogError(0, NO_ERRCODE, "imfile: no file monitors could be started, " "input not activated.\n"); diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index fc22d452..2d9761cb 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -141,6 +141,7 @@ static struct cnfparamdescr modpdescr[] = { { "addtlframedelimiter", eCmdHdlrPositiveInt, 0 }, { "maxsessions", eCmdHdlrPositiveInt, 0 }, { "maxlistners", eCmdHdlrPositiveInt, 0 }, + { "maxlisteners", eCmdHdlrPositiveInt, 0 }, { "streamdriver.mode", eCmdHdlrPositiveInt, 0 }, { "streamdriver.authmode", eCmdHdlrString, 0 }, { "permittedpeer", eCmdHdlrArray, 0 }, @@ -453,7 +454,8 @@ CODESTARTsetModCnf loadModConf->iAddtlFrameDelim = (int) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "maxsessions")) { loadModConf->iTCPSessMax = (int) pvals[i].val.d.n; - } else if(!strcmp(modpblk.descr[i].name, "maxlistners")) { + } else if(!strcmp(modpblk.descr[i].name, "maxlisteners") || + !strcmp(modpblk.descr[i].name, "maxlistners")) { /* keep old name for a while */ loadModConf->iTCPLstnMax = (int) pvals[i].val.d.n; } else if(!strcmp(modpblk.descr[i].name, "keepalive")) { loadModConf->bKeepAlive = (int) pvals[i].val.d.n; diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index 1bdd0868..312645bd 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -869,7 +869,7 @@ CODESTARTactivateCnfPrePrivDrop for(inst = runModConf->root ; inst != NULL ; inst = inst->next) { addListner(inst); } - /* if we could not set up any listners, there is no point in running... */ + /* if we could not set up any listeners, there is no point in running... */ if(lcnfRoot == NULL) { errmsg.LogError(0, NO_ERRCODE, "imudp: no listeners could be started, " "input not activated.\n"); @@ -895,7 +895,6 @@ CODESTARTfreeCnf for(inst = pModConf->root ; inst != NULL ; ) { free(inst->pszBindPort); free(inst->pszBindAddr); - free(inst->pBindRuleset); free(inst->inputname); del = inst; inst = inst->next; diff --git a/runtime/msg.c b/runtime/msg.c index 8c50b7b3..9d5fa883 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -2995,7 +2995,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, pRes = (uchar*) "UPTIME NOT available on this system"; *pbMustBeFreed = 0; -# elseif defined(__FreeBSD__) +# elif defined(__FreeBSD__) { struct timespec tp; diff --git a/runtime/stream.c b/runtime/stream.c index 53039056..1af5b974 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -67,7 +67,6 @@ # define O_LARGEFILE 0 #endif #ifndef HAVE_LSEEK64 - typedef off_t off64_t; # define lseek64(fd, offset, whence) lseek(fd, offset, whence) #endif diff --git a/runtime/strmsrv.h b/runtime/strmsrv.h index 9ef28e47..f3d56d16 100644 --- a/runtime/strmsrv.h +++ b/runtime/strmsrv.h @@ -43,7 +43,7 @@ struct strmsrv_s { uchar *pszInputName; /**< value to be used as input name */ permittedPeers_t *pPermPeers;/**< driver's permitted peers */ int iLstnMax; /**< max nbr of listeners currently supported */ - netstrm_t **ppLstn; /**< our netstream listners */ + netstrm_t **ppLstn; /**< our netstream listeners */ strmLstnPortList_t **ppLstnPort; /**< pointer to relevant listen port description */ int iSessMax; /**< max number of sessions supported */ strmLstnPortList_t *pLstnPorts; /**< head pointer for listen ports */ diff --git a/runtime/typedefs.h b/runtime/typedefs.h index ca63d0d5..8db567f0 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -25,6 +25,9 @@ */ #ifndef INCLUDED_TYPEDEFS_H #define INCLUDED_TYPEDEFS_H +#if defined(__FreeBSD__) +#include <sys/types.h> +#endif /* some universal fixed size integer defines ... */ typedef long long int64; @@ -148,7 +151,7 @@ typedef enum { FIOP_ISEMPTY = 6 /* string empty <=> strlen(s) == 0 ?*/ } fiop_t; -#if defined(__FreeBSD__) +#ifndef HAVE_LSEEK64 typedef off_t off64_t; #endif @@ -63,9 +63,9 @@ struct tcpsrv_s { sbool bUsingEPoll; /**< are we in epoll mode (means we do not need to keep track of sessions!) */ sbool bUseFlowControl; /**< use flow control (make light delayable) */ int iLstnCurr; /**< max nbr of listeners currently supported */ - netstrm_t **ppLstn; /**< our netstream listners */ + netstrm_t **ppLstn; /**< our netstream listeners */ tcpLstnPortList_t **ppLstnPort; /**< pointer to relevant listen port description */ - int iLstnMax; /**< max number of listners supported */ + int iLstnMax; /**< max number of listeners supported */ int iSessMax; /**< max number of sessions supported */ tcpLstnPortList_t *pLstnPorts; /**< head pointer for listen ports */ |