[svn-commits] mmichelson: branch 1.4 r103070 - /branches/1.4/channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb  8 12:00:38 2008
New Revision: 103070

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103070
Log:
Yield the thread and return -1 if the ioctl fails for Zaptel timing device.

(closes issue #11891)
Reported by: tzafrir


Modified:
    branches/1.4/channels/chan_iax2.c

Modified: branches/1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_iax2.c?view=diff&rev=103070&r1=103069&r2=103070
==============================================================================
--- branches/1.4/channels/chan_iax2.c (original)
+++ branches/1.4/channels/chan_iax2.c Fri Feb  8 12:00:38 2008
@@ -6360,9 +6360,11 @@
 	if (events & AST_IO_PRI) {
 #ifdef ZT_TIMERACK
 		/* Great, this is a timing interface, just call the ioctl */
-		if (ioctl(fd, ZT_TIMERACK, &x)) 
-			ast_log(LOG_WARNING, "Unable to acknowledge zap timer\n");
-		res = 0;
+		if (ioctl(fd, ZT_TIMERACK, &x)) {
+			ast_log(LOG_WARNING, "Unable to acknowledge zap timer. IAX trunking will fail!\n");
+			usleep(1);
+			return -1;
+		}
 #endif		
 	} else {
 		/* Read and ignore from the pseudo channel for timing */