diff options
author | Richard Mudgett <rmudgett@digium.com> | 2012-03-06 17:47:40 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2012-03-06 17:47:40 +0000 |
commit | 82ac7fb6435f1fda562db646f4f8a3c26892342f (patch) | |
tree | d3c7af7d162fc2af5b44310a6e2321cdfc2f30d0 /channels | |
parent | a0f882174947112a683752f89f7cc43906367028 (diff) |
Fix ring cadance setup for outgoing calls on FXS ports.
* Fix referencing the wrong variable in chan_dahdi.c:my_set_cadence().
Thanks to Sean Bright for compiling with -Wshadow and finding this bug.
........
Merged revisions 358377 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 358378 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d65bb122e..6751d0d0c 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2254,7 +2254,7 @@ static int my_get_sub_fd(void *pvt, enum analog_sub sub) return p->subs[dahdi_sub].dfd; } -static void my_set_cadence(void *pvt, int *cidrings, struct ast_channel *ast) +static void my_set_cadence(void *pvt, int *cid_rings, struct ast_channel *ast) { struct dahdi_pvt *p = pvt; @@ -2262,11 +2262,11 @@ static void my_set_cadence(void *pvt, int *cidrings, struct ast_channel *ast) if ((p->distinctivering > 0) && (p->distinctivering <= num_cadence)) { if (ioctl(p->subs[SUB_REAL].dfd, DAHDI_SETCADENCE, &cadences[p->distinctivering - 1])) ast_log(LOG_WARNING, "Unable to set distinctive ring cadence %d on '%s': %s\n", p->distinctivering, ast_channel_name(ast), strerror(errno)); - *cidrings = cidrings[p->distinctivering - 1]; + *cid_rings = cidrings[p->distinctivering - 1]; } else { if (ioctl(p->subs[SUB_REAL].dfd, DAHDI_SETCADENCE, NULL)) ast_log(LOG_WARNING, "Unable to reset default ring on '%s': %s\n", ast_channel_name(ast), strerror(errno)); - *cidrings = p->sendcalleridafter; + *cid_rings = p->sendcalleridafter; } } |