I don't know what this was trying to do, but it's clearly incorrect.

Issues 9808 and 9809.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@66244 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 95e0e5abcfd99e5cdcc7d95aea5a275a9eb15892..c9ffd9e2ed310e728f5791886142e11cf3769794 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10486,17 +10486,17 @@ static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int r
                        if (ast_true(v->value))
                                distinctiveringaftercid = 1;
                } else if (!strcasecmp(v->name, "dring1context")) {
-                       ast_copy_string(confp->chan.drings.ringContext[0].contextData,v->value,sizeof(confp->chan.drings.ringContext[0].contextData));
+                       ast_copy_string(drings.ringContext[0].contextData, v->value, sizeof(drings.ringContext[0].contextData));
                } else if (!strcasecmp(v->name, "dring2context")) {
-                       ast_copy_string(confp->chan.drings.ringContext[1].contextData,v->value,sizeof(confp->chan.drings.ringContext[1].contextData));
+                       ast_copy_string(drings.ringContext[1].contextData, v->value, sizeof(drings.ringContext[1].contextData));
                } else if (!strcasecmp(v->name, "dring3context")) {
-                       ast_copy_string(confp->chan.drings.ringContext[2].contextData,v->value,sizeof(confp->chan.drings.ringContext[2].contextData));
+                       ast_copy_string(drings.ringContext[2].contextData, v->value, sizeof(drings.ringContext[2].contextData));
                } else if (!strcasecmp(v->name, "dring1")) {
                        ringc = v->value;
-                       sscanf(ringc, "%d,%d,%d", &confp->chan.drings.ringnum[0].ring[0], &confp->chan.drings.ringnum[0].ring[1], &drings.ringnum[0].ring[2]);
+                       sscanf(ringc, "%d,%d,%d", &drings.ringnum[0].ring[0], &drings.ringnum[0].ring[1], &drings.ringnum[0].ring[2]);
                } else if (!strcasecmp(v->name, "dring2")) {
                        ringc = v->value;
-                       sscanf(ringc,"%d,%d,%d", &drings.ringnum[1].ring[0], &drings.ringnum[1].ring[1], &drings.ringnum[1].ring[2]);
+                       sscanf(ringc, "%d,%d,%d", &drings.ringnum[1].ring[0], &drings.ringnum[1].ring[1], &drings.ringnum[1].ring[2]);
                } else if (!strcasecmp(v->name, "dring3")) {
                        ringc = v->value;
                        sscanf(ringc, "%d,%d,%d", &drings.ringnum[2].ring[0], &drings.ringnum[2].ring[1], &drings.ringnum[2].ring[2]);