[asterisk-commits] murf: branch murf/bug6683 r63400 - /team/murf/bug6683/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Tue May  8 08:11:47 2007
New Revision: 63400

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63400
Log:
Put in some debugs, just to make sure options got set, etc.

Modified:
    team/murf/bug6683/channels/chan_zap.c

Modified: team/murf/bug6683/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug6683/channels/chan_zap.c?view=diff&rev=63400&r1=63399&r2=63400
==============================================================================
--- team/murf/bug6683/channels/chan_zap.c (original)
+++ team/murf/bug6683/channels/chan_zap.c Tue May  8 08:11:47 2007
@@ -6451,10 +6451,12 @@
 		 * and we're set to use a polarity reversal to trigger the start of caller id,
 		 * grab the caller id and wait for ringing to start... */
 		} else if (p->use_callerid && (chan->_state == AST_STATE_PRERING && (p->cid_start == CID_START_POLARITY || p->cid_start == CID_START_POLARITY_IN))) {
+			ast_log(LOG_DEBUG,"In state prering");
 			/* If set to use DTMF CID signalling, listen for DTMF */
 			if (p->cid_signalling == CID_SIG_DTMF) {
 				int i = 0;
 				cs = NULL;
+				ast_log(LOG_DEBUG,"SIG_DTMF\n");
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Receiving DTMF cid on "
 						"channel %s\n", chan->name);
@@ -6497,9 +6499,11 @@
 					number = NULL;
 			/* If set to use V23 Signalling, launch our FSK gubbins and listen for it */
 			} else if ((p->cid_signalling == CID_SIG_V23) || (p->cid_signalling == CID_SIG_V23_JP)) {
+				ast_log(LOG_DEBUG,"SIG_V23\n");
 				cs = callerid_new(p->cid_signalling);
 				if (cs) {
 					samples = 0;
+
 #if 1
 					bump_gains(p);
 #endif				
@@ -7058,10 +7062,14 @@
 		case SIG_SF_FEATB:
 		case SIG_SF:
 				/* Check for callerid, digits, etc */
-				if (i->cid_start == CID_START_POLARITY_IN)
+				if (i->cid_start == CID_START_POLARITY_IN) {
+					ast_log(LOG_DEBUG,"POLARITY_IN, PRERING\n");
+					ast_log(LOG_DEBUG,"POLARITY_IN, PRERING\n");
 					chan = zt_new(i, AST_STATE_PRERING, 0, SUB_REAL, 0, 0);
-				else
+				} else {
+					ast_log(LOG_DEBUG,"POLARITY, PRERING\n");
 					chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0, 0);
+				}
 				if (chan && ast_pthread_create(&threadid, &attr, ss_thread, chan)) {
 					ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel);
 					res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);
@@ -7153,6 +7161,7 @@
 		case SIG_FXSKS:
 		case SIG_FXSGS:
 			if (i->cid_start == CID_START_POLARITY || i->cid_start == CID_START_POLARITY_IN) {
+				ast_log(LOG_DEBUG,"ZT_EVENT_POLARITY: START_POLARITY_*\n");
 				i->polarity = POLARITY_REV;
 				ast_verbose(VERBOSE_PREFIX_2 "Starting post polarity "
 					    "CID detection on channel %d\n",