diff options
author | Richard Mudgett <rmudgett@digium.com> | 2011-04-05 18:47:11 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2011-04-05 18:47:11 +0000 |
commit | 698a356737bc396c967202feb2620979f1596694 (patch) | |
tree | 6b605e7c36fc7beaf76b3e239839e89e124cd763 /channels/sig_pri.h | |
parent | ad30fa75692f92d72be81133de789c6a27d50233 (diff) |
Merged revisions 312949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r312949 | rmudgett | 2011-04-05 13:45:24 -0500 (Tue, 05 Apr 2011) | 6 lines
Crash if ISDN span layer 1 is down on initial load.
Regression from -r312575 B channel shifting during negotiation.
* Also combine updating the alarm flag with clearing the resetting flag.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312950 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_pri.h')
-rw-r--r-- | channels/sig_pri.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/sig_pri.h b/channels/sig_pri.h index f75646e3f..148397fc6 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -581,6 +581,7 @@ int sig_pri_digit_begin(struct sig_pri_chan *pvt, struct ast_channel *ast, char void sig_pri_stop_pri(struct sig_pri_span *pri); int sig_pri_start_pri(struct sig_pri_span *pri); +void sig_pri_set_alarm(struct sig_pri_chan *p, int in_alarm); void sig_pri_chan_alarm_notify(struct sig_pri_chan *p, int noalarm); void pri_event_alarm(struct sig_pri_span *pri, int index, int before_start_pri); |