Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Big diet for struct ast_channel

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4399 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 21 years ago
parent 53f5a568fb
commit c46e21252c
12 changed files with 84 additions and 116 deletions
Show Stats Download Patch File Download Diff File

4
app.c
Unescape View File

@ -364,9 +364,9 @@ static void *linear_alloc(struct ast_channel *chan, void *params)
if (params) {
ls = params;
if (ls->allowoverride)
chan->writeinterrupt = 1;
ast_set_flag(chan, AST_FLAG_WRITE_INT);
else
chan->writeinterrupt = 0;
ast_clear_flag(chan, AST_FLAG_WRITE_INT);
ls->origwfmt = chan->writeformat;
if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) {
ast_log(LOG_WARNING, "Unable to set '%s' to linear format (write)\n", chan->name);

4
apps/app_dumpchan.c
Unescape View File

@ -78,7 +78,6 @@ static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
"PickupGroup=%d\n"
"Application=%s\n"
"Data=%s\n"
"Stack=%d\n"
"Blocking_in=%s\n",
c->name,
c->type,
@ -104,8 +103,7 @@ static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
c->pickupgroup,
( c->appl ? c->appl : "(N/A)" ),
( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
c->stack,
(c->blocking ? c->blockproc : "(Not Blocking)"));
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
return 0;
}

2
autoservice.c
Unescape View File

@ -147,7 +147,7 @@ int ast_autoservice_stop(struct ast_channel *chan)
pthread_kill(asthread, SIGURG);
ast_mutex_unlock(&autolock);
/* Wait for it to un-block */
while(chan->blocking)
while(ast_test_flag(chan, AST_FLAG_BLOCKING))
usleep(1000);
return res;
}

85
channel.c
Unescape View File

