[asterisk-commits] rmudgett: branch 1.6.2 r283049 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Aug 20 10:31:03 2010
New Revision: 283049

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283049
Log:
Merged revisions 283048 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r283048 | rmudgett | 2010-08-20 10:24:36 -0500 (Fri, 20 Aug 2010) | 22 lines
  
  Q931 - Sending PROGRESS after sending ALERTING is a protocol error
  
  The PRI layer in chan_dadhi will check if a PROGRESS message has already
  been sent, and not allow sending another (although that is technically
  allowed by the Q931 spec), however it does not protect against sending an
  ALERTING and then sending a PROGRESS message, which is a violation of the
  specification.
  
  Most switches don't seem to care too deeply about this, but some do, and
  will disconnect the call when receiving this invalid sequence.
  
  Protocol specification reference: T-REC-Q.931-199805-I page 223, "Figure
  A.5/Q.931 -- Overview protocol control (network side) point-point
  (sheet 3 of 8)"
  
  (closes issue #17874)
  Reported by: nic_bellamy
  Patches:
        asterisk-1.4-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
        asterisk-1.6.2-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
        asterisk-trunk-r282537_no-progress-after-alerting.patch uploaded by nic bellamy (license 299)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Aug 20 10:31:03 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893
+/branches/1.4:1-279056,279206,279945,280088,280341,280448,280811,280982,281390,281566,281762,281819,281911,282129,282430,282729,282893,283048

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=283049&r1=283048&r2=283049
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Fri Aug 20 10:31:03 2010
@@ -7381,7 +7381,7 @@
 			ast_debug(1,"Received AST_CONTROL_PROGRESS on %s\n",chan->name);
 #ifdef HAVE_PRI
 			p->digital = 0;	/* Digital-only calls isn't allows any inband progress messages */
-			if (!p->progress && ((p->sig == SIG_PRI) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP))
+			if (!p->progress && !p->alerting && ((p->sig == SIG_PRI) || (p->sig == SIG_BRI) || (p->sig == SIG_BRI_PTMP))
 					&& p->pri && !p->outgoing) {
 				if (p->pri->pri) {
 					if (!pri_grab(p, p->pri)) {