kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Rizzo's waitfor update (bug #4584)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2006-01-30 03:13:33 +00:00
parent f8b6a4db98
commit 37815b2cce
4 changed files with 143 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/asterisk/channel.h
View File

@@ -119,6 +119,14 @@ extern "C" {
#define MAX_MUSICCLASS 20
#define AST_MAX_FDS 8
/*
* We have AST_MAX_FDS file descriptors in a channel.
* Some of them have a fixed use:
*/
#define AST_ALERT_FD (AST_MAX_FDS-1) /* used for alertpipe */
#define AST_TIMING_FD (AST_MAX_FDS-2) /* used for timingfd */
#define AST_AGENT_FD (AST_MAX_FDS-3) /* used by agents for pass thru */
#define AST_GENERATOR_FD (AST_MAX_FDS-4) /* used by generator */
enum ast_bridge_result {
AST_BRIDGE_COMPLETE = 0,
@@ -1124,16 +1132,31 @@ void ast_channel_stop_silence_generator(struct ast_channel *chan, struct ast_sil
/* Misc. functions below */
/* if fd is a valid descriptor, set *pfd with the descriptor
* Return 1 (not -1!) if added, 0 otherwise (so we can add the
* return value to the index into the array)
*/
static inline int ast_add_fd(struct pollfd *pfd, int fd)
{
pfd->fd = fd;
pfd->events = POLLIN | POLLPRI;
return fd >= 0;
}
/* Helper function for migrating select to poll */
static inline int ast_fdisset(struct pollfd *pfds, int fd, int max, int *start)
{
int x;
for (x=start ? *start : 0;x<max;x++)
int dummy=0;
if (fd < 0)
return 0;
if (!start)
start = &dummy;
for (x = *start; x<max; x++)
if (pfds[x].fd == fd) {
if (start) {
if (x==*start)
(*start)++;
}
if (x == *start)
(*start)++;
return pfds[x].revents;
}
return 0;