From 0c315bb90a232630f1cf7781154fd9973177badf Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 6 Mar 2012 17:44:57 +0000 Subject: [PATCH] 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@358377 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_dahdi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 55f449cb24..b6ba680c7a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -2210,7 +2210,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; @@ -2218,11 +2218,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->name, 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->name, strerror(errno)); - *cidrings = p->sendcalleridafter; + *cid_rings = p->sendcalleridafter; } } -- 2.47.2