[asterisk-commits] sruffell: branch 1.6.2 r303106 - /branches/1.6.2/main/features.c

[SVN commits to the Asterisk project]

Author: sruffell
Date: Thu Jan 20 13:56:34 2011
New Revision: 303106

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=303106
Log:
main/features: Use POLLPRI when waiting for events on parked channels.

This change resolves a regression in the 1.6.2 when converting from
select to poll.  The DAHDI timers use POLLPRI to indicate that the timer
fired, but features was not waiting for that flag.  The result was no
audio for MOH when a call was parked and res_timing_dahdi was in use.

This patch is slightly modified from the one on the mantis issue.  It does
not set an exception on the channel if the POLLPRI flag is set.

(closes issue #18262)
Reported by: francesco_r
Patches:
      patch_park_moh-trunk-2.txt uploaded by cjacobsen (license 1029)
      Tested by: francesco_r, rfrantik, one47

Modified:
    branches/1.6.2/main/features.c

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=303106&r1=303105&r2=303106
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Thu Jan 20 13:56:34 2011
@@ -3489,7 +3489,7 @@
 					continue;
 				}
 
-				if (!(pfds[y].revents & (POLLIN | POLLERR))) {
+				if (!(pfds[y].revents & (POLLIN | POLLERR | POLLPRI))) {
 					/* Next x */
 					continue;
 				}
@@ -3546,7 +3546,7 @@
 						}
 						*new_pfds = tmp;
 						(*new_pfds)[*new_nfds].fd = chan->fds[x];
-						(*new_pfds)[*new_nfds].events = POLLIN | POLLERR;
+						(*new_pfds)[*new_nfds].events = POLLIN | POLLERR | POLLPRI;
 						(*new_pfds)[*new_nfds].revents = 0;
 						(*new_nfds)++;
 					}