mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 07:01:09 +00:00
47a6dacf29
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r315503 | tilghman | 2011-04-26 14:32:50 -0500 (Tue, 26 Apr 2011) | 28 lines Merged revisions 315502 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r315502 | tilghman | 2011-04-26 14:22:52 -0500 (Tue, 26 Apr 2011) | 21 lines Merged revisions 315501 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r315501 | tilghman | 2011-04-26 14:18:46 -0500 (Tue, 26 Apr 2011) | 14 lines Fix the bounds-checking code. The code that set the bit within the select bitfield was correct, but the bounds-checking code was not. The change to that line uses the new _bitsize macro for clarity. Also, FD_ZERO macro did not zero-out anything but the first word of the bitfield, so this could have caused problems with modules using that macro with the expanded bitfield. (closes issue #18773) Reported by: jamicque Patches: 20110423__issue18773.diff.txt uploaded by tilghman (license 14) Tested by: chris-mac ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
115 lines
3.3 KiB
C
115 lines
3.3 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2010, Digium, Inc.
|
|
*
|
|
* Tilghman Lesher <tlesher AT digium DOT com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*!\file
|
|
* \brief Bitfield expansions for ast_select
|
|
*/
|
|
|
|
#ifndef __AST_SELECT_H
|
|
#define __AST_SELECT_H
|
|
|
|
#include <sys/time.h>
|
|
#include <sys/select.h>
|
|
#include <errno.h>
|
|
|
|
#include "asterisk/compat.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern unsigned int ast_FD_SETSIZE;
|
|
|
|
#if !defined(HAVE_VARIABLE_FDSET) && defined(CONFIGURE_RAN_AS_ROOT)
|
|
#define ast_fdset fd_set
|
|
#else
|
|
#define ast_FDMAX 32768
|
|
typedef struct {
|
|
TYPEOF_FD_SET_FDS_BITS fds_bits[ast_FDMAX / 8 / SIZEOF_FD_SET_FDS_BITS]; /* 32768 bits */
|
|
} ast_fdset;
|
|
|
|
#define _bitsize(a) (sizeof(a) * 8)
|
|
|
|
#undef FD_ZERO
|
|
#define FD_ZERO(a) \
|
|
do { \
|
|
TYPEOF_FD_SET_FDS_BITS *bytes = (TYPEOF_FD_SET_FDS_BITS *) a; \
|
|
int i; \
|
|
for (i = 0; i < ast_FDMAX / _bitsize(TYPEOF_FD_SET_FDS_BITS); i++) { \
|
|
bytes[i] = 0; \
|
|
} \
|
|
} while (0)
|
|
#undef FD_SET
|
|
#define FD_SET(fd, fds) \
|
|
do { \
|
|
TYPEOF_FD_SET_FDS_BITS *bytes = (TYPEOF_FD_SET_FDS_BITS *) fds; \
|
|
/* 32bit: FD / 32 + ((FD + 1) % 32 ? 1 : 0) < 1024 */ \
|
|
/* 64bit: FD / 64 + ((FD + 1) % 64 ? 1 : 0) < 512 */ \
|
|
if (fd / _bitsize(*bytes) + ((fd + 1) % _bitsize(*bytes) ? 1 : 0) < sizeof(*(fds)) / SIZEOF_FD_SET_FDS_BITS) { \
|
|
bytes[fd / _bitsize(*bytes)] |= ((TYPEOF_FD_SET_FDS_BITS) 1) << (fd % _bitsize(*bytes)); \
|
|
} else { \
|
|
fprintf(stderr, "FD %d exceeds the maximum size of ast_fdset!\n", fd); \
|
|
} \
|
|
} while (0)
|
|
#endif /* HAVE_VARIABLE_FDSET */
|
|
|
|
/*! \brief Waits for activity on a group of channels
|
|
* \param nfds the maximum number of file descriptors in the sets
|
|
* \param rfds file descriptors to check for read availability
|
|
* \param wfds file descriptors to check for write availability
|
|
* \param efds file descriptors to check for exceptions (OOB data)
|
|
* \param tvp timeout while waiting for events
|
|
* This is the same as a standard select(), except it guarantees the
|
|
* behaviour where the passed struct timeval is updated with how much
|
|
* time was not slept while waiting for the specified events
|
|
*/
|
|
static inline int ast_select(int nfds, ast_fdset *rfds, ast_fdset *wfds, ast_fdset *efds, struct timeval *tvp)
|
|
{
|
|
#ifdef __linux__
|
|
return select(nfds, (fd_set *) rfds, (fd_set *) wfds, (fd_set *) efds, tvp);
|
|
#else
|
|
int save_errno = 0;
|
|
if (tvp) {
|
|
struct timeval tv, tvstart, tvend, tvlen;
|
|
int res;
|
|
|
|
tv = *tvp;
|
|
gettimeofday(&tvstart, NULL);
|
|
res = select(nfds, (fd_set *) rfds, (fd_set *) wfds, (fd_set *) efds, tvp);
|
|
save_errno = errno;
|
|
gettimeofday(&tvend, NULL);
|
|
timersub(&tvend, &tvstart, &tvlen);
|
|
timersub(&tv, &tvlen, tvp);
|
|
if (tvp->tv_sec < 0 || (tvp->tv_sec == 0 && tvp->tv_usec < 0)) {
|
|
tvp->tv_sec = 0;
|
|
tvp->tv_usec = 0;
|
|
}
|
|
errno = save_errno;
|
|
return res;
|
|
}
|
|
else
|
|
return select(nfds, (fd_set *) rfds, (fd_set *) wfds, (fd_set *) efds, NULL);
|
|
#endif
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* __AST_SELECT_H */
|