[svn-commits] mattf: branch mattf/asterisk-trunk-ntptmp r207906 - /team/mattf/asterisk-trun...

[SVN commits to the Digium repositories]

Author: mattf
Date: Tue Jul 21 17:13:03 2009
New Revision: 207906

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207906
Log:
Check in some changes for NT-PTMP support

Modified:
    team/mattf/asterisk-trunk-ntptmp/channels/chan_dahdi.c
    team/mattf/asterisk-trunk-ntptmp/channels/sig_pri.c

Modified: team/mattf/asterisk-trunk-ntptmp/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mattf/asterisk-trunk-ntptmp/channels/chan_dahdi.c?view=diff&rev=207906&r1=207905&r2=207906
==============================================================================
--- team/mattf/asterisk-trunk-ntptmp/channels/chan_dahdi.c (original)
+++ team/mattf/asterisk-trunk-ntptmp/channels/chan_dahdi.c Tue Jul 21 17:13:03 2009
@@ -581,12 +581,6 @@
 };
 
 static struct dahdi_pri pris[NUM_SPANS];
-
-#if 0
-#define DEFAULT_PRI_DEBUG (PRI_DEBUG_Q931_DUMP | PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW | PRI_DEBUG_Q921_STATE)
-#else
-#define DEFAULT_PRI_DEBUG 0
-#endif
 
 #else
 /*! Shut up the compiler */
@@ -15157,7 +15151,8 @@
 					confp->chan.sig = SIG_BRI_PTMP;
 					confp->pri.pri.nodetype = PRI_CPE;
 				} else if (!strcasecmp(v->value, "bri_net_ptmp")) {
-					ast_log(LOG_WARNING, "How cool would it be if someone implemented this mode!  For now, sucks for you. (line %d)\n", v->lineno);
+					confp->chan.sig = SIG_BRI_PTMP;
+					confp->pri.pri.nodetype = PRI_NETWORK;
 #endif
 #ifdef HAVE_SS7
 				} else if (!strcasecmp(v->value, "ss7")) {

Modified: team/mattf/asterisk-trunk-ntptmp/channels/sig_pri.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/mattf/asterisk-trunk-ntptmp/channels/sig_pri.c?view=diff&rev=207906&r1=207905&r2=207906
==============================================================================
--- team/mattf/asterisk-trunk-ntptmp/channels/sig_pri.c (original)
+++ team/mattf/asterisk-trunk-ntptmp/channels/sig_pri.c Tue Jul 21 17:13:03 2009
@@ -59,6 +59,11 @@
 #define PRI_SPAN(p) (((p) >> 8) & 0xff)
 #define PRI_EXPLICIT(p) (((p) >> 16) & 0x01)
 
+#if 1
+#define DEFAULT_PRI_DEBUG (PRI_DEBUG_Q931_DUMP | PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW | PRI_DEBUG_Q921_STATE)
+#else
+#define DEFAULT_PRI_DEBUG 0
+#endif
 
 #define DCHAN_AVAILABLE	(DCHAN_NOTINALARM | DCHAN_UP)
 
@@ -2263,7 +2268,7 @@
 			ast_log(LOG_ERROR, "Unable to create PRI structure\n");
 			return -1;
 		}
-		pri_set_debug(pri->dchans[i], 0);
+		pri_set_debug(pri->dchans[i], DEFAULT_PRI_DEBUG);
 		pri_set_nsf(pri->dchans[i], pri->nsf);
 #ifdef PRI_GETSET_TIMERS
 		for (x = 0; x < PRI_MAX_TIMERS; x++) {