@ -331,7 +331,6 @@ struct ast_channel *ast_channel_alloc(int needqueue)
tmp->pvt = pvt;
/* Initial state */
tmp->_state = AST_STATE_DOWN;
tmp->stack = -1;
tmp->streamid = -1;
tmp->appl = NULL;
tmp->data = NULL;
@ -416,7 +415,7 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin)
} else if (chan->timingfd > -1) {
ioctl(chan->timingfd, ZT_TIMERPING, &blah);
#endif
} else if (chan->blocking) {
} else if (ast_test_flag(chan, AST_FLAG_BLOCKING)) {
pthread_kill(chan->blocker, SIGURG);
}
ast_mutex_unlock(&chan->lock);
@ -441,8 +440,8 @@ int ast_channel_defer_dtmf(struct ast_channel *chan)
{
int pre = 0;
if (chan) {
pre = chan->deferdtmf;
chan->deferdtmf = 1;
pre = ast_test_flag(chan, AST_FLAG_DEFER_DTMF);
ast_set_flag(chan, AST_FLAG_DEFER_DTMF);
}
return pre;
}
@ -450,7 +449,7 @@ int ast_channel_defer_dtmf(struct ast_channel *chan)
void ast_channel_undefer_dtmf(struct ast_channel *chan)
{
if (chan)
chan->deferdtmf = 0;
ast_clear_flag(chan, AST_FLAG_DEFER_DTMF);
}
struct ast_channel *ast_channel_walk_locked(struct ast_channel *prev)
@ -666,7 +665,7 @@ int ast_softhangup_nolock(struct ast_channel *chan, int cause)
chan->_softhangup |= cause;
ast_queue_frame(chan, &f);
/* Interrupt any poll call or such */
if (chan->blocking)
if (ast_test_flag(chan, AST_FLAG_BLOCKING))
pthread_kill(chan->blocker, SIGURG);
return res;
}
@ -711,7 +710,7 @@ int ast_hangup(struct ast_channel *chan)
/* If this channel is one which will be masqueraded into something,
mark it as a zombie already, so we know to free it later */
if (chan->masqr) {
chan->zombie=1;
ast_set_flag(chan, AST_FLAG_ZOMBIE);
ast_mutex_unlock(&chan->lock);
return 0;
}
@ -734,13 +733,13 @@ int ast_hangup(struct ast_channel *chan)
ast_cdr_post(chan->cdr);
ast_cdr_free(chan->cdr);
}
if (chan->blocking) {
if (ast_test_flag(chan, AST_FLAG_BLOCKING)) {
ast_log(LOG_WARNING, "Hard hangup called by thread %ld on %s, while fd "
"is blocked by thread %ld in procedure %s! Expect a failure\n",
(long)pthread_self(), chan->name, (long)chan->blocker, chan->blockproc);
CRASH;
}
if (!chan->zombie) {
if (!ast_test_flag(chan, AST_FLAG_ZOMBIE)) {
if (option_debug)
ast_log(LOG_DEBUG, "Hanging up channel '%s'\n", chan->name);
if (chan->pvt->hangup)
@ -793,7 +792,7 @@ int ast_answer(struct ast_channel *chan)
int res = 0;
ast_mutex_lock(&chan->lock);
/* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan)) {
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
ast_mutex_unlock(&chan->lock);
return -1;
}
@ -827,7 +826,7 @@ void ast_deactivate_generator(struct ast_channel *chan)
chan->generator->release(chan, chan->generatordata);
chan->generatordata = NULL;
chan->generator = NULL;
chan->writeinterrupt = 0;
ast_clear_flag(chan, AST_FLAG_WRITE_INT);
ast_settimeout(chan, 0, NULL, NULL);
}
ast_mutex_unlock(&chan->lock);
@ -1012,7 +1011,7 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
res = poll(pfds, max, rms);
if (res < 0) {
for (x=0;x<n;x++)
c[x]->blocking = 0;
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
/* Simulate a timeout if we were interrupted */
if (errno != EINTR)
*ms = -1;
@ -1029,7 +1028,7 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
time(&now);
spoint = 0;
for (x=0;x<n;x++) {
c[x]->blocking = 0;
ast_clear_flag(c[x], AST_FLAG_BLOCKING);
if (havewhen && c[x]->whentohangup && (now > c[x]->whentohangup)) {
c[x]->_softhangup |= AST_SOFTHANGUP_TIMEOUT;
if (!winner)
@ -1039,9 +1038,9 @@ struct ast_channel *ast_waitfor_nandfds(struct ast_channel **c, int n, int *fds,
if (c[x]->fds[y] > -1) {
if ((res = ast_fdisset(pfds, c[x]->fds[y], max, &spoint))) {
if (res & POLLPRI)
c[x]->exception = -1;
ast_set_flag(c[x], AST_FLAG_EXCEPTION);
else
c[x]->exception = 0;
ast_clear_flag(c[x], AST_FLAG_EXCEPTION);
c[x]->fdno = y;
winner = c[x];
}
@ -1101,7 +1100,7 @@ char ast_waitfordigit(struct ast_channel *c, int ms)
struct ast_frame *f;
char result = 0;
/* Stop if we're a zombie or need a soft hangup */
if (c->zombie || ast_check_hangup(c))
if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
return -1;
/* Wait for a digit, no more than ms milliseconds total. */
while(ms && !result) {
@ -1146,7 +1145,7 @@ char ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd
int outfd;
int res;
/* Stop if we're a zombie or need a soft hangup */
if (c->zombie || ast_check_hangup(c))
if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
return -1;
/* Wait for a digit, no more than ms milliseconds total. */
while(ms) {
@ -1218,14 +1217,14 @@ struct ast_frame *ast_read(struct ast_channel *chan)
}
/* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan)) {
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
if (chan->generator)
ast_deactivate_generator(chan);
ast_mutex_unlock(&chan->lock);
return NULL;
}
if (!chan->deferdtmf && !ast_strlen_zero(chan->dtmfq)) {
if (!ast_test_flag(chan, AST_FLAG_DEFER_DTMF) && !ast_strlen_zero(chan->dtmfq)) {
/* We have DTMF that has been deferred. Return it now */
chan->dtmff.frametype = AST_FRAME_DTMF;
chan->dtmff.subclass = chan->dtmfq[0];
@ -1241,8 +1240,8 @@ struct ast_frame *ast_read(struct ast_channel *chan)
read(chan->pvt->alertpipe[0], &blah, sizeof(blah));
}
#ifdef ZAPTEL_OPTIMIZATIONS
if ((chan->timingfd > -1) && (chan->fdno == AST_MAX_FDS - 2) && chan->exception) {
chan->exception = 0;
if ((chan->timingfd > -1) && (chan->fdno == AST_MAX_FDS - 2) && ast_test_flag(chan, AST_FLAG_EXCEPTION)) {
ast_clear_flag(chan, AST_FLAG_EXCEPTION);
blah = -1;
/* IF we can't get event, assume it's an expired as-per the old interface */
res = ioctl(chan->timingfd, ZT_GETEVENT, &blah);
@ -1296,7 +1295,7 @@ struct ast_frame *ast_read(struct ast_channel *chan)
}
} else {
chan->blocker = pthread_self();
if (chan->exception) {
if (ast_test_flag(chan, AST_FLAG_EXCEPTION)) {
if (chan->pvt->exception)
f = chan->pvt->exception(chan);
else {
@ -1304,7 +1303,7 @@ struct ast_frame *ast_read(struct ast_channel *chan)
f = &null_frame;
}
/* Clear the exception flag */
chan->exception = 0;
ast_clear_flag(chan, AST_FLAG_EXCEPTION);
} else
if (chan->pvt->read)
f = chan->pvt->read(chan);
@ -1358,7 +1357,7 @@ struct ast_frame *ast_read(struct ast_channel *chan)
/* End the CDR if appropriate */
if (chan->cdr)
ast_cdr_end(chan->cdr);
} else if (chan->deferdtmf && f->frametype == AST_FRAME_DTMF) {
} else if (ast_test_flag(chan, AST_FLAG_DEFER_DTMF) && f->frametype == AST_FRAME_DTMF) {
if (strlen(chan->dtmfq) < sizeof(chan->dtmfq) - 2)
chan->dtmfq[strlen(chan->dtmfq)] = f->subclass;
else
@ -1414,7 +1413,7 @@ int ast_indicate(struct ast_channel *chan, int condition)
{
int res = -1;
/* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan))
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
return -1;
ast_mutex_lock(&chan->lock);
if (chan->pvt->indicate)
@ -1490,12 +1489,12 @@ int ast_sendtext(struct ast_channel *chan, char *text)
{
int res = 0;
/* Stop if we're a zombie or need a soft hangup */
if (chan->zombie || ast_check_hangup(chan))
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
return -1;
CHECK_BLOCKING(chan);
if (chan->pvt->send_text)
res = chan->pvt->send_text(chan, text);
chan->blocking = 0;
ast_clear_flag(chan, AST_FLAG_BLOCKING);
return res;
}
@ -1581,7 +1580,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
struct ast_frame *f = NULL;
/* Stop if we're a zombie or need a soft hangup */
ast_mutex_lock(&chan->lock);
if (chan->zombie || ast_check_hangup(chan)) {
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
ast_mutex_unlock(&chan->lock);
return -1;
}
@ -1598,7 +1597,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
return 0;
}
if (chan->generatordata) {
if (chan->writeinterrupt)
if (ast_test_flag(chan, AST_FLAG_WRITE_INT))
ast_deactivate_generator(chan);
else {
ast_mutex_unlock(&chan->lock);
@ -1614,7 +1613,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
ast_log(LOG_WARNING, "Don't know how to handle control frames yet\n");
break;
case AST_FRAME_DTMF:
chan->blocking = 0;
ast_clear_flag(chan, AST_FLAG_BLOCKING);
ast_mutex_unlock(&chan->lock);
res = do_senddigit(chan,fr->subclass);
ast_mutex_lock(&chan->lock);
@ -1668,7 +1667,7 @@ int ast_write(struct ast_channel *chan, struct ast_frame *fr)
}
if (f && (f != fr))
ast_frfree(f);
chan->blocking = 0;
ast_clear_flag(chan, AST_FLAG_BLOCKING);
/* Consider a write failure to force a soft hangup */
if (res < 0)
chan->_softhangup |= AST_SOFTHANGUP_DEV;
@ -1992,7 +1991,7 @@ int ast_call(struct ast_channel *chan, char *addr, int timeout)
int res = -1;
/* Stop if we're a zombie or need a soft hangup */
ast_mutex_lock(&chan->lock);
if (!chan->zombie && !ast_check_hangup(chan))
if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan))
if (chan->pvt->call)
res = chan->pvt->call(chan, addr, timeout);
ast_mutex_unlock(&chan->lock);
@ -2007,7 +2006,7 @@ int ast_transfer(struct ast_channel *chan, char *dest)
int res = -1;
/* Stop if we're a zombie or need a soft hangup */
ast_mutex_lock(&chan->lock);
if (!chan->zombie && !ast_check_hangup(chan)) {
if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan)) {
if (chan->pvt->transfer) {
res = chan->pvt->transfer(chan, dest);
if (!res)
@ -2026,7 +2025,7 @@ int ast_readstring(struct ast_channel *c, char *s, int len, int timeout, int fti
char d;
/* XXX Merge with full version? XXX */
/* Stop if we're a zombie or need a soft hangup */
if (c->zombie || ast_check_hangup(c))
if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
return -1;
if (!len)
return -1;
@ -2064,7 +2063,7 @@ int ast_readstring_full(struct ast_channel *c, char *s, int len, int timeout, in
int to = ftimeout;
char d;
/* Stop if we're a zombie or need a soft hangup */
if (c->zombie || ast_check_hangup(c))
if (ast_test_flag(c, AST_FLAG_ZOMBIE) || ast_check_hangup(c))
return -1;
if (!len)
return -1;
@ -2352,7 +2351,7 @@ int ast_do_masquerade(struct ast_channel *original)
/* XXX What about blocking, softhangup, blocker, and lock and blockproc? XXX */
/* Application and data remain the same */
/* Clone exception becomes real one, as with fdno */
original->exception = clone->exception;
ast_copy_flags(original, clone, AST_FLAG_EXCEPTION);
original->fdno = clone->fdno;
/* Schedule context remains the same */
/* Stream stuff stays the same */
@ -2398,19 +2397,19 @@ int ast_do_masquerade(struct ast_channel *original)
/* Now, at this point, the "clone" channel is totally F'd up. We mark it as
a zombie so nothing tries to touch it. If it's already been marked as a
zombie, then free it now (since it already is considered invalid). */
if (clone->zombie) {
if (ast_test_flag(clone, AST_FLAG_ZOMBIE)) {
ast_log(LOG_DEBUG, "Destroying clone '%s'\n", clone->name);
ast_mutex_unlock(&clone->lock);
ast_channel_free(clone);
manager_event(EVENT_FLAG_CALL, "Hangup", "Channel: %s\r\n", zombn);
} else {
ast_log(LOG_DEBUG, "Released clone lock on '%s'\n", clone->name);
clone->zombie=1;
ast_set_flag(clone, AST_FLAG_ZOMBIE);
ast_mutex_unlock(&clone->lock);
}
/* Signal any blocker */
if (original->blocking)
if (ast_test_flag(original, AST_FLAG_BLOCKING))
pthread_kill(original->blocker, SIGURG);
ast_log(LOG_DEBUG, "Done Masquerading %s (%d)\n",
original->name, original->_state);
@ -2576,7 +2575,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
bridge_playfile(c1,c0,config->start_sound,time_left_ms / 1000);
/* Stop if we're a zombie or need a soft hangup */
if (c0->zombie || ast_check_hangup_locked(c0) || c1->zombie || ast_check_hangup_locked(c1))
if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) || ast_test_flag(c1, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c1))
return -1;
if (c0->_bridge) {
ast_log(LOG_WARNING, "%s is already in a bridge with %s\n",
@ -2645,11 +2644,11 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
}
/* Stop if we're a zombie or need a soft hangup */
if (c0->zombie || ast_check_hangup_locked(c0) || c1->zombie || ast_check_hangup_locked(c1)) {
if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) || ast_test_flag(c1, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c1)) {
*fo = NULL;
if (who) *rc = who;
res = 0;
ast_log(LOG_DEBUG, "Bridge stops because we're zombie or need a soft hangup: c0=%s, c1=%s, flags: %s,%s,%s,%s\n",c0->name,c1->name,c0->zombie?"Yes":"No",ast_check_hangup(c0)?"Yes":"No",c1->zombie?"Yes":"No",ast_check_hangup(c1)?"Yes":"No");
ast_log(LOG_DEBUG, "Bridge stops because we're zombie or need a soft hangup: c0=%s, c1=%s, flags: %s,%s,%s,%s\n",c0->name,c1->name,ast_test_flag(c0, AST_FLAG_ZOMBIE)?"Yes":"No",ast_check_hangup(c0)?"Yes":"No",ast_test_flag(c1, AST_FLAG_ZOMBIE)?"Yes":"No",ast_check_hangup(c1)?"Yes":"No");
break;
}
if (c0->pvt->bridge && config->timelimit==0 &&
@ -2843,7 +2842,7 @@ static void * tonepair_alloc(struct ast_channel *chan, void *params)
ts->vol = td->vol;
}
/* Let interrupts interrupt :) */
chan->writeinterrupt = 1;
ast_set_flag(chan, AST_FLAG_WRITE_INT);
return ts;
}

6
channels/chan_agent.c
Unescape View File

@ -323,7 +323,7 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
ast_mutex_lock(&p->lock);
CHECK_FORMATS(ast, p);
if (p->chan) {
p->chan->exception = ast->exception;
ast_copy_flags(p->chan, ast, AST_FLAG_EXCEPTION);
if (ast->fdno == AST_MAX_FDS - 3)
p->chan->fdno = AST_MAX_FDS - 2;
else
@ -819,7 +819,7 @@ static struct ast_channel *agent_new(struct agent_pvt *p, int state)
p->owning_app = pthread_self();
/* After the above step, there should not be any blockers. */
if (p->chan) {
if (p->chan->blocking) {
if (ast_test_flag(p->chan, AST_FLAG_BLOCKING)) {
ast_log( LOG_ERROR, "A blocker exists after agent channel ownership acquired\n" );
CRASH;
}
@ -1003,7 +1003,7 @@ static int check_availability(struct agent_pvt *newlyavailable, int needlock)
/* Go ahead and mark the channel as a zombie so that masquerade will
destroy it for us, and we need not call ast_hangup */
ast_mutex_lock(&parent->lock);
chan->zombie = 1;
ast_set_flag(chan, AST_FLAG_ZOMBIE);
ast_channel_masquerade(parent, chan);
ast_mutex_unlock(&parent->lock);
p->abouttograb = 0;

2
channels/chan_phone.c
Unescape View File

@ -434,7 +434,7 @@ static struct ast_frame *phone_read(struct ast_channel *ast)
/* Try to read some data... */
CHECK_BLOCKING(ast);
res = read(p->fd, p->buf, PHONE_MAX_BUF);
ast->blocking = 0;
ast_clear_flag(ast, AST_FLAG_BLOCKING);
if (res < 0) {
#if 0
if (errno == EAGAIN) {

4
channels/chan_zap.c
Unescape View File

@ -3995,7 +3995,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
readbuf = ((unsigned char *)p->subs[index].buffer) + AST_FRIENDLY_OFFSET;
CHECK_BLOCKING(ast);
res = read(p->subs[index].zfd, readbuf, p->subs[index].linear ? READ_SIZE * 2 : READ_SIZE);
ast->blocking = 0;
ast_clear_flag(ast, AST_FLAG_BLOCKING);
/* Check for hangup */
if (res < 0) {
f = NULL;
@ -4172,7 +4172,7 @@ struct ast_frame *zt_read(struct ast_channel *ast)
/* If we have a fake_event, trigger exception to handle it */
if (p->fake_event)
ast->exception = 1;
ast_set_flag(ast, AST_FLAG_EXCEPTION);
ast_mutex_unlock(&p->lock);
return f;

3
cli.c
Unescape View File

@ -668,7 +668,6 @@ static int handle_showchan(int fd, int argc, char *argv[])
" Pickup Group: %d\n"
" Application: %s\n"
" Data: %s\n"
" Stack: %d\n"
" Blocking in: %s\n",
c->name, c->type, c->uniqueid,
(c->cid.cid_num ? c->cid.cid_num : "(N/A)"),
@ -679,7 +678,7 @@ static int handle_showchan(int fd, int argc, char *argv[])
hour, min, sec,
c->context, c->exten, c->priority, c->callgroup, c->pickupgroup, ( c->appl ? c->appl : "(N/A)" ),
( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
c->stack, (c->blocking ? c->blockproc : "(Not Blocking)"));
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
if(pbx_builtin_serialize_variables(c,buf,sizeof(buf)))
ast_cli(fd,"Variables:\n%s\n",buf);

48
include/asterisk/channel.h
Unescape View File

@ -39,7 +39,6 @@ extern "C" {
#define AST_CHANNEL_NAME 80
#define AST_CHANNEL_MAX_STACK 32
#define MAX_LANGUAGE 20
@ -94,8 +93,6 @@ struct ast_channel {
void *generatordata;
/*! Current active data generator */
struct ast_generator *generator;
/*! Whether or not the generator should be interrupted by write */
int writeinterrupt;
/*! Who are we bridged to, if we're bridged Do not access directly,
use ast_bridged_channel(chan) */
@ -104,21 +101,15 @@ struct ast_channel {
struct ast_channel *dialed;
/*! Who called us? */
struct ast_channel *dialing;
/*! Reverse the dialed link (0 false, 1 true) */
int reversedialed;
/*! Channel that will masquerade as us */
struct ast_channel *masq;
/*! Who we are masquerading as */
struct ast_channel *masqr;
/*! Call Detail Record Flags */
int cdrflags;
/*! Whether or not we're blocking */
int blocking;
/*! Whether or not we have been hung up... Do not set this value
directly, use ast_softhangup */
int _softhangup;
/*! Non-zero if this is a zombie channel */
int zombie;
/*! Non-zero, set to actual time when channel is to be hung up */
time_t whentohangup;
/*! If anyone is blocking, this is them */
@ -133,8 +124,6 @@ struct ast_channel {
/*! Data passed to current application */
char *data;
/*! Has an exception been detected */
int exception;
/*! Which fd had an event detected on */
int fdno;
/*! Schedule context */
@ -159,9 +148,6 @@ struct ast_channel {
int _state;
/*! Number of rings so far */
int rings;
/*! Current level of application */
int stack;
/*! Kinds of data this channel can natively handle */
int nativeformats;
@ -184,21 +170,14 @@ struct ast_channel {
char exten[AST_MAX_EXTENSION];
/* Current extension priority */
int priority;
/*! Application information -- see assigned numbers */
void *app[AST_CHANNEL_MAX_STACK];
/*! Any/all queued DTMF characters */
char dtmfq[AST_MAX_EXTENSION];
/*! Are DTMF digits being deferred */
int deferdtmf;
/*! DTMF frame */
struct ast_frame dtmff;
/*! Private channel implementation details */
struct ast_channel_pvt *pvt;
/*! Jump buffer used for returning from applications */
jmp_buf jmp[AST_CHANNEL_MAX_STACK];
/*! PBX private structure */
struct ast_pbx *pbx;
/*! Set BEFORE PBX is started to determine AMA flags */
int amaflags;
@ -238,28 +217,39 @@ struct ast_channel {
unsigned int pickupgroup;
/*! channel flags of AST_FLAG_ type */
int flag;
int flags;
/*! For easy linking */
struct ast_channel *next;
};
#define AST_FLAG_DIGITAL 1 /* if the call is a digital ISDN call */
#define AST_FLAG_DIGITAL (1 << 0) /* if the call is a digital ISDN call */
#define AST_FLAG_DEFER_DTMF (1 << 1) /* if dtmf should be deferred */
#define AST_FLAG_WRITE_INT (1 << 2) /* if write should be interrupt generator */
#define AST_FLAG_BLOCKING (1 << 3) /* if we are blocking */
#define AST_FLAG_ZOMBIE (1 << 4) /* if we are a zombie */
#define AST_FLAG_EXCEPTION (1 << 5) /* if there is a pending exception */
static inline int ast_test_flag(struct ast_channel *chan, int mode)
{
return chan->flag & mode;
return chan->flags & mode;
}
static inline void ast_set_flag(struct ast_channel *chan, int mode)
{
chan->flag |= mode;
chan->flags |= mode;
}
static inline void ast_clear_flag(struct ast_channel *chan, int mode)
{
chan->flag &= ~mode;
chan->flags &= ~mode;
}
static inline void ast_copy_flags(struct ast_channel *dest, struct ast_channel *src, int flags)
{
dest->flags &= ~flags;
dest->flags |= (src->flags & flags);
}
static inline void ast_set2_flag(struct ast_channel *chan, int value, int mode)
@ -894,13 +884,13 @@ static inline int ast_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds,
#endif
#define CHECK_BLOCKING(c) { \
if ((c)->blocking) {\
if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\
ast_log(LOG_WARNING, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \
CRASH; \
} else { \
(c)->blocker = pthread_self(); \
(c)->blockproc = __PRETTY_FUNCTION__; \
c->blocking = -1; \
ast_set_flag(c, AST_FLAG_BLOCKING); \
} }
extern unsigned int ast_get_group(char *s);

5
indications.c
Unescape View File

@ -84,7 +84,10 @@ static void * playtones_alloc(struct ast_channel *chan, void *params)
ps->items = pd->items;
}
/* Let interrupts interrupt :) */
chan->writeinterrupt = pd->interruptible;
if (pd->interruptible)
ast_set_flag(chan, AST_FLAG_WRITE_INT);
else
ast_clear_flag(chan, AST_FLAG_WRITE_INT);
return ps;
}

33
pbx.c
Unescape View File

@ -460,29 +460,9 @@ int pbx_exec(struct ast_channel *c, /* Channel */
char *saved_c_appl;
char *saved_c_data;
int stack = c->stack;
int (*execute)(struct ast_channel *chan, void *data) = app->execute;
if (newstack && stack > AST_CHANNEL_MAX_STACK - 2) {
/* Don't allow us to go over the max number of stacks we
permit saving. */
ast_log(LOG_WARNING, "Stack overflow, cannot create another stack\n");
return -1;
}
if (newstack && (res = setjmp(c->jmp[++c->stack]))) {
/* Okay, here's where it gets weird. If newstack is non-zero,
then we increase the stack increment, but setjmp is not going
to return until longjmp is called -- when the application
exec'd is finished running. */
if (res == 1)
res = 0;
if (c->stack != stack + 1)
ast_log(LOG_WARNING, "Stack returned to an unexpected place!\n");
else if (c->app[c->stack])
ast_log(LOG_WARNING, "Application may have forgotten to free its memory\n");
c->stack = stack;
return res;
} else {
if (newstack) {
if (c->cdr)
ast_cdr_setapp(c->cdr, app->name, data);
@ -496,13 +476,10 @@ int pbx_exec(struct ast_channel *c, /* Channel */
/* restore channel values */
c->appl= saved_c_appl;
c->data= saved_c_data;
/* Any application that returns, we longjmp back, just in case. */
if (c->stack != stack + 1)
ast_log(LOG_WARNING, "Stack is not at expected value\n");
longjmp(c->jmp[stack+1], res);
/* Never returns */
}
return res;
} else
ast_log(LOG_WARNING, "You really didn't want to call this function with newstack set to 0\n");
return -1;
}

4
res/res_features.c
Unescape View File

@ -620,7 +620,9 @@ static void *do_parking_thread(void *ignore)
for (x=0;x<AST_MAX_FDS;x++) {
if ((pu->chan->fds[x] > -1) && (FD_ISSET(pu->chan->fds[x], &rfds) || FD_ISSET(pu->chan->fds[x], &efds))) {
if (FD_ISSET(pu->chan->fds[x], &efds))
pu->chan->exception = 1;
ast_set_flag(pu->chan, AST_FLAG_EXCEPTION);
else
ast_clear_flag(pu->chan, AST_FLAG_EXCEPTION);
pu->chan->fdno = x;
/* See if they need servicing */
f = ast_read(pu->chan);

Write Preview
Loading…
Cancel
Save