On Sun, May 27, 2007 at 04:12:38AM -0000, [EMAIL PROTECTED] wrote: > Author: qwell > Date: Sat May 26 23:12:37 2007 > New Revision: 66244 > > URL: http://svn.digium.com/view/asterisk?view=rev&rev=66244 > Log: > I don't know what this was trying to do, but it's clearly incorrect.
The thing that is wrong there is that the global drings was left in tact. It is only used while reading configuration. Unless you want that value to be shared be all the channels by definition. > > Issues 9808 and 9809. > > Modified: > branches/1.4/channels/chan_zap.c > > Modified: branches/1.4/channels/chan_zap.c > URL: > http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=66244&r1=66243&r2=66244 > ============================================================================== > --- branches/1.4/channels/chan_zap.c (original) > +++ branches/1.4/channels/chan_zap.c Sat May 26 23:12:37 2007 > @@ -10486,17 +10486,17 @@ > 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]); -- Tzafrir Cohen icq#16849755 jabber:[EMAIL PROTECTED] +972-50-7952406 mailto:[EMAIL PROTECTED] http://www.xorcom.com iax:[EMAIL PROTECTED]/tzafrir _______________________________________________ --Bandwidth and Colocation provided by Easynews.com -- asterisk-dev mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-dev
