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

[SVN commits to the libpri project]

Author: mattf
Date: Fri Nov 13 12:46:51 2009
New Revision: 1307

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1307
Log:
Make sure subchannel is the right subchannel for sending iframes on TE-PTMP, and other fixes.

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=1307&r1=1306&r2=1307
==============================================================================
--- team/mattf/libpri-1.4-q921-rewrite/q921.c (original)
+++ team/mattf/libpri-1.4-q921-rewrite/q921.c Fri Nov 13 12:46:51 2009
@@ -771,7 +771,7 @@
 		}
 	} else if (BRI_TE_PTMP(vpri)) {
 		/* We don't care what the tei is, since we only support one sub and one TEI */
-		pri = vpri;
+		pri = PRI_MASTER(vpri)->subchannel;
 
 		if (pri->q921_state == Q921_TEI_UNASSIGNED) {
 			q921_tei_request(vpri);
@@ -2090,7 +2090,6 @@
 				} else {
 					int res;
 
-					//res = q931_receive(PRI_MASTER(pri), pri->tei, (q931_h *) h->u.data, len - 3);
 					res = q931_receive(pri, pri->tei, (q931_h *) h->u.data, len - 3);
 					if (res == -1) {
 						return NULL;
@@ -2298,9 +2297,11 @@
 void q921_start(struct pri *pri)
 {
 	if (PTMP_MODE(pri)) {
-		q921_setstate(pri, Q921_TEI_UNASSIGNED);
 		if (TE_MODE(pri)) {
+			q921_setstate(pri, Q921_ASSIGN_AWAITING_TEI);
 			q921_tei_request(pri);
+		} else {
+			q921_setstate(pri, Q921_TEI_UNASSIGNED);
 		}
 	} else {
 		/* PTP mode, no need for TEI management junk */