[libpri-commits] rmudgett: branch rmudgett/ntptmp r1127 - in /team/rmudgett/ntptmp: ./ q931.c

[SVN commits to the libpri project]

Author: rmudgett
Date: Tue Sep 22 13:14:37 2009
New Revision: 1127

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1127
Log:
Merged revisions 1122 via svnmerge from 
https://origsvn.digium.com/svn/libpri/team/rmudgett/facility

................
  r1122 | root | 2009-09-22 12:18:33 -0500 (Tue, 22 Sep 2009) | 20 lines
  
  Merged revisions 1120 via svnmerge from 
  file:///srv/subversion/repos/libpri/branches/1.4
  
  ........
    r1120 | jpeeler | 2009-09-22 12:12:23 -0500 (Tue, 22 Sep 2009) | 13 lines
    
    Fix call reference to be associated with the D channel message was received
    
    The problem is that once a call reference was associated with a particular D
    channel, it always was. This created an issue with NFAS when the secondary D
    channel became active as the messages were still being sent on the non-active
    D channel.
    
    (closes issue #14959)
    Reported by: remiq
    Patches: 
          bug14959.patch uploaded by jpeeler (license 325)
    Tested by: remiq
  ........
................

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

Propchange: team/rmudgett/ntptmp/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/ntptmp/
------------------------------------------------------------------------------
--- ntptmp-integrated (original)
+++ ntptmp-integrated Tue Sep 22 13:14:37 2009
@@ -1,1 +1,1 @@
-/team/rmudgett/facility:1-1114
+/team/rmudgett/facility:1-1125

Propchange: team/rmudgett/ntptmp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 22 13:14:37 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-1109
+/branches/1.4:1-1121

Modified: team/rmudgett/ntptmp/q931.c
URL: http://svnview.digium.com/svn/libpri/team/rmudgett/ntptmp/q931.c?view=diff&rev=1127&r1=1126&r2=1127
==============================================================================
--- team/rmudgett/ntptmp/q931.c (original)
+++ team/rmudgett/ntptmp/q931.c Tue Sep 22 13:14:37 2009
@@ -3100,7 +3100,19 @@
 	prev = NULL;
 	while (cur) {
 		if (cur->cr == cr) {
-			goto done;
+			/* Found existing call. */
+			switch (ctrl->switchtype) {
+			case PRI_SWITCH_GR303_EOC:
+			case PRI_SWITCH_GR303_EOC_PATH:
+			case PRI_SWITCH_GR303_TMC:
+			case PRI_SWITCH_GR303_TMC_SWITCHING:
+				break;
+			default:
+				/* PRI is set to whoever called us */
+				cur->pri = ctrl;
+				break;
+			}
+			return cur;
 		}
 		prev = cur;
 		cur = cur->next;
@@ -3155,7 +3167,6 @@
 		*master->callpool = cur;
 	}
 
-done:
 	/* PRI is set to whoever called us */
 	cur->pri = ctrl;