diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:10:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:10:24 +0100 |
| commit | f94a3034b6c2218f51be5ab84bae591269e07215 (patch) | |
| tree | 687ef09644b4c315790becfff8088a05b1d9896e /plugins/imgssapi/imgssapi.c | |
| parent | 4af3a1d72d658a83b6b891ef37b0cd0471ba0e15 (diff) | |
| parent | 30c2e42ec305bb97bd04172e5c02b89eeea53e35 (diff) | |
| download | rsyslog-f94a3034b6c2218f51be5ab84bae591269e07215.tar.gz rsyslog-f94a3034b6c2218f51be5ab84bae591269e07215.tar.bz2 rsyslog-f94a3034b6c2218f51be5ab84bae591269e07215.zip | |
integrating varmojfekoj's "unlimited select()" patch into v4-devel
Diffstat (limited to 'plugins/imgssapi/imgssapi.c')
| -rw-r--r-- | plugins/imgssapi/imgssapi.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c index d8791880..1aad6622 100644 --- a/plugins/imgssapi/imgssapi.c +++ b/plugins/imgssapi/imgssapi.c @@ -56,6 +56,7 @@ #include "errmsg.h" #include "netstrm.h" #include "glbl.h" +#include "unlimited_select.h" MODULE_TYPE_INPUT @@ -414,15 +415,20 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) CHKiRet(netstrm.GetSock(pSess->pStrm, &fdSess)); // TODO: method access! if (allowedMethods & ALLOWEDMETHOD_TCP) { int len; - fd_set fds; struct timeval tv; +#ifdef USE_UNLIMITED_SELECT + fd_set *pFds = malloc(glbl.GetFdSetSize()); +#else + fd_set fds; + fd_set *pFds = &fds; +#endif do { - FD_ZERO(&fds); - FD_SET(fdSess, &fds); + FD_ZERO(pFds); + FD_SET(fdSess, pFds); tv.tv_sec = 1; tv.tv_usec = 0; - ret = select(fdSess + 1, &fds, NULL, NULL, &tv); + ret = select(fdSess + 1, pFds, NULL, NULL, &tv); } while (ret < 0 && errno == EINTR); if (ret < 0) { errmsg.LogError(0, RS_RET_ERR, "TCP session %p will be closed, error ignored\n", pSess); @@ -475,6 +481,8 @@ OnSessAcceptGSS(tcpsrv_t *pThis, tcps_sess_t *pSess) pGSess->allowedMethods = ALLOWEDMETHOD_TCP; ABORT_FINALIZE(RS_RET_OK); // TODO: define good error codes } + + freeFdSet(pFds); } context = &pGSess->gss_context; |