[asterisk-commits] rmudgett: branch 1.4 r294821 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Nov 11 20:41:13 2010
New Revision: 294821

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294821
Log:
Asterisk is getting a "No D-channels available!" warning message every 4 seconds.

Asterisk is just whining too much with this message: "No D-channels
available!  Using Primary channel XXX as D-channel anyway!".

Filtered the message so it only comes out once if there is no D channel
available without an intervening D channel available period.

(closes issue #17270)
Reported by: jmls

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=294821&r1=294820&r2=294821
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Thu Nov 11 20:41:13 2010
@@ -348,6 +348,8 @@
 #ifdef HAVE_PRI_INBANDDISCONNECT
 	unsigned int inbanddisconnect:1;				/*!< Should we support inband audio after receiving DISCONNECT? */
 #endif
+	/*! TRUE if we have already whined about no D channels available. */
+	unsigned int no_d_channels:1;
 	time_t lastreset;						/*!< time when unused channels were last reset */
 	long resetinterval;						/*!< Interval (in seconds) for resetting unused channels */
 	struct dahdi_pvt *pvts[MAX_CHANNELS];				/*!< Member channel pvt structs */
@@ -2820,8 +2822,14 @@
 	}
 	if (newslot < 0) {
 		newslot = 0;
-		ast_log(LOG_WARNING, "No D-channels available!  Using Primary channel %d as D-channel anyway!\n",
-			pri->dchannels[newslot]);
+		if (!pri->no_d_channels) {
+			pri->no_d_channels = 1;
+			ast_log(LOG_WARNING,
+				"No D-channels available!  Using Primary channel %d as D-channel anyway!\n",
+				pri->dchannels[newslot]);
+		}
+	} else {
+		pri->no_d_channels = 0;
 	}
 	if (old && (oldslot != newslot))
 		ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
@@ -9395,6 +9403,7 @@
 
 			switch (e->e) {
 			case PRI_EVENT_DCHAN_UP:
+				pri->no_d_channels = 0;
 				if (!pri->pri) pri_find_dchan(pri);
 
 				/* Note presense of D-channel */