[asterisk-commits] jpeeler: branch 1.4 r306120 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb  3 14:43:59 2011
New Revision: 306120

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=306120
Log:
Fix no MOH and frame queueing problem for parked calls.

This was a regression introduced when select was changed to poll and was
just a conversion error: POLLPRI detects OOB data, not POLLERR.

(closes issue #18637)
Reported by: jvandal


Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/res/res_features.c?view=diff&rev=306120&r1=306119&r2=306120
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Thu Feb  3 14:43:59 2011
@@ -2764,12 +2764,12 @@
 						continue;
 					}
 
-					if (!(fds[y].revents & (POLLIN | POLLERR))) {
+					if (!(fds[y].revents & (POLLIN | POLLERR | POLLPRI))) {
 						/* Next x */
 						continue;
 					}
 
-					if (fds[y].revents & POLLERR) {
+					if (fds[y].revents & POLLPRI) {
 						ast_set_flag(chan, AST_FLAG_EXCEPTION);
 					} else {
 						ast_clear_flag(chan, AST_FLAG_EXCEPTION);
@@ -2835,7 +2835,7 @@
 							}
 							new_fds = tmp;
 							new_fds[new_nfds].fd = chan->fds[x];
-							new_fds[new_nfds].events = POLLIN | POLLERR;
+							new_fds[new_nfds].events = POLLIN | POLLERR | POLLPRI;
 							new_fds[new_nfds].revents = 0;
 							new_nfds++;
 						}