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

[SVN commits to the libpri project]

Author: mattf
Date: Tue Nov 10 18:23:44 2009
New Revision: 1293

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1293
Log:
Merged revisions 1291 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

........
r1291 | mattf | 2009-11-10 18:22:47 -0600 (Tue, 10 Nov 2009) | 1 line

Make sure we also revive links for PRIs, not just PTMP TE BRIs when we get a disconnect message
........

Modified:
    team/mattf/libpri-1.4-q921-rewrite/   (props changed)
    team/mattf/libpri-1.4-q921-rewrite/pri_internal.h
    team/mattf/libpri-1.4-q921-rewrite/q921.c

Propchange: team/mattf/libpri-1.4-q921-rewrite/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 10 18:23:44 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-1290
+/branches/1.4:1-1292

Modified: team/mattf/libpri-1.4-q921-rewrite/pri_internal.h
URL: http://svnview.digium.com/svn/libpri/team/mattf/libpri-1.4-q921-rewrite/pri_internal.h?view=diff&rev=1293&r1=1292&r2=1293
==============================================================================
--- team/mattf/libpri-1.4-q921-rewrite/pri_internal.h (original)
+++ team/mattf/libpri-1.4-q921-rewrite/pri_internal.h Tue Nov 10 18:23:44 2009
@@ -612,6 +612,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: 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=1293&r1=1292&r2=1293
==============================================================================
--- team/mattf/libpri-1.4-q921-rewrite/q921.c (original)
+++ team/mattf/libpri-1.4-q921-rewrite/q921.c Tue Nov 10 18:23:44 2009
@@ -1976,8 +1976,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;
 #endif