diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:43:36 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:43:36 +0100 |
| commit | 604d782f09f38734ca84d63cf1f09234c4dd94e3 (patch) | |
| tree | d438182067dde67a2ca0f2a619fbe3e93a57fa8e | |
| parent | 0957820a1076d7fcf182ba60c12e5946c193545f (diff) | |
| download | rsyslog-604d782f09f38734ca84d63cf1f09234c4dd94e3.tar.gz rsyslog-604d782f09f38734ca84d63cf1f09234c4dd94e3.tar.xz rsyslog-604d782f09f38734ca84d63cf1f09234c4dd94e3.zip | |
minor: moved all code to new isAllowedSender2() interface
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/imgssapi/imgssapi.c | 4 | ||||
| -rw-r--r-- | plugins/imtcp/imtcp.c | 2 | ||||
| -rw-r--r-- | runtime/net.h | 2 |
4 files changed, 7 insertions, 6 deletions
@@ -1,5 +1,3 @@ -- added option to use unlimited-size select() calls - Thanks to varmjofekoj for the patch --------------------------------------------------------------------------- Version 5.5.0 [DEVEL] (rgerhards), 2009-11-?? - moved DNS resolution code out of imudp and into the backend processing @@ -8,6 +6,9 @@ Version 5.5.0 [DEVEL] (rgerhards), 2009-11-?? DNS resolution almost comes for free, so we do not do it there. However, the new method has been implemented in a generic way and as such may also be used by other modules in the future. +- added option to use unlimited-size select() calls + Thanks to varmjofekoj for the patch + This is not done in imudp, as it natively supports epoll() --------------------------------------------------------------------------- Version 5.3.5 [BETA] (rgerhards), 2009-11-13 - some light performance enhancement by replacing time() call with much diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c index fb3c3536..1094317e 100644 --- a/plugins/imgssapi/imgssapi.c +++ b/plugins/imgssapi/imgssapi.c @@ -178,10 +178,10 @@ isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void *pUsrSrv, void*p pGSess = (gss_sess_t*) pUsrSess; if((pGSrv->allowedMethods & ALLOWEDMETHOD_TCP) && - net.isAllowedSender((uchar*)"TCP", addr, (char*)fromHostFQDN)) + net.isAllowedSender2((uchar*)"TCP", addr, (char*)fromHostFQDN, 1)) allowedMethods |= ALLOWEDMETHOD_TCP; if((pGSrv->allowedMethods & ALLOWEDMETHOD_GSS) && - net.isAllowedSender((uchar*)"GSS", addr, (char*)fromHostFQDN)) + net.isAllowedSender2((uchar*)"GSS", addr, (char*)fromHostFQDN, 1)) allowedMethods |= ALLOWEDMETHOD_GSS; if(allowedMethods && pGSess != NULL) pGSess->allowedMethods = allowedMethods; diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index 176b5b18..2348c974 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -97,7 +97,7 @@ static int isPermittedHost(struct sockaddr *addr, char *fromHostFQDN, void __attribute__((unused)) *pUsrSrv, void __attribute__((unused)) *pUsrSess) { - return net.isAllowedSender(UCHAR_CONSTANT("TCP"), addr, fromHostFQDN); + return net.isAllowedSender2(UCHAR_CONSTANT("TCP"), addr, fromHostFQDN, 1); } diff --git a/runtime/net.h b/runtime/net.h index 2add3557..101ce79d 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -139,7 +139,7 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ void (*debugListenInfo)(int fd, char *type); int *(*create_udp_socket)(uchar *hostname, uchar *LogPort, int bIsServer); void (*closeUDPListenSockets)(int *finet); - int __attribute__((deprecated)) (*isAllowedSender)(uchar *pszType, struct sockaddr *pFrom, const char *pszFromHost); + int (*isAllowedSender)(uchar *pszType, struct sockaddr *pFrom, const char *pszFromHost); /* deprecated! */ rsRetVal (*getLocalHostname)(uchar**); int (*should_use_so_bsdcompat)(void); /* permitted peer handling should be replaced by something better (see comments above) */ |