[svn-commits] mattf: branch 1.4 r1291 - in /branches/1.4: pri_internal.h q921.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Tue Nov 10 18:22:47 2009
New Revision: 1291

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1291
Log:
Make sure we also revive links for PRIs, not just PTMP TE BRIs when we get a disconnect message

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

Modified: branches/1.4/pri_internal.h
URL: http://svnview.digium.com/svn/libpri/branches/1.4/pri_internal.h?view=diff&rev=1291&r1=1290&r2=1291
==============================================================================
--- branches/1.4/pri_internal.h (original)
+++ branches/1.4/pri_internal.h Tue Nov 10 18:22:47 2009
@@ -604,6 +604,15 @@
 	return pri->bri && (((pri)->localtype == PRI_CPE) && ((pri)->tei == Q921_TEI_GROUP));
 }
 
+static inline int PRI_PTP(struct pri *mypri)
+{
+	struct pri *pri;
+
+	pri = PRI_MASTER(mypri);
+
+	return !pri->bri;
+}
+
 #define Q931_DUMMY_CALL_REFERENCE	-1
 
 /*!

Modified: branches/1.4/q921.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q921.c?view=diff&rev=1291&r1=1290&r2=1291
==============================================================================
--- branches/1.4/q921.c (original)
+++ branches/1.4/q921.c Tue Nov 10 18:22:47 2009
@@ -1220,8 +1220,8 @@
 			/* Acknowledge */
 			q921_send_ua(pri, h->u.p_f);
 			ev = q921_dchannel_down(pri);
-			if (BRI_TE_PTMP(pri)) {
-				q921_restart(pri, 0);
+			if (BRI_TE_PTMP(pri) || PRI_PTP(pri)) {
+				q921_restart(pri, PRI_PTP(pri) ? 1 : 0);
 			}
 			return ev;
 		case 3: