[svn-commits] rmudgett: branch rmudgett/aoc_event r1586 - /team/rmudgett/aoc_event/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Apr  9 17:45:10 2010
New Revision: 1586

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1586
Log:
Merged revisions 1579,1585 via svnmerge from 
https://origsvn.digium.com/svn/libpri/team/rmudgett/ect

................
  r1579 | root | 2010-04-09 17:26:43 -0500 (Fri, 09 Apr 2010) | 9 lines
  
  Merged revisions 1578 via svnmerge from 
  file:///srv/subversion/repos/libpri/team/group/ccss
  
  ........
    r1578 | root | 2010-04-09 17:26:39 -0500 (Fri, 09 Apr 2010) | 1 line
    
    automerge cancel
  ........
................
  r1585 | rmudgett | 2010-04-09 17:42:48 -0500 (Fri, 09 Apr 2010) | 16 lines
  
  Merged revisions 1584 via svnmerge from 
  https://origsvn.digium.com/svn/libpri/team/group/ccss
  
  ................
    r1584 | rmudgett | 2010-04-09 17:41:45 -0500 (Fri, 09 Apr 2010) | 9 lines
    
    Merged revisions 1577 via svnmerge from 
    https://origsvn.digium.com/svn/libpri/branches/1.4
    
    ........
      r1577 | rmudgett | 2010-04-09 16:43:42 -0500 (Fri, 09 Apr 2010) | 1 line
      
      Only one PROCEEDING message per call please.
    ........
  ................
................

Modified:
    team/rmudgett/aoc_event/   (props changed)
    team/rmudgett/aoc_event/q931.c

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- aoc_event-integrated (original)
+++ aoc_event-integrated Fri Apr  9 17:45:10 2010
@@ -1,1 +1,1 @@
-/team/rmudgett/ect:1-1555
+/team/rmudgett/ect:1-1585

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- ect-integrated (original)
+++ ect-integrated Fri Apr  9 17:45:10 2010
@@ -1,1 +1,1 @@
-/team/group/ccss:1-1549
+/team/group/ccss:1-1584

Propchange: team/rmudgett/aoc_event/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Apr  9 17:45:10 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-1548
+/branches/1.4:1-1583

Modified: team/rmudgett/aoc_event/q931.c
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/aoc_event/q931.c?view=diff&rev=1586&r1=1585&r2=1586
==============================================================================
--- team/rmudgett/aoc_event/q931.c (original)
+++ team/rmudgett/aoc_event/q931.c Fri Apr  9 17:45:10 2010
@@ -4538,6 +4538,10 @@
 
 int q931_call_proceeding(struct pri *ctrl, q931_call *c, int channel, int info)
 {
+	if (c->proc) {
+		/* We have already sent a PROCEEDING message.  Don't send another one. */
+		return 0;
+	}
 	if (c->ourcallstate == Q931_CALL_STATE_CALL_INDEPENDENT_SERVICE) {
 		/* Cannot send this message when in this state */
 		return 0;