[libpri-commits] rmudgett: branch 1.4 r1310 - in /branches/1.4: pri_facility.c pri_internal.h

[SVN commits to the libpri project]

Author: rmudgett
Date: Fri Nov 13 16:59:35 2009
New Revision: 1310

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1310
Log:
There must be only one source for the invoke id values per D channel group.

If there are potentially multiple sources for the invoke id sequence then
we could get confused if there are multiple outstanding messages with the
same invoke id that get responses.

Modified:
    branches/1.4/pri_facility.c
    branches/1.4/pri_internal.h

Modified: branches/1.4/pri_facility.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/pri_facility.c?view=diff&rev=1310&r1=1309&r2=1310
==============================================================================
--- branches/1.4/pri_facility.c (original)
+++ branches/1.4/pri_facility.c Fri Nov 13 16:59:35 2009
@@ -42,6 +42,7 @@
 
 static short get_invokeid(struct pri *ctrl)
 {
+	ctrl = PRI_MASTER(ctrl);
 	return ++ctrl->last_invoke;
 }
 

Modified: branches/1.4/pri_internal.h
URL: http://svnview.digium.com/svn/libpri/branches/1.4/pri_internal.h?view=diff&rev=1310&r1=1309&r2=1310
==============================================================================
--- branches/1.4/pri_internal.h (original)
+++ branches/1.4/pri_internal.h Fri Nov 13 16:59:35 2009
@@ -138,7 +138,7 @@
 	unsigned int q931_rxcount;
 #endif
 
-	short last_invoke;	/* Last ROSE invoke ID */
+	short last_invoke;	/* Last ROSE invoke ID (Valid in master record only) */
 	unsigned char sendfacility;
 };