Don't qualify with overlap dial anymore

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3014 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/Makefile b/channels/Makefile
index 32f611c92a5657bc4a921e93c2c0576bf271372a..a5274a9c2c3df41d54aaed005dc9ea3cfff5795f 100755 (executable)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -26,7 +26,7 @@ CHANNEL_LIBS=chan_modem.so chan_sip.so \
 # If you really want IAX1 uncomment the following, but it is
 # unmaintained
 #
-#CHANNEL_LIBS+=chan_iax.so
+CHANNEL_LIBS+=chan_iax.so
 
 #
 # If you really want VoFR you can have it :-P

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 84a6896e3828af15c8738f64c29cb04e3814ca1a..0ac13e620d462891ea70e77d30cd08c44c9ba7ac 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3850,7 +3850,7 @@ static int zt_write(struct ast_channel *ast, struct ast_frame *frame)
        }
        
 #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 (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS
@@ -3936,7 +3936,7 @@ static int zt_indicate(struct ast_channel *chan, int condition)
                        break;
                case AST_CONTROL_RINGING:
 #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 (!pri_grab(p, p->pri)) {
                                                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);
 #ifdef ZAPATA_PRI
 #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 (!pri_grab(p, p->pri)) {
 #ifdef PRI_PROGRESS