From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 21 Aug 2008 23:39:31 +0000 (+0000)
Subject: Fixes loop that could possibly never exit in the event of a channel never being able... 
X-Git-Tag: 1.4.22-rc3~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc0e5dd3f9ace63804ac53cace22beda1b057269;p=thirdparty%2Fasterisk.git

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@139387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 125a971e19..e650ed291b 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -7342,12 +7342,14 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
 		int chan_sig = conf->chan.sig;
 		if (!here) {
 			if ((channel != CHAN_PSEUDO) && !pri) {
+				int count = 0;
 				snprintf(fn, sizeof(fn), "%d", channel);
 				/* Open non-blocking */
 				tmp->subs[SUB_REAL].dfd = dahdi_open(fn);
-				while (tmp->subs[SUB_REAL].dfd < 0 && reloading == 2) { /* the kernel may not call dahdi_release fast enough for the open flagbit to be cleared in time */
+				while (tmp->subs[SUB_REAL].dfd < 0 && reloading == 2 && count < 1000) { /* the kernel may not call dahdi_release fast enough for the open flagbit to be cleared in time */
 					usleep(1);
 					tmp->subs[SUB_REAL].dfd = dahdi_open(fn);
+					count++;
 				}
 				/* Allocate a DAHDI structure */
 				if (tmp->subs[SUB_REAL].dfd < 0) {