[libpri-commits] mattf: trunk r428 - in /trunk: ./ q931.c

[SVN commits to the libpri project]

Author: mattf
Date: Tue Jun 19 13:24:20 2007
New Revision: 428

URL: http://svn.digium.com/view/libpri?view=rev&rev=428
Log:
Merged revisions 427 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

................
r427 | mattf | 2007-06-19 13:23:36 -0500 (Tue, 19 Jun 2007) | 9 lines

Merged revisions 426 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r426 | mattf | 2007-06-19 13:22:33 -0500 (Tue, 19 Jun 2007) | 1 line

Try to send pending facility messages if we receive alerting (for when we don't get proceeding) (#9651)
........

................

Modified:
    trunk/   (props changed)
    trunk/q931.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Tue Jun 19 13:24:20 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-332,385,389,415,423
+/branches/1.2:1-332,385,389,415,423,426

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jun 19 13:24:20 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390,416,424
+/branches/1.4:1-372,386,390,416,424,427

Modified: trunk/q931.c
URL: http://svn.digium.com/view/libpri/trunk/q931.c?view=diff&rev=428&r1=427&r2=428
==============================================================================
--- trunk/q931.c (original)
+++ trunk/q931.c Tue Jun 19 13:24:20 2007
@@ -3348,6 +3348,16 @@
 		pri->ev.ringing.progressmask = c->progressmask;
 		libpri_copy_string(pri->ev.ringing.useruserinfo, c->useruserinfo, sizeof(pri->ev.ringing.useruserinfo));
 		c->useruserinfo[0] = '\0';
+
+		cur = c->apdus;
+		while (cur) {
+			if (!cur->sent && cur->message == Q931_FACILITY) {
+				q931_facility(pri, c);
+				break;
+			}
+			cur = cur->next;
+		}
+
 		return Q931_RES_HAVEEVENT;
 	case Q931_CONNECT:
 		if (c->newcall) {