[libpri-commits] mattf: branch mattf/libpri-1.4-q921-rewrite r1308 - /team/mattf/libpri-1.4-q9...

[SVN commits to the libpri project]

Author: mattf
Date: Fri Nov 13 12:50:05 2009
New Revision: 1308

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1308
Log:
Fix a few things with using proper TEIs, and a backwards state reaction sequence

Modified:
    team/mattf/libpri-1.4-q921-rewrite/q921.c

Modified: team/mattf/libpri-1.4-q921-rewrite/q921.c
URL: http://svnview.digium.com/svn/libpri/team/mattf/libpri-1.4-q921-rewrite/q921.c?view=diff&rev=1308&r1=1307&r2=1308
==============================================================================
--- team/mattf/libpri-1.4-q921-rewrite/q921.c (original)
+++ team/mattf/libpri-1.4-q921-rewrite/q921.c Fri Nov 13 12:50:05 2009
@@ -774,12 +774,12 @@
 		pri = PRI_MASTER(vpri)->subchannel;
 
 		if (pri->q921_state == Q921_TEI_UNASSIGNED) {
-			q921_tei_request(vpri);
+			q921_tei_request(pri);
 			/* We don't setstate here because the pri with the TEI we need hasn't been created */
-			q921_setstate(vpri, Q921_ESTABLISH_AWAITING_TEI);
+			q921_setstate(pri, Q921_ESTABLISH_AWAITING_TEI);
 		}
 	} else {
-		/* Should just be PTP modes, which shouldn't have subs, but just in case, we'll do this */
+		/* Should just be PTP modes, which shouldn't have subs */
 		pri = vpri;
 	}
 
@@ -1348,10 +1348,10 @@
 		pri->tei = tei;
 
 		switch (pri->q921_state) {
+		case Q921_ASSIGN_AWAITING_TEI:
+			q921_setstate(pri, Q921_TEI_ASSIGNED);
+			break;
 		case Q921_ESTABLISH_AWAITING_TEI:
-			q921_setstate(pri, Q921_TEI_ASSIGNED);
-			break;
-		case Q921_ASSIGN_AWAITING_TEI:
 			q921_establish_data_link(pri);
 			pri->l3initiated = 1;
 			q921_setstate(pri, Q921_AWAITING_ESTABLISHMENT);