diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-20 03:13:24 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-11-20 03:13:24 +0000 |
| commit | 20147eda82ef32bc0c9efce159862d93578170f4 (patch) | |
| tree | f50da37ada7907797a4bfa06416379177188c8e7 /channels/chan_dahdi.c | |
| parent | a08dd79e87afb8b1aeb9b0d996725003b5fd0128 (diff) | |
Merged revisions 295747 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r295747 | rmudgett | 2010-11-19 21:11:15 -0600 (Fri, 19 Nov 2010) | 13 lines
One way audio before answering call waiting call on analog port.
* Analog call waiting Caller ID spills could get stuck resulting in one
way audio until the waiting call is answered. This only happens on the
second (and later) call waiting call if the active call is not the first
call.
* The CLI/AMI "dahdi show channel" command could report the wrong channel
information.
Must keep the struct analog_pvt.owner and struct dahdi_pvt.owner pointer
in sync.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@295748 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 8bbf9e97b..b6f91f7c6 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2246,6 +2246,13 @@ static void my_set_pulsedial(void *pvt, int flag) p->pulsedial = flag; } +static void my_set_new_owner(void *pvt, struct ast_channel *new_owner) +{ + struct dahdi_pvt *p = pvt; + + p->owner = new_owner; +} + static const char *my_get_orig_dialstring(void *pvt) { struct dahdi_pvt *p = pvt; @@ -3528,6 +3535,7 @@ static struct analog_callback dahdi_analog_callbacks = .cancel_cidspill = my_cancel_cidspill, .confmute = my_confmute, .set_pulsedial = my_set_pulsedial, + .set_new_owner = my_set_new_owner, .get_orig_dialstring = my_get_orig_dialstring, .set_needringing = my_set_needringing, .set_polarity = my_set_polarity, |