Don't qualify with overlap dial anymore

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-19 15:11:27 +00:00
parent 5738da5225
commit ce55c480e9
2 changed files with 4 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ CHANNEL_LIBS=chan_modem.so chan_sip.so \
# If you really want IAX1 uncomment the following, but it is # If you really want IAX1 uncomment the following, but it is
# unmaintained # unmaintained
# #
#CHANNEL_LIBS+=chan_iax.so CHANNEL_LIBS+=chan_iax.so
# #
# If you really want VoFR you can have it :-P # If you really want VoFR you can have it :-P

View File

@@ -3850,7 +3850,7 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
} }
#ifdef PRI_EVENT_PROCEEDING #ifdef PRI_EVENT_PROCEEDING
if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) { if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
if (p->pri->pri) { if (p->pri->pri) {
if (!pri_grab(p, p->pri)) { if (!pri_grab(p, p->pri)) {
#ifdef PRI_PROGRESS #ifdef PRI_PROGRESS
@@ -3936,7 +3936,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
break; break;
case AST_CONTROL_RINGING: case AST_CONTROL_RINGING:
#ifdef ZAPATA_PRI #ifdef ZAPATA_PRI
if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) { if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
if (p->pri->pri) { if (p->pri->pri) {
if (!pri_grab(p, p->pri)) { if (!pri_grab(p, p->pri)) {
pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1); pri_acknowledge(p->pri->pri,p->call, p->prioffset, 1);
@@ -3964,7 +3964,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name); ast_log(LOG_DEBUG,"Received AST_CONTROL_PROGRESS on %s\n",chan->name);
#ifdef ZAPATA_PRI #ifdef ZAPATA_PRI
#ifdef PRI_EVENT_PROCEEDING #ifdef PRI_EVENT_PROCEEDING
if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) { if (!p->proceeding && p->sig==SIG_PRI && p->pri) {
if (p->pri->pri) { if (p->pri->pri) {
if (!pri_grab(p, p->pri)) { if (!pri_grab(p, p->pri)) {
#ifdef PRI_PROGRESS #ifdef PRI_PROGRESS