diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2010-04-30 22:36:49 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2010-04-30 22:36:49 +0000 |
| commit | 6dd80de93da6be77d765cbbf8f419a5e53899440 (patch) | |
| tree | cf16dd756f19b46b97cf4f967f3fe0254638baa9 /channels/sig_analog.h | |
| parent | 00a1a96ff55ff7a9b99955d177cc9ba4d0a20462 (diff) | |
Merged revisions 260434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r260434 | jpeeler | 2010-04-30 17:22:46 -0500 (Fri, 30 Apr 2010) | 11 lines
Ensure channel state is not incorrectly set in the case of a very early answer.
The needringing bit was being read in dahdi_read after answering thereby
setting the state to ringing from up. This clears needringing upon answering
so that is no longer possible.
(closes issue #17067)
Reported by: tzafrir
Patches:
needringing.diff uploaded by tzafrir (license 46)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@260437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.h')
| -rw-r--r-- | channels/sig_analog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/sig_analog.h b/channels/sig_analog.h index 57fc5c1f2..e6c07286b 100644 --- a/channels/sig_analog.h +++ b/channels/sig_analog.h @@ -144,6 +144,7 @@ struct analog_callback { int (* const on_hook)(void *pvt); /*! \brief Set channel off hook */ int (* const off_hook)(void *pvt); + void (* const set_needringing)(void *pvt, int value); /* We're assuming that we're going to only wink on ANALOG_SUB_REAL - even though in the code there's an argument to the index * function */ int (* const wink)(void *pvt, enum analog_sub sub); |