Summary:	ASTERISK-11863: [patch] chan_zap incorrectly passes information between sections in users.conf in 1.4
Reporter:	Tzafrir Cohen (tzafrir)	Labels:
Date Opened:	2008-04-16 08:09:08	Date Closed:	2008-06-27 17:36:19
Priority:	Minor	Regression?	No
Status:	Closed/Complete	Components:	Channels/chan_zap
Versions:		Frequency of Occurrence
Related Issues:
Environment:		Attachments:	( 0) chanzap_users_sections.diff
Description:	With the following users.conf: [1] zapchan = 1 group = 1,2,3 [2] zapchan = 2 echocancel = yes [3] zapchan = 3 mailbox = 123 [4] zapchan = 4 channel 4 will get the configuration of mailbox, echocancel and group form previous sections. The configuration of them also depends on the order of the sections in the file. This is unlike 1.6 The attached patch changes the behaviour to be the same one already included in 1.6, thereby removing a TODO item. It's still not tested. Total count of lines is unchanged :-)
Comments:	By: Digium Subversion (svnbot) 2008-04-16 12:25:13 Repository: asterisk Revision: 114173 U   branches/1.4/channels/chan_zap.c ------------------------------------------------------------------------ r114173 | qwell | 2008-04-16 12:25:11 -0500 (Wed, 16 Apr 2008) | 7 lines Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general. (closes issue ASTERISK-11863) Reported by: tzafrir Patches:      chanzap_users_sections.diff uploaded by tzafrir (license 46) ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114173 By: Digium Subversion (svnbot) 2008-04-16 12:26:05 Repository: asterisk Revision: 114174 _U  trunk/ ------------------------------------------------------------------------ r114174 | qwell | 2008-04-16 12:26:04 -0500 (Wed, 16 Apr 2008) | 14 lines Blocked revisions 114173 via svnmerge ........ r114173 | qwell | 2008-04-16 12:30:09 -0500 (Wed, 16 Apr 2008) | 7 lines Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general. (closes issue ASTERISK-11863) Reported by: tzafrir Patches:      chanzap_users_sections.diff uploaded by tzafrir (license 46) ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114174 By: Digium Subversion (svnbot) 2008-04-17 12:30:50 Repository: asterisk Revision: 114214 _U  team/group/multiparking/ U   team/group/multiparking/CHANGES U   team/group/multiparking/Makefile U   team/group/multiparking/apps/app_chanspy.c U   team/group/multiparking/apps/app_externalivr.c U   team/group/multiparking/apps/app_festival.c U   team/group/multiparking/apps/app_ices.c U   team/group/multiparking/apps/app_mp3.c U   team/group/multiparking/apps/app_nbscat.c U   team/group/multiparking/apps/app_zapras.c U   team/group/multiparking/channels/chan_sip.c U   team/group/multiparking/channels/chan_zap.c U   team/group/multiparking/configs/sip.conf.sample U   team/group/multiparking/doc/CODING-GUIDELINES A   team/group/multiparking/doc/chan_sip-perf-testing.txt U   team/group/multiparking/include/asterisk/app.h U   team/group/multiparking/include/asterisk/astobj2.h A   team/group/multiparking/include/asterisk/dlinkedlists.h U   team/group/multiparking/include/asterisk/dsp.h U   team/group/multiparking/include/asterisk/frame.h U   team/group/multiparking/include/asterisk/lock.h U   team/group/multiparking/include/asterisk/logger.h U   team/group/multiparking/include/asterisk/sched.h U   team/group/multiparking/main/app.c U   team/group/multiparking/main/asterisk.c U   team/group/multiparking/main/astobj2.c U   team/group/multiparking/main/dsp.c U   team/group/multiparking/main/event.c U   team/group/multiparking/main/frame.c U   team/group/multiparking/main/logger.c U   team/group/multiparking/main/sched.c U   team/group/multiparking/main/utils.c U   team/group/multiparking/res/res_agi.c U   team/group/multiparking/res/res_jabber.c U   team/group/multiparking/res/res_musiconhold.c A   team/group/multiparking/tests/test_dlinklists.c U   team/group/multiparking/utils/Makefile A   team/group/multiparking/utils/refcounter.c ------------------------------------------------------------------------ r114214 | mvanbaak | 2008-04-17 12:30:47 -0500 (Thu, 17 Apr 2008) | 189 lines Merged revisions 114172,114174-114175,114181-114183,114185,114187-114188,114190,114192,114194,114196,114199,114201-114202,114205,114208,114212 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r114172 | murf | 2008-04-16 19:14:18 +0200 (Wed, 16 Apr 2008) | 1 line Introducing doubly linked lists to trunk from branch team/murf/bug11210. ................ r114174 | qwell | 2008-04-16 19:31:02 +0200 (Wed, 16 Apr 2008) | 14 lines Blocked revisions 114173 via svnmerge ........ r114173 | qwell | 2008-04-16 12:30:09 -0500 (Wed, 16 Apr 2008) | 7 lines Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general. (closes issue ASTERISK-11863) Reported by: tzafrir Patches:      chanzap_users_sections.diff uploaded by tzafrir (license 46) ........ ................ r114175 | murf | 2008-04-16 19:45:28 +0200 (Wed, 16 Apr 2008) | 1 line Introducing various astobj2 enhancements, chief being a refcount tracing feature, and various documentation updates in astobj2.h, and the addition of standalone utility, refcounter, that will filter the trace output for unbalanced, unfreed objects. This comes from the team/murf/bug11210 branch. ................ r114181 | tilghman | 2008-04-16 22:00:27 +0200 (Wed, 16 Apr 2008) | 10 lines Blocked revisions 114180 via svnmerge ........ r114180 | tilghman | 2008-04-16 14:59:37 -0500 (Wed, 16 Apr 2008) | 3 lines Backport revisions for latest vpb drivers to 1.4 (Closes issue ASTERISK-11862) ........ ................ r114182 | murf | 2008-04-16 22:09:39 +0200 (Wed, 16 Apr 2008) | 1 line Introducing a small upgrade to the ast_sched_xxx  facility, to keep it from eating up lots of cpu cycles. See CHANGES. From the team/murf/bug11210 branch. ................ r114183 | murf | 2008-04-16 22:28:08 +0200 (Wed, 16 Apr 2008) | 1 line Introducing a small optimization to event_unsubscribe; events now use a Doubly-Linked list for events, gives fast deletions, for the sake of channel driver mwi events. From team/murf/bug11210. ................ r114185 | kpfleming | 2008-04-16 22:47:30 +0200 (Wed, 16 Apr 2008) | 14 lines Merged revisions 114184 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114184 | kpfleming | 2008-04-16 15:46:38 -0500 (Wed, 16 Apr 2008) | 6 lines use the ZT_SET_DIALPARAMS ioctl properly by initializing the structure to all zeroes in case it contains fields that we don't write values into (which it does as of Zaptel 1.4.10) (closes issue ASTERISK-11861) Reported by: fnordian ........ ................ r114187 | murf | 2008-04-16 22:54:41 +0200 (Wed, 16 Apr 2008) | 1 line A small enhancement-- I added the routine log_show_lock to utils.c, which if the mentioned lock has been acquired, this routine will log to the console the normal info about that lock you'd see from the CLI when you do a 'core show locks'. It's solely for debug-- if the lock is NOT acquired, there is no output. I use it to show 'unexpected' locks, to see where/why a lock is pre-locked. This command is to be called from points of interest, like just before a trylock, and helps to spot fleeting, highly temporal locks that normally are not locked... ................ r114188 | tilghman | 2008-04-17 00:57:54 +0200 (Thu, 17 Apr 2008) | 2 lines Standardized routines for forking processes (keeps all the specialized code in one place). ................ r114190 | murf | 2008-04-17 01:53:27 +0200 (Thu, 17 Apr 2008) | 1 line This is the scariest commit I've done in a long time. This is the astobj2-ification of chan_sip. I've tested a number of scenarios like crazy. It used to have 4x the call setup/teardown performance of trunk, but now it's roughly at parity. I will attempt to find the bottlenecks and get it back to the 4x mark. The changes made were somewhat invasive, but the value to the community of these upgrades outweighs waiting further for more testing. Every change being made to chan_sip was lousing this code up when we tried to merge. Peers, Users, Dialogs, are all now astobj2 objects, indexed via hashtables. Refcounting is used to track objects and free them at the bitter end of their lives. Please file issues on bugs.digium.com, and PLEASE, please, please be patient. One natural advantage to all the hash-table work is that loading large sip.conf files full of thousands of peers now goes much faster. One more please: PLEASE help thrash this code and test it. ................ r114192 | seanbright | 2008-04-17 12:55:05 +0200 (Thu, 17 Apr 2008) | 9 lines Merged revisions 114191 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114191 | seanbright | 2008-04-17 06:51:20 -0400 (Thu, 17 Apr 2008) | 1 line Make sure we have enough room for the recording's filename. ........ ................ r114194 | seanbright | 2008-04-17 14:25:23 +0200 (Thu, 17 Apr 2008) | 1 line Update the CHANGES file with yesterday's ChanSpy change.  Sorry Kevin, just saw your e-mail. ................ r114196 | tilghman | 2008-04-17 14:59:04 +0200 (Thu, 17 Apr 2008) | 16 lines Merged revisions 114195 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114195 | tilghman | 2008-04-17 07:56:38 -0500 (Thu, 17 Apr 2008) | 8 lines Add special case for when the agi cannot be executed, to comply with the documentation that we return failure in that case. (closes issue ASTERISK-11866) Reported by: fmueller Patches:       20080416__bug12462.diff.txt uploaded by Corydon76 (license 14) Tested by: fmueller ........ ................ r114199 | phsultan | 2008-04-17 15:46:17 +0200 (Thu, 17 Apr 2008) | 10 lines Merged revisions 114198 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114198 | phsultan | 2008-04-17 15:42:23 +0200 (Thu, 17 Apr 2008) | 2 lines Use keepalives effectively in order diagnose bug ASTERISK-11838. ........ ................ r114201 | murf | 2008-04-17 16:45:16 +0200 (Thu, 17 Apr 2008) | 1 line Thanks to snuff for finding these omissions ................ r114202 | tilghman | 2008-04-17 17:12:52 +0200 (Thu, 17 Apr 2008) | 2 lines fileio.h does not exist; io.h does, though. ................ r114205 | russell | 2008-04-17 18:25:29 +0200 (Thu, 17 Apr 2008) | 11 lines Merged revisions 114204 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114204 | russell | 2008-04-17 11:23:45 -0500 (Thu, 17 Apr 2008) | 3 lines Fix the bininstall target to install from subdirs, as well. (closes issue AST-8, patch from bmd at switchvox) ........ ................ r114208 | mmichelson | 2008-04-17 18:40:12 +0200 (Thu, 17 Apr 2008) | 20 lines Merged revisions 114207 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r114207 | mmichelson | 2008-04-17 11:28:03 -0500 (Thu, 17 Apr 2008) | 12 lines It was possible for a reference to a frame which was part of a freed DSP to still be referenced, leading to memory corruption and eventual crashes. This code change ensures that the dsp is freed when we are finished with the frame. This change is very similar to a change Russell made with translators back a month or so ago. (closes issue ASTERISK-11443) Reported by: destiny6628 Patches:      11999.patch uploaded by putnopvut (license 60) Tested by: destiny6628, victoryure ........ ................ r114212 | mmichelson | 2008-04-17 18:51:09 +0200 (Thu, 17 Apr 2008) | 11 lines Blocked revisions 114211 via svnmerge ........ r114211 | mmichelson | 2008-04-17 11:50:46 -0500 (Thu, 17 Apr 2008) | 4 lines Add prototype for ast_dsp_frame_freed. I'm not sure how this was compiling before... ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=114214 By: Digium Subversion (svnbot) 2008-06-27 17:36:19 Repository: asterisk Revision: 126112 _U  branches/1.6.0/ ------------------------------------------------------------------------ r126112 | tilghman | 2008-06-27 17:36:14 -0500 (Fri, 27 Jun 2008) | 286 lines Blocked revisions 114174,114298,115258,115518,117524,117812,118059,119077,120063,120372,120672,120732,121993,122315,122434,122616,122664,124744,124909,125894 via svnmerge ................ r114174 | qwell | 2008-04-16 12:31:02 -0500 (Wed, 16 Apr 2008) | 14 lines Blocked revisions 114173 via svnmerge ........ r114173 | qwell | 2008-04-16 12:30:09 -0500 (Wed, 16 Apr 2008) | 7 lines Fix "fallthrough" behavior here, so config options in a previously configured user don't override settings in general. (closes issue ASTERISK-11863) Reported by: tzafrir Patches:      chanzap_users_sections.diff uploaded by tzafrir (license 46) ........ ................ r114298 | tilghman | 2008-04-19 08:53:38 -0500 (Sat, 19 Apr 2008) | 11 lines Blocked revisions 114297 via svnmerge ........ r114297 | tilghman | 2008-04-19 08:49:50 -0500 (Sat, 19 Apr 2008) | 4 lines MOH usage information needs a terminating newline, or else "asterisk -rx 'help moh reload'" will hang.  Reported via -dev list, fixed by me. ........ ................ r115258 | bbryant | 2008-05-02 15:26:00 -0500 (Fri, 02 May 2008) | 9 lines Blocked revisions 115257 via svnmerge ........ r115257 | bbryant | 2008-05-02 15:25:42 -0500 (Fri, 02 May 2008) | 2 lines Add new "pri show version" command to show the libpri version for support reasons. ........ ................ r115518 | russell | 2008-05-07 13:17:43 -0500 (Wed, 07 May 2008) | 12 lines Blocked revisions 115517 via svnmerge ........ r115517 | russell | 2008-05-07 13:17:19 -0500 (Wed, 07 May 2008) | 5 lines Track peer references when stored in the sip_pvt struct as the peer related to a qualify ping or a subscription.  This fixes some realtime related crashes. (closes issue ASTERISK-11976) (closes issue ASTERISK-11945) ........ ................ r117524 | tilghman | 2008-05-21 13:45:26 -0500 (Wed, 21 May 2008) | 9 lines Blocked revisions 117523 via svnmerge ........ r117523 | tilghman | 2008-05-21 13:44:53 -0500 (Wed, 21 May 2008) | 2 lines Revert accidental commit of the last change ........ ................ r117812 | tilghman | 2008-05-22 11:50:32 -0500 (Thu, 22 May 2008) | 13 lines Blocked revisions 117809 via svnmerge ........ r117809 | tilghman | 2008-05-22 11:47:03 -0500 (Thu, 22 May 2008) | 6 lines Take into account the length of delimiters when calculating result string length. (closes issue ASTERISK-12059) Reported by: adomjan Patches:       func_realtime.c-longdelimiter.patch uploaded by adomjan (license 487) ........ ................ r118059 | tilghman | 2008-05-23 08:20:13 -0500 (Fri, 23 May 2008) | 9 lines Blocked revisions 118055 via svnmerge ........ r118055 | tilghman | 2008-05-23 08:18:44 -0500 (Fri, 23 May 2008) | 2 lines Add format type checking for recently de-inlined function ........ ................ r119077 | russell | 2008-05-29 15:49:48 -0500 (Thu, 29 May 2008) | 10 lines Blocked revisions 119076 via svnmerge ........ r119076 | russell | 2008-05-29 15:48:33 -0500 (Thu, 29 May 2008) | 3 lines Oddly enough, all of the contents of audiohook.h were in there twice.  I have removed the second copy. ........ ................ r120063 | tilghman | 2008-06-03 13:24:14 -0500 (Tue, 03 Jun 2008) | 15 lines Blocked revisions 120061 via svnmerge ........ r120061 | tilghman | 2008-06-03 13:23:32 -0500 (Tue, 03 Jun 2008) | 8 lines When listing the manager users, managers in users.conf are not shown, even though they are allowed to connect. (closes issue ASTERISK-11982) Reported by: bkruse Patches:       12594-managerusers-2.diff uploaded by qwell (license 4) Tested by: bkruse ........ ................ r120372 | russell | 2008-06-04 11:28:37 -0500 (Wed, 04 Jun 2008) | 11 lines Blocked revisions 120371 via svnmerge ........ r120371 | russell | 2008-06-04 11:26:43 -0500 (Wed, 04 Jun 2008) | 4 lines Make the "dialplan remove include" CLI command actually work.  Also, tweak some formatting, and make the success message a little bit more clear. (closes AST-52) ........ ................ r120672 | russell | 2008-06-05 11:39:25 -0500 (Thu, 05 Jun 2008) | 12 lines Blocked revisions 120671 via svnmerge ........ r120671 | russell | 2008-06-05 11:38:52 -0500 (Thu, 05 Jun 2008) | 5 lines It turns out that searching on the forwarding station isn't very useful for most people, so pull in the changes that allow searching for SMDI messages based on other components of the SMDI message.  Also, update the SMDI documentation. ........ ................ r120732 | russell | 2008-06-05 13:01:45 -0500 (Thu, 05 Jun 2008) | 9 lines Blocked revisions 120731 via svnmerge ........ r120731 | russell | 2008-06-05 13:01:25 -0500 (Thu, 05 Jun 2008) | 2 lines Add the UPGRADE.txt file from Asterisk 1.2, for handy reference. ........ ................ r121993 | twilson | 2008-06-11 18:48:38 -0500 (Wed, 11 Jun 2008) | 9 lines Blocked revisions 121992 via svnmerge ........ r121992 | twilson | 2008-06-11 18:47:23 -0500 (Wed, 11 Jun 2008) | 2 lines Backport fix for 11520--for some reason I didn't do this back in February when I patched for trunk. ........ ................ r122315 | jpeeler | 2008-06-12 14:11:23 -0500 (Thu, 12 Jun 2008) | 9 lines Blocked revisions 122314 via svnmerge ........ r122314 | jpeeler | 2008-06-12 14:08:20 -0500 (Thu, 12 Jun 2008) | 2 lines Adds DAHDI support alongside Zaptel. DAHDI usage favored, but all Zap stuff should continue working. Release announcement to follow. ........ ................ r122434 | jpeeler | 2008-06-12 18:09:16 -0500 (Thu, 12 Jun 2008) | 12 lines Blocked revisions 122208 via svnmerge ........ r122208 | jpeeler | 2008-06-12 10:46:08 -0500 (Thu, 12 Jun 2008) | 5 lines (closes issue ASTERISK-11622) Reported by: davidw Patch by: Corydon76, modified by me to work properly with ParkAndAnnounce app ........ ................ r122616 | jpeeler | 2008-06-13 12:38:28 -0500 (Fri, 13 Jun 2008) | 13 lines Blocked revisions 122613 via svnmerge ........ r122613 | jpeeler | 2008-06-13 12:36:56 -0500 (Fri, 13 Jun 2008) | 6 lines (closes issue ASTERISK-12184) Reported by: Netview Tested by: jpeeler Use correct location to search for tonezone. ........ ................ r122664 | jpeeler | 2008-06-13 13:58:29 -0500 (Fri, 13 Jun 2008) | 8 lines Blocked revisions 122663 via svnmerge ........ r122663 | jpeeler | 2008-06-13 13:57:24 -0500 (Fri, 13 Jun 2008) | 1 line fixed dahdi compatability header from assuming either dahdi or zaptel is installed (may not have either) ........ ................ r124744 | kpfleming | 2008-06-23 16:24:34 -0500 (Mon, 23 Jun 2008) | 10 lines Blocked revisions 124743 via svnmerge ........ r124743 | kpfleming | 2008-06-23 16:22:08 -0500 (Mon, 23 Jun 2008) | 3 lines emit a warning if the old IAX2 call searching code finds a call when the new code did not... so that we can get rid of the old code in 2-3 months ........ ................ r124909 | tilghman | 2008-06-24 15:55:06 -0500 (Tue, 24 Jun 2008) | 13 lines Blocked revisions 124908 via svnmerge ........ r124908 | tilghman | 2008-06-24 15:52:43 -0500 (Tue, 24 Jun 2008) | 6 lines Don't access the pvt structure if unable to acquire the lock. (closes issue ASTERISK-11592) Reported by: norman Patches:       12162-lockfail.diff uploaded by qwell (license 4) ........ ................ r125894 | tilghman | 2008-06-27 11:48:05 -0500 (Fri, 27 Jun 2008) | 14 lines Blocked revisions 125893 via svnmerge ........ r125893 | tilghman | 2008-06-27 11:46:05 -0500 (Fri, 27 Jun 2008) | 7 lines Since HAVE_DAHDI is defined to HAVE_ZAPTEL in dahdi_compat.h, we must first check for HAVE_ZAPTEL. (closes issue ASTERISK-12259) Reported by: opticron Patches:       tonezone_compat.diff uploaded by opticron (license 267) ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=126112