[svn-commits] mmichelson: trunk r103071 - in /trunk: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb  8 12:02:48 2008
New Revision: 103071

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103071
Log:
Merged revisions 103070 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103070 | mmichelson | 2008-02-08 12:00:38 -0600 (Fri, 08 Feb 2008) | 6 lines

Yield the thread and return -1 if the ioctl fails for Zaptel timing device.

(closes issue #11891)
Reported by: tzafrir


........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=103071&r1=103070&r2=103071
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Fri Feb  8 12:02:48 2008
@@ -6980,9 +6980,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 */