[asterisk-commits] russell: branch 1.2 r78370 - /branches/1.2/channels/chan_zap.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Aug 7 12:44:04 CDT 2007
Author: russell
Date: Tue Aug 7 12:44:04 2007
New Revision: 78370
URL: http://svn.digium.com/view/asterisk?view=rev&rev=78370
Log:
Revert patch committed for issue #9660. It broke E&M trunks.
(closes issue #10360)
(closes issue #10364)
Modified:
branches/1.2/channels/chan_zap.c
Modified: branches/1.2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_zap.c?view=diff&rev=78370&r1=78369&r2=78370
==============================================================================
--- branches/1.2/channels/chan_zap.c (original)
+++ branches/1.2/channels/chan_zap.c Tue Aug 7 12:44:04 2007
@@ -1726,20 +1726,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