[libpri-commits] rmudgett: branch 1.4 r2174 - /branches/1.4/q931.c

[SVN commits to the libpri project]

Author: rmudgett
Date: Tue Dec 21 13:41:52 2010
New Revision: 2174

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=2174
Log:
Fix Q.931 retried SETUP not sending facility ies.

Resend standard facility ies when the SETUP is retried by Q.931.  However,
one time facility ies are no longer available to add to a retried SETUP
message.

Modified:
    branches/1.4/q931.c

Modified: branches/1.4/q931.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q931.c?view=diff&rev=2174&r1=2173&r2=2174
==============================================================================
--- branches/1.4/q931.c (original)
+++ branches/1.4/q931.c Tue Dec 21 13:41:52 2010
@@ -5408,16 +5408,17 @@
 	c->t303_expirycnt++;
 	c->t303_timer = 0;
 
-	/*!
-	 * \todo XXX Resending the SETUP message loses all facility ies
-	 * that the original may have had.  Actually any message Q.931
-	 * retransmits will lose the facility ies.
-	 */
-
 	if (c->cause != -1) {
 		/* We got a DISCONNECT, RELEASE, or RELEASE_COMPLETE and no other responses. */
 		pri_fake_clearing(c);
 	} else if (c->t303_expirycnt < 2) {
+		/*!
+		 * \todo XXX Resending the SETUP message loses any facility ies
+		 * that the original may have had that were not added by
+		 * pri_call_add_standard_apdus().  Actually any message Q.931
+		 * retransmits will lose the facility ies.
+		 */
+		pri_call_add_standard_apdus(ctrl, c);
 		c->cc.saved_ie_contents.length = 0;
 		c->cc.saved_ie_flags = 0;
 		if (ctrl->link.next && !ctrl->bri)