Merged revisions 103953 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 20 Feb 2008 22:10:30 +0000 (22:10 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 20 Feb 2008 22:10:30 +0000 (22:10 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103953 | file | 2008-02-20 18:06:59 -0400 (Wed, 20 Feb 2008) | 6 lines

Don't wait for additional digits when overlap dialing is enabled if the setup message contains the sending_complete information element.
(closes issue #11785)
Reported by: klaus3000
Patches:
      sending_complete_overlap_asterisk-1.4.17.patch.txt uploaded by klaus3000 (license 65)

........

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

channels/chan_zap.c

index 9377308..4233f72 100644 (file)
@@ -10534,7 +10534,7 @@ static void *pri_dchannel(void *vpri)
                                                pri->pvts[chanpos]->callingpres = e->ring.callingpres;
                                        
                                                /* Start PBX */
-                                               if ((pri->overlapdial & ZAP_OVERLAPDIAL_INCOMING) && ast_matchmore_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
+                                               if (!e->ring.complete && (pri->overlapdial & ZAP_OVERLAPDIAL_INCOMING) && ast_matchmore_extension(NULL, pri->pvts[chanpos]->context, pri->pvts[chanpos]->exten, 1, pri->pvts[chanpos]->cid_num)) {
                                                        /* Release the PRI lock while we create the channel */
                                                        ast_mutex_unlock(&pri->lock);
                                                        if (crv) {