diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:59:37 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 12:59:37 +0100 |
commit | e02b553e1fdca5a655a58d03066cfbc4ab41bc85 (patch) | |
tree | 271518077688e126db7267935983e1ab216474d5 /plugins/imudp | |
parent | c5bfd2b24ca8c490401a0835ec741c05acf0ed3e (diff) | |
parent | a453c7d858779736621c336bc1973bbaf6d6d87a (diff) | |
download | rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.gz rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.tar.xz rsyslog-e02b553e1fdca5a655a58d03066cfbc4ab41bc85.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf.html
plugins/imudp/imudp.c
runtime/rsyslog.h
Diffstat (limited to 'plugins/imudp')
-rw-r--r-- | plugins/imudp/imudp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index a49378cf..c2d704dc 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -184,12 +184,13 @@ processSocket(int fd, struct sockaddr_storage *frominetPrev, int *pbIsPermitted, * configured to do this). * rgerhards, 2005-09-26 */ - *pbIsPermitted = net.isAllowedSender(net.pAllowedSenders_UDP, + *pbIsPermitted = net.isAllowedSender((uchar*)"UDP", (struct sockaddr *)&frominet, (char*)fromHostFQDN); if(!*pbIsPermitted) { DBGPRINTF("%s is not an allowed sender\n", (char*)fromHostFQDN); if(glbl.GetOption_DisallowWarning) { + // TODO: add rate-limiter, otherwise we have a DoS errmsg.LogError(0, NO_ERRCODE, "UDP message from disallowed sender %s discarded", (char*)fromHost); } @@ -321,10 +322,7 @@ ENDwillRun BEGINafterRun CODESTARTafterRun /* do cleanup here */ - if (net.pAllowedSenders_UDP != NULL) { - net.clearAllowedSenders (net.pAllowedSenders_UDP); - net.pAllowedSenders_UDP = NULL; - } + net.clearAllowedSenders((uchar*)"UDP"); if(udpLstnSocks != NULL) { net.closeUDPListenSockets(udpLstnSocks); udpLstnSocks = NULL; |