FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: If a timer is not configured then we should block indefinitely.

Browse Source 
Some older Asterisk versions do not handle well the error message when poll is
called on an unconfigured channel. The result would be constant

__ast_read: No/unknown event '0' on timer for 'DAHDI/1-1'?

messages from Asterisk.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9937 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-06-02 20:01:20 +00:00
parent 20c8b9b597
commit ca9d290af1
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/dahdi/dahdi-base.c
View File

@ -8617,14 +8617,40 @@ static void process_timers(void)
spin_unlock(&dahdi_timer_lock); spin_unlock(&dahdi_timer_lock);
} }
static unsigned int dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table) /**
* dahdi_timer_poll - Poll function for a dahdi_timer.
* @file: Open timer handle.
* @wait_table: Just passing through...
*
* Returns 0 if there isn't anything to wake us up, otherwise POLLPRI if there
* is an event waiting on the timer.
*
* Older versions of Asterisk depend on the behavior that this poll will block
* indefintely if the timer has not been configured, so if there is no rate
* attached to the timer, this function must return 0.
*
*/
static unsigned int
dahdi_timer_poll(struct file *file, struct poll_table_struct *wait_table)
{ {
struct dahdi_timer *timer = file->private_data; struct dahdi_timer *timer = file->private_data;
struct dahdi_timer_rate *rate = timer->rate; struct dahdi_timer_rate *rate;
if (!rate || !timer) if (!timer)
return -EINVAL; return -EINVAL;
rate = timer->rate;
if (!rate) {
static bool __once;
if (!__once) {
__once = true;
module_printk(KERN_NOTICE,
"Calling poll on unconfigured timer.\n");
}
return 0;
}
poll_wait(file, &rate->sel, wait_table); poll_wait(file, &rate->sel, wait_table);
if (atomic_read(&timer->tripped) || atomic_read(&timer->ping)) if (atomic_read(&timer->tripped) || atomic_read(&timer->ping))
return POLLPRI; return POLLPRI;