Just tried to apply the patch: Just checked out asterisk stable and zaptel, patched using Tony's patches (which worked, and compiled previously)
Then got this when applying your patch. bash # cat ../chan_zap.c.diff | patch -p0 patching file channels/chan_zap.c Hunk #1 succeeded at 4642 (offset -148 lines). Hunk #2 FAILED at 4681. 1 out of 2 hunks FAILED -- saving rejects to file channels/chan_zap.c.rej bash # Cheers, Karl > -----Original Message----- > From: [EMAIL PROTECTED] [mailto:asterisk-users- > [EMAIL PROTECTED] On Behalf Of Kevin Walsh > Sent: 28 May 2004 09:12 > To: [EMAIL PROTECTED] > Subject: RE: [Asterisk-Users] Caller ID with BT CD50 > > Robert Boardman [EMAIL PROTECTED] wrote: > > First of all thanks for the patch it works great, > > > > but i think it breaks the distinctive ringing, > > I have 2 incoming numbers in one x100p in contexts home1 and home2 but > > 'default' is always chosen has anyone else seen this? > > > Yes - it does break the distinctive ring detection, but that's easily > sorted out. > > The "correct" way would be to move the "if (p->use_callerid == 2)" > code within the existing "if (p->use_callerid)" block, with a couple > more "if" conditionals here and there. The quick way, however, is > to apply the attached chan_zap.c hack over the top of Tony Hoyle's > great work. > > In the standard chan_zap.c, you can't have distinctive ring detection > unless you also need Caller*ID detection. > > My hack makes two changes: > > 1. Changes an "else if" into an "if" to get the "world = USA" > Caller*ID code to run. This will waste a little time, but > no more than we were wasting anyway, before Tony's patch was > applied. > > 2. Comment out a line of code to ensure that we always answer > after the first ring. We need the first ring to give the > the distinctive ring code something to work with, of course. > > It works for me. Hopefully it'll work for you too. > > -- > _/ _/ _/_/_/_/ _/ _/ _/_/_/ _/ _/ > _/_/_/ _/_/ _/ _/ _/ _/_/ _/ K e v i n W a l s h > _/ _/ _/ _/ _/ _/ _/ _/_/ [EMAIL PROTECTED] > _/ _/ _/_/_/_/ _/ _/_/_/ _/ _/ > > > ________________________________________________________________________ > This e-mail has been scanned for all viruses by Star Internet. The > service is powered by MessageLabs. For more information on a proactive > anti-virus service working around the clock, around the globe, visit: > http://www.star.net.uk > ________________________________________________________________________ ________________________________________________________________________ This e-mail has been scanned for all viruses by Star Internet. The service is powered by MessageLabs. For more information on a proactive anti-virus service working around the clock, around the globe, visit: http://www.star.net.uk ________________________________________________________________________ _______________________________________________ Asterisk-Users mailing list [EMAIL PROTECTED] http://lists.digium.com/mailman/listinfo/asterisk-users To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users