aboutsummaryrefslogtreecommitdiffstats
path: root/main/config.c
AgeCommit message (Collapse)AuthorFilesLines
2010-01-18Merged revisions 241016 via svnmerge from seanbright1-22/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines Merged revisions 241015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines Plug a memory leak when reading configs with their comments. While reading through configuration files with the intent of returning their full contents (comments specifically) we allocated some memory and then forgot to free it. This doesn't fix 16554 but clears up a leak I had in the lab. (issue #16554) Reported by: mav3rick Patches: issue16554_20100118.patch uploaded by seanbright (license 71) Tested by: seanbright ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@241018 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237414 via svnmerge from tilghman1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r237414 | tilghman | 2010-01-04 13:03:20 -0600 (Mon, 04 Jan 2010) | 2 lines Oops, didn't compile (thanks, kpfleming) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@237416 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-04Merged revisions 237410 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r237410 | tilghman | 2010-01-04 12:42:10 -0600 (Mon, 04 Jan 2010) | 7 lines Further reduce the encoded blank values back to blank in the realtime API. (closes issue #16533) Reported by: sergee Patches: 200100104__issue16533.diff.txt uploaded by tilghman (license 14) Tested by: sergee ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@237412 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-16Merged revisions 219061 via svnmerge from tilghman1-10/+20
https://origsvn.digium.com/svn/asterisk/trunk ................ r219061 | tilghman | 2009-09-16 18:42:12 -0500 (Wed, 16 Sep 2009) | 15 lines Merged revisions 219023 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r219023 | tilghman | 2009-09-16 18:21:53 -0500 (Wed, 16 Sep 2009) | 8 lines Properly deal with quotes in the arguments of '#exec' includes. (closes issue #15583) Reported by: pkempgen Patches: 20090726__issue15583.diff.txt uploaded by tilghman (license 14) 20090726__issue15583-1.4-4.diff.txt uploaded by pkempgen (license 169) Tested by: pkempgen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@219062 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-10AST-2009-005tilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@211569 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-06Merged revisions 202753 via svnmerge fromrbrindley1-5/+24
https://origsvn.digium.com/svn/asterisk/trunk ........ r202753 | rbrindley | 2009-06-23 16:25:17 -0500 (Tue, 23 Jun 2009) | 9 lines If we delete the info, lets also delete the lines (closes issue 0014509) Reported by: timeshell Patches: 20090504__bug14509.diff.txt uploaded by tilghman (license 14) Tested by: awk, timeshell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@204976 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-21Merged revisions 189629 via svnmerge from dbailey1-18/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r189629 | dbailey | 2009-04-21 09:28:04 -0500 (Tue, 21 Apr 2009) | 10 lines Merged revisions 189601 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r189601 | dbailey | 2009-04-21 09:00:55 -0500 (Tue, 21 Apr 2009) | 3 lines Add check in configure script to check for GLOB_NOMAGIC and GLOB_BRACE in glob.h This allows config.c to compile when linked against uclibc that does not support these parameters ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189642 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-05Merged revisions 161181 via svnmerge from tilghman1-3/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r161181 | tilghman | 2008-12-04 23:41:41 -0600 (Thu, 04 Dec 2008) | 11 lines The first file should have a blank config filename in the structure, so that when a save occurs to a different filename, everything goes to the alternate filename, instead of appending to the original. This is important for the AMI command UpdateConfig. (closes issue #13301) Reported by: trevo Patches: 20081113__bug13301.diff.txt uploaded by Corydon76 (license 14) 20081113__bug13301__1.6.0.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76, blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@161182 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-18Merged revisions 157302 via svnmerge from murf1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r157302 | murf | 2008-11-18 11:07:55 -0700 (Tue, 18 Nov 2008) | 18 lines (closes issue #13420) Reported by: alex70 Patches: 13420.13539.patch uploaded by murf (license 17) Tested by: murf, awk This fixes two problems: a spurious linefeed insertion probably left over from pre-precomment times. Only generated when category had no previous comments. The other problem: Insertions could get the line-numbering out of whack and generate negative line numbers, causing chunks of line numbers to be emitted, on the scale of the number of lines up to that point in the file. In such cases, abort the looping, and all is well. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@157304 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-14Merged revisions 149199 via svnmerge from tilghman1-0/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r149199 | tilghman | 2008-10-14 17:38:06 -0500 (Tue, 14 Oct 2008) | 8 lines Add additional memory debugging to several core APIs, and fix several memory leaks found with these changes. (Closes issue #13505, closes issue #13543) Reported by: mav3rick, triccyx Patches: 20081001__bug13505.diff.txt uploaded by Corydon76 (license 14) Tested by: mav3rick, triccyx ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149202 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-09Merged revisions 147807 via svnmerge from murf1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r147807 | murf | 2008-10-09 08:17:33 -0600 (Thu, 09 Oct 2008) | 15 lines (closes issue #13557) Reported by: nickpeirson Patches: pbx.c.patch uploaded by nickpeirson (license 579) replace_bzero+bcopy.patch uploaded by nickpeirson (license 579) Tested by: nickpeirson, murf 1. replaced all refs to bzero and bcopy to memset and memmove instead. 2. added a note to the CODING-GUIDELINES 3. add two macros to asterisk.h to prevent bzero, bcopy from creeping back into the source 4. removed bzero from configure, configure.ac, autoconfig.h.in ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@147811 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-29Merged revisions 140489 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r140489 | mmichelson | 2008-08-29 12:47:17 -0500 (Fri, 29 Aug 2008) | 30 lines Merged revisions 140488 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines After working on the ao2_containers branch, I noticed something a bit strange. In all cases where we provide a callback function to ao2_container_alloc, the callback function would only return 0 or CMP_MATCH. After inspecting the ao2_callback() code carefully, I found that if you're only looking for one specific item, then you should return CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue traversing the current bucket until the end searching for more matches. In cases like chan_iax2 where in 1.4, all the peers are shoved into a single bucket, this makes for potentially terrible performance since the entire bucket will be traversed even if the peer is one of the first ones come across in the bucket. All the changes I have made were for cases where the callback function defined was passed to ao2_container_alloc so that calls to ao2_find could find a unique instance of whatever object was being stored in the container. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@140490 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-10Another big chunk of changes from the RSW branch. Bunch of stuff from main/seanbright1-11/+11
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137082 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-05Add '+=' append operator to configuration files.tilghman1-50/+82
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@135717 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-18Merged revisions 132107 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132107 | tilghman | 2008-07-18 13:47:50 -0500 (Fri, 18 Jul 2008) | 6 lines Textual clarification (closes issue #13106) Reported by: flefoll Patches: config.c.br14.120173.patch-unknown-directive uploaded by flefoll (license 244) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@132109 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-05Merge the adaptive realtime branch, which will make adding new required fieldstilghman1-0/+32
to realtime less painful in the future. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120789 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-03Merged revisions 120173 via svnmerge from jpeeler1-0/+4
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r120173 | jpeeler | 2008-06-03 17:15:33 -0500 (Tue, 03 Jun 2008) | 6 lines (closes issue #11594) Reported by: yem Tested by: yem This change decreases the buffer size allocated on the stack substantially in config_text_file_load when LOW_MEMORY is turned on. This change combined with the fix from revision 117462 (making mkintf not copy the zt_chan_conf structure) was enough to prevent the crash. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120174 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-21Be sure that we cache included files for each source file which loadsmmichelson1-1/+1
a configuration file. As it was, only the first did so. This led to a problem if the included file was changed (but not the configuration file which includes it) and the second source file attempted to reload the configuration. It would not see that the included file had changed. In this particular example, res_phoneprov and chan_sip both loaded sip.conf, which included a file call sip.peers.conf. Since res_phoneprov was the first to load sip.conf, only it cached the fact that sip.conf included sip.peers.conf. If sip.peers.conf were changed and sip.conf were not and a sip reload were issued (meaning that chan_sip attempts to reload sip.conf only if it and its included files have changed) the changes made to sip.peers.conf would not be seen and therefore no action would be taken. (closes issue #12693) Reported by: marsosa git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117367 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-05#execing the same file multiple times led to warning messages saying that ↵mmichelson1-1/+2
the same file was being #included twice. This was due to the fact that #exec created a temporary file which was then #included. The name of the temporary file was the name of the #exec'd file, with the Unix timestamp and thread ID concatenated. The issue was that if multiple #exec statements of the same file were reached in the same second, then the result was that the temporary files would have duplicate names. To resolve this, the temporary file now has microsecond resolution for the timestamp portion. (closes issue #12574) Reported by: jmls Patches: 12574.patch uploaded by putnopvut (license 60) Tested by: jmls, putnopvut git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115329 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-02Add attributes to various API calls, to help track down bugs (and remove a ↵tilghman1-2/+4
deprecated function) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115157 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-26Simplify new macro, simplify configfile logic, now that list is sortedtilghman1-24/+8
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@111132 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-26Add a linkedlist macro that maintains a sorted listtilghman1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@111036 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-26Add the "config reload <conffile>" command, which allows you to tell Asterisktilghman1-1/+105
to reload any file that references a given configuration file. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@111012 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-19Merged revisions 109908 via svnmerge from murf1-8/+14
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r109908 | murf | 2008-03-19 09:41:13 -0600 (Wed, 19 Mar 2008) | 72 lines (closes issue #11442) Reported by: tzafrir Patches: 11442.patch uploaded by murf (license 17) Tested by: murf I didn't give tzafrir very much time to test this, but if he does still have remaining issues, he is welcome to re-open this bug, and we'll do what is called for. I reproduced the problem, and tested the fix, so I hope I am not jumping by just going ahead and committing the fix. The problem was with what file_save does with templates; firstly, it tended to print out multiple options: [my_category](!)(templateref) instead of [my_category](!,templateref) which is fixed by this patch. Nextly, the code to suppress output of duplicate declarations that would occur because the reader copies inherited declarations down the hierarchy, was not working. Thus: [master-template](!) mastervar = bar [template](!,master-template) tvar = value [cat](template) catvar = val would be rewritten as: ;! ;! Automatically generated configuration file ;! Filename: experiment.conf (/etc/asterisk/experiment.conf) ;! Generator: Manager ;! Creation Date: Tue Mar 18 23:17:46 2008 ;! [master-template](!) mastervar = bar [template](!,master-template) mastervar = bar tvar = value [cat](template) mastervar = bar tvar = value catvar = val This has been fixed. Since the config reader 'explodes' inherited vars into the category, users may, in certain circumstances, see output different from what they originally entered, but it should be both correct and equivalent. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@109942 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-11An offhand comment from Russell made me realize that the configuration filetilghman1-16/+22
caching would not work properly for users.conf and any other file read from more than one place. I needed to add the filename which requested the config file to get it to work properly. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@107791 f38db490-d61c-443f-a65b-d21fe96a405b
2008-03-04Whitespace changes onlytilghman1-11/+11
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@105840 f38db490-d61c-443f-a65b-d21fe96a405b
2008-02-25Merged revisions 104092 via svnmerge from qwell1-1/+2
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r104092 | qwell | 2008-02-25 14:49:42 -0600 (Mon, 25 Feb 2008) | 11 lines Allow the use of #include and #exec in situations where the max include depth was only 1. Specifically, this fixes using #include and #exec in extconfig.conf. This was basically caused because the config file itself raises the include level to 1. I opted not to raise the include limit, because recursion here could cause very bizarre behavior. Pointed out, and tested by jmls (closes issue #12064) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@104093 f38db490-d61c-443f-a65b-d21fe96a405b
2008-02-15Fix up some doxygen issues.qwell1-0/+2
(closes issue #11996) Patches: bug_11996_doxygen.diff uploaded by snuffy (license 35) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103723 f38db490-d61c-443f-a65b-d21fe96a405b
2008-02-12Requested changes from Pari, reviewed by Russell.jpeeler1-2/+62
Added ability to retrieve list of categories in a config file. Added ability to retrieve the content of a particular category. Added ability to empty a context. Created new action to create a new file. Updated delete action to allow deletion by line number with respect to category. Added new action insert to add new variable to category at specified line. Updated action newcat to allow new category to be inserted in file above another existing category. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103331 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-07Display a message if no config mappings are found with "core show config ↵qwell1-8/+13
mappings". Closes issue #11704, patch by kshumard. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96936 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-19add support for PARSE_DOUBLE, and remove identifiers forrizzo1-0/+28
types not supported (INT16 and UINT16) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93925 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-18remove unnecessary (char *) casts for ast_config_AST_* variables.rizzo1-1/+1
There are some left in the .flex files, left to the maintainer... git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93582 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-14Print an error message if a #included file does not existrussell1-1/+3
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@93004 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-13Merged revisions 92696 via svnmerge from qwell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 (closes issue #10690) ........ r92696 | qwell | 2007-12-12 18:11:09 -0600 (Wed, 12 Dec 2007) | 7 lines If a typo is found in a config file, we previous continued on with what was already loaded. We do not want to do this (see bug below for details). This makes it so that if a [ is found without a ], the entire config will fail, and nothing in it will be loaded. Issue 10690. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92697 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08remove unused code, and simplify the logic for #include/#execrizzo1-35/+29
(still a lot of cleanup needed here). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91983 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08Implement comment_buffer and lline_buffer in terms of the ast_str_*() API.rizzo1-103/+68
I don't know if comment_buffers etc are actually used at all... git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91962 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08unify some common coderizzo1-11/+16
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91953 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08normalize formattingrizzo1-18/+14
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91952 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08document a nice technique to exit from a block in case of errors.rizzo1-0/+5
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91951 f38db490-d61c-443f-a65b-d21fe96a405b
2007-12-08a little bit of documentation on how lines are parsed.rizzo1-7/+24
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91931 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-30Merged revisions 90348 via svnmerge from russell1-1/+0
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r90348 | russell | 2007-11-30 13:26:04 -0600 (Fri, 30 Nov 2007) | 8 lines Change the behavior of ao2_link(). Previously, in inherited a reference. Now, it automatically increases the reference count to reflect the reference that is now held by the container. This was done to be more consistent with ao2_unlink(), which automatically releases the reference held by the container. It also makes it so it is no longer possible for a pointer to be invalid after ao2_link() returns. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@90351 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-21remove a bunch of useless #include "options.h"rizzo1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89511 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-20move asterisk/paths.h outside asterisk.h and into those filesrizzo1-0/+1
who really need it. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89466 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-19another bunch of include removals (errno.h and asterisk/logger.h)rizzo1-2/+0
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89425 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-17trim more redundant headersrizzo1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89384 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-16Start untangling header inclusion in a way that does not affectrizzo1-4/+0
build times - tested, there is no measureable difference before and after this commit. In this change: use asterisk/compat.h to include a small set of system headers: inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h, stdlib.h, alloca.h, stdio.h Where available, the inclusion is conditional on HAVE_FOO_H as determined by autoconf. Normally, source files should not include any of the above system headers, and instead use either "asterisk.h" or "asterisk/compat.h" which does it better. For the time being I have left alone second-level directories (main/db1-ast, etc.). git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89333 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-16add a small new function to retrieve variables from a configrizzo1-0/+6
once we have a pointer to the category. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89322 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-14One more typo in config.c; and missed conversions due to the constifying of ↵tilghman1-1/+1
ast_variable_new parameters git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89270 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-14Typotilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89269 f38db490-d61c-443f-a65b-d21fe96a405b
2007-11-14make the 'name' and 'value' fields in ast_variable const char *rizzo1-10/+14
This prevents modifying the strings in the stored variables, and catched a few instances where this was actually done. Given the differences between trunk and 1.4 (and the fact that this is effectively an API change) it is better to fix 1.4 independently. These are chan_sip.c::sip_register() chan_skinny.c:: near line 2847 config.c:: near line 1774 logger.c::make_components() res_adsi.c:: near line 1049 I may have missed some instances for modules that do not build here. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89268 f38db490-d61c-443f-a65b-d21fe96a405b