[asterisk-commits] russell: trunk r78372 - in /trunk: ./ channels/chan_zap.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Aug 7 12:46:01 CDT 2007
Author: russell
Date: Tue Aug 7 12:46:00 2007
New Revision: 78372
URL: http://svn.digium.com/view/asterisk?view=rev&rev=78372
Log:
Merged revisions 78371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r78371 | russell | 2007-08-07 12:45:30 -0500 (Tue, 07 Aug 2007) | 12 lines
Merged revisions 78370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r78370 | russell | 2007-08-07 12:44:04 -0500 (Tue, 07 Aug 2007) | 4 lines
Revert patch committed for issue #9660. It broke E&M trunks.
(closes issue #10360)
(closes issue #10364)
........
................
Modified:
trunk/ (props changed)
trunk/channels/chan_zap.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=78372&r1=78371&r2=78372
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Aug 7 12:46:00 2007
@@ -1757,20 +1757,14 @@
static inline int zt_set_hook(int fd, int hs)
{
- int x, res, count = 0;
+ int x, res;
x = hs;
res = ioctl(fd, ZT_HOOK, &x);
- while (res < 0 && count < 20) {
- usleep(100000); /* 1/10 sec. */
- x = hs;
- res = ioctl(fd, ZT_HOOK, &x);
- count++;
- }
-
if (res < 0) {
- if (errno == EINPROGRESS) return 0;
+ if (errno == EINPROGRESS)
+ return 0;
ast_log(LOG_WARNING, "zt hook failed: %s\n", strerror(errno));
}
More information about the asterisk-commits
mailing list