Luigi Rizzo
7e8835e0d7
remove another set of redundant #include "asterisk/options.h"
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
cbfc6dcbea
Make trunk build again
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
a23c055c3d
move asterisk/paths.h outside asterisk.h and into those files
...
who really need it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
6938f4b2b0
Fix building of modules under cygwin.
...
After this commit we can actually load modules under windows,
and we can start debugging more interesting problems related
to the load order and functionality of modules.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
ffd86fc964
more errno.h removal
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
1a5cdeb138
a quick fix to pbx_dundi.c to make it so it will compile. Hope I did the right thing. And some additions to removal of extens to take care of hashtab pointers in all cases.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89388 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
a0f06d0dd5
start using asterisk/network.h for network related headers.
...
Also remove some unnecessary includes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89380 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
49d1248c55
fix the build of pbx_lua
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
5490960453
remove a bunch of duplicate includes
...
Reproduce with
grep -r #include . | grep -v .svn | grep -v Binary | sort | uniq -c | sort -nr
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
fdb7f7ba3d
Start untangling header inclusion in a way that does not affect
...
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: https://origsvn.digium.com/svn/asterisk/trunk@89333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Luigi Rizzo
7f8ecd2cd3
make the 'name' and 'value' fields in ast_variable const char *
...
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: https://origsvn.digium.com/svn/asterisk/trunk@89268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
cfbc4f5fb8
Doxygen fixes.
...
Also fix a common typo I kept seeing (arguement) in various files.
Closes issue #11222 , patch by snuffy (with arguement > argument by me).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
98429d37b2
Based on a note in asterisk-dev by Brian Capouch, I determined I too agressive in not initializing arrays passed to pbx_substitute_variables_xxxx; I reviewed the code (again) and hopefully found every possible spot where substitute_variables is called conditionally, and made sure the char array involved was set to a null string.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
a897556f7f
This is the perhaps the biggest, boldest, most daring change I've ever committed to trunk. Forgive me in advance any disruption this may cause, and please, report any problems via the bugtracker. The upside is that this can speed up large dialplans by 20 times (or more). Context, extension, and priority matching are all fairly constant-time searches. I introduce here my hashtables (hashtabs), and a regression for them. I would have used the ast_obj2 tables, but mine are resizeable, and don't need the object destruction capability. The hashtab stuff is well tested and stable. I introduce a data structure, a trie, for extension pattern matching, in which knowledge of all patterns is accumulated, and all matches can be found via a single traversal of the tree. This is per-context. The trie is formed on the first lookup attempt, and stored in the context for future lookups. Destruction routines are in place for hashtabs and the pattern match trie. You can see the contents of the pattern match trie by using the 'dialplan show' cli command when 'core set debug' has been done to put it in debug mode. The pattern tree traversal only traverses those parts of the tree that are interesting. It uses a scoreboard sort of approach to find the best match. The speed of the traversal is more a function of the length of the pattern than the number of patterns in the tree. The tree also contains the CID matching patterns. See the source code comments for details on how everything works. I believe the approach general enough that any issues that might come up involving fine points in the pattern matching algorithm, can be solved by just tweaking things. We shall see. The current pattern matcher is fairly involved, and replicating every nuance of it is difficult. If you find and report problems, I will try to resolve than as quickly as I can. The trie and hashtabs are added to the existing context and exten structs, and none of the old machinery has been removed for the sake of the multitude of functions that use them. In the future, we can (maybe) weed out the linked lists and save some space.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
267e829cbd
Add check_hangup() method to pbx_lua, which can be used to check whether it is time to hangup a channel.
...
Closes issue #11202 , patch by mnicholson
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Kevin P. Fleming
edc78d6023
improve linked-list macros in two ways:
...
- the *_CURRENT macros no longer need the list head pointer argument
- add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
c93520b88b
propagate the DECLINE return value back to the loader
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
9a47852673
Don't kill asterisk if extensions.lua is not present.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
ca55e2f671
Oops, some dev-mode changes for ISO C90
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
e8c781b215
Add pbx_lua as a method of doing extensions
...
Reported by: mnicholson
Patch by: mnicholson
Closes issue #11140
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88250 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
63f2f04cf4
This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
1c7eb1d82b
Change some uses of free() to ast_free(). (No functional differences.)
...
(closes issue #11138 )
Reported by: eliel
Patches:
pbx_dundi.c.patch uploaded by eliel (license 64)
chan_sip.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88077 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
c9f3efc381
Merged revisions 87168 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r87168 | murf | 2007-10-26 10:34:02 -0600 (Fri, 26 Oct 2007) | 1 line
closes issue #11086 where a user complains that references to following contexts report a problem; The problem was REALLy that he was referring to empty contexts, which were being ignored. Reporter stated that empty contexts should be OK. I checked it out against extensions.conf, and sure enough, empty contexts ARE ok. So, I removed the restriction from AEL. This, though, highlighted a problem with multiple contexts of the same name. This should be OK, also. So, I added the extend keyword to AEL, and it can preceed the 'context' keyword (mixed with 'abstract', if nec.). This will turn off the warnings in AEL if the same context name is used 2 or more times. Also, I now call ast_context_find_or_create for contexts now, instead of just ast_context_create; I did this because pbx_config does this. The 'extend' keyword thus becomes a statement of intent. AEL can now duplicate the behavior of pbx_config,
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87187 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
b7ef49c931
closes issue #11005 , where #include uses the current dir instead of the config dir (/etc/asterisk) for relative path includes for AEL
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86967 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
ebe4050128
Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former didn't make much sense
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Joshua Colp
9409a33900
Merged revisions 86661 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r86661 | file | 2007-10-22 11:05:26 -0300 (Mon, 22 Oct 2007) | 6 lines
Fix tab completion for dundi show peer.
(closes issue #11041 )
Reported by: jsmith
Patches:
asterisk-dundicomplete.diff.txt uploaded by jamesgolovich (license 176)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
b0f3e6097e
Convert NEW_CLI to AST_CLI.
...
Closes issue #11039 , as suggested by seanbright.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
ed690fc348
Switch dundi to new tos config format.
...
Remove old unused defines for old style.
Closes issue 10860, patch by IgorG.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
be54dc15e5
Simplify buffer handling in dundi-parser.c. This also makes the code a bit
...
safer by removing various assumptions about sizes. (No vulnerabilities, though)
(closes issue #10977 )
Reported by: dimas
Patches:
dundiparser.patch uploaded by dimas (license 88)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85558 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
3f2e8db598
Merged revisions 85556 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85556 | russell | 2007-10-15 10:40:45 -0500 (Mon, 15 Oct 2007) | 9 lines
Ensure the buffer passed to ast_canmatch_extension() is properly initialized so
that it is null terminated.
(issue #10977 )
Reported by: dimas
Patches:
pbxdundi.patch uploaded by dimas (license 88)
- small mods by me
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
ac46e63a41
Merged revisions 85540 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85540 | russell | 2007-10-14 10:24:52 -0500 (Sun, 14 Oct 2007) | 7 lines
Don't create the context for users in users.conf until we know at least one user exists.
(closes issue #10971 )
Reported by: dimas
Patches:
pbxconfig.patch uploaded by dimas (license 88)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
e5853d8409
Merged revisions 85515 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85515 | russell | 2007-10-12 10:40:35 -0500 (Fri, 12 Oct 2007) | 7 lines
Fix the potential use of an uninitialized buffer in a log message.
(closes issue #10958 )
Reported by: dimas
Patches:
realtime.patch uploaded by dimas (license 88)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
e97a723cf1
Merge a ton of NEW_CLI conversions. Thanks to everyone that helped out! :)
...
(closes issue #10724 )
Reported by: eliel
Patches:
chan_skinny.c.patch uploaded by eliel (license 64)
chan_oss.c.patch uploaded by eliel (license 64)
chan_mgcp.c.patch2 uploaded by eliel (license 64)
pbx_config.c.patch uploaded by seanbright (license 71)
iax2-provision.c.patch uploaded by eliel (license 64)
chan_gtalk.c.patch uploaded by eliel (license 64)
pbx_ael.c.patch uploaded by seanbright (license 71)
file.c.patch uploaded by seanbright (license 71)
image.c.patch uploaded by seanbright (license 71)
cli.c.patch uploaded by moy (license 222)
astobj2.c.patch uploaded by moy (license 222)
asterisk.c.patch uploaded by moy (license 222)
res_limit.c.patch uploaded by seanbright (license 71)
res_convert.c.patch uploaded by seanbright (license 71)
res_crypto.c.patch uploaded by seanbright (license 71)
app_osplookup.c.patch uploaded by seanbright (license 71)
app_rpt.c.patch uploaded by seanbright (license 71)
app_mixmonitor.c.patch uploaded by seanbright (license 71)
channel.c.patch uploaded by seanbright (license 71)
translate.c.patch uploaded by seanbright (license 71)
udptl.c.patch uploaded by seanbright (license 71)
threadstorage.c.patch uploaded by seanbright (license 71)
db.c.patch uploaded by seanbright (license 71)
cdr.c.patch uploaded by moy (license 222)
pbd_dundi.c.patch uploaded by moy (license 222)
app_osplookup-rev83558.patch uploaded by moy (license 222)
res_clioriginate.c.patch uploaded by moy (license 222)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
3ffa04bbd3
Merged revisions 84511 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84511 | murf | 2007-10-03 08:23:00 -0600 (Wed, 03 Oct 2007) | 1 line
closes issue #10834 ; where a null input to a switch statement results in a hangup; since switch is implemented with extensions, and the default case is implemented with a '.', and the '.' matches 1 or more remaining characters, the case where 0 characters exist isn't matched, and the extension isn't matched, and the goto fails, and a hangup occurs. Now, when a default case is generated, it also generates a single fixed extension that will match a null input. That extension just does a goto to the default extension for that switch. I played with an alternate solution, where I just tack an extra char onto all the patterns and the goto, but not the default case's pattern. Then even a null input will still have at least one char in it. But it made me nervous, having that extra char in , even if that's a pretty secret and low-level issue.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
b3168a76c9
Merged revisions 84239 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r84239 | murf | 2007-10-01 14:27:52 -0600 (Mon, 01 Oct 2007) | 1 line
closes issue #10777 -- by returning a null for the parse tree when there's really nothing there, and making sure we don't try to do checking on a null tree.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
d78463be1e
Corydon posted this janitor project to the bug tracker and mvanbaak provided
...
a patch for it. It replaces a bunch of simple calls to snprintf with ast_copy_string
(closes issue #10843 )
Reported by: Corydon76
Patches:
2007092900_10843.diff uploaded by mvanbaak (license 7)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
c782398ca4
the last commit for AEL affected a small number of tests. Added a regression test for glob'd includes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
41d513f443
Merged revisions 83976 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83976 | russell | 2007-09-26 19:01:29 -0500 (Wed, 26 Sep 2007) | 1 line
remove a todo item that has been completed
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
f2b38cf2f3
Merged revisions 83558 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83558 | murf | 2007-09-22 10:41:43 -0600 (Sat, 22 Sep 2007) | 1 line
This closes issue #10788 -- the 3rd arg in the for statement is now wrapped in Set() only if there's an '=' in that string. Otherwise, if it begins with '&', then a Macro call is generated; otherwise it is made into an app call. A bit more accomodating, keeps the new guys happy, and the guys with ael-1 code should be happy, too
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83575 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
9f64905d4e
Merged revisions 83432 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83432 | russell | 2007-09-21 09:37:20 -0500 (Fri, 21 Sep 2007) | 4 lines
gcc 4.2 has a new set of warnings dealing with cosnt pointers. This set of
changes gets all of Asterisk (minus chan_alsa for now) to compile with gcc 4.2.
(closes issue #10774 , patch from qwell)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Joshua Colp
6489076887
Fix memory leaks in pbx_dundi, cdr_pgsql, and the configuration file parser.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
3d7cf301d8
Merged revisions 82802 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82802 | russell | 2007-09-18 11:31:01 -0500 (Tue, 18 Sep 2007) | 4 lines
When copying the contents from the wildcard peer, do a deep copy instead of
shallow copy so that it doesn't crash when beging destroyed.
(closes issue #10546 , patch by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
9388173f85
Make the MALLOC_DEBUG output for free() useful again. After changing calls to
...
free to be ast_free, astmm said all calls to free were coming from utils.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
584a510d20
Merged revisions 82358 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82358 | qwell | 2007-09-13 18:11:27 -0500 (Thu, 13 Sep 2007) | 4 lines
Fix a small typo.
retrytime > waittime
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
c0f72f5311
Merged revisions 82250 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82250 | russell | 2007-09-11 11:03:42 -0500 (Tue, 11 Sep 2007) | 4 lines
The sample dundi.conf claims support for a wildcard peer entry - [*], but the
code did not support it. This patch makes it work.
(closes issue #10546 , patch by dds, with some changes by me)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Joshua Colp
078595f5c5
Merged revisions 82243 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82243 | file | 2007-09-11 11:56:39 -0300 (Tue, 11 Sep 2007) | 6 lines
(closes issue #10577 )
Reported by: jamesgolovich
Patches:
asterisk-dundifree.diff.txt uploaded by jamesgolovich (license 176)
Don't leak memory when unloading DUNDi.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
b5cd67adc3
This code was in team/murf/bug8684-trunk; it should fix bug 8684 in trunk. I didn't add it to 1.4 yet, because it's not entirely clear to me if this is a bug fix or an enhancement. A lot of files were affected by small changes like ast_variable_new getting an added arg, for the file name the var was defined in; ast_category_new gets added args of filename and lineno; ast_category and ast_variable structures now record file and lineno for each entry; a list of all #include and #execs in a config file (or any of its inclusions are now kept in the ast_config struct; at save time, each entry is put back into its proper file of origin, in order. #include and #exec directives are folded in properly. Headers indicating that the file was generated, are generated also for each included file. Some changes to main/manager.c to take care of file renaming, via the UpdateConfig command. Multiple inclusions of the same file are handled by exploding these into multiple include files, uniquely named. There's probably more, but I can't remember it right now.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81361 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
2f4a2811b6
Add proper channel locking around the uses of datastore_add and _find. There
...
are still more places in the tree that I have not yet changed if someone wants
to go through and find the places they are used without the channel locked.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81262 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
44795584b2
This should have been trunk only, I guess. oh well ... it's harmless.
...
Merged revisions 81065 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81065 | russell | 2007-08-27 11:38:33 -0500 (Mon, 27 Aug 2007) | 1 line
explicity define a variable as a boolean
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81098 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
adcd4d4ab4
Merged revisions 81074 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81074 | russell | 2007-08-27 12:27:48 -0500 (Mon, 27 Aug 2007) | 3 lines
Add a \todo to note that this module leaks most of the memory it allocates on
unload and should be fixed (when I'm not in the middle of something else ...).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
8d4761f8d3
localize a variable and remove a duplicate error message
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
83e28341b5
an unreported crash I debugged, looked like it was backing up way too far after hitting the syntax error. An inspection of the code revealed that error tokens in lists were not rearranged when the rules were rearranged as part of a code neatening-up process. By moving the error tokens to where they should be, I also reduced the number of shift/reduce conflicts to 3 instead of 8. This introduces subtle differences in error messages, so the regressions had to be updated.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Jason Parker
fafa7d93e4
Correct the argument separator for a Dial statement in pbx_dundi.
...
Closes issue #10483 , patch by lunn
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
56b9568164
Don't reload a configuration file if nothing has changed.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Joshua Colp
3f998a86a1
(closes issue #10467 )
...
Reported by: lunn
Patches:
pbx_dundi.diff uploaded by lunn (license 179)
Don't print a warning saying an ethernet interface was found when it indeed was.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
9836efb5fb
This commit closes bug 7605, and half-closes 7638. The AEL code has been redistributed/repartitioned to allow code re-use both inside and outside of Asterisk. This commit introduces the utils/conf2ael program, and an external config-file reader, for both normal config files, and for extensions.conf (context, exten, prio); It provides an API for programs outside of asterisk to use to play with the dialplan and config files.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
d9b52497f0
Merged revisions 79255 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79255 | murf | 2007-08-13 11:49:54 -0600 (Mon, 13 Aug 2007) | 1 line
This patch fixes bug 10411. I added a new regression test, some regression test cleanups
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
526d1f39a2
Merged revisions 79099 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79099 | murf | 2007-08-10 14:53:43 -0600 (Fri, 10 Aug 2007) | 1 line
From a user complaint on #asterisk, I have forced pbx_spool to explain what reason codes mean, when they are logged
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
668a334f85
Add another big set of doxygen documentation improvements from snuffy.
...
(closes issue #9892 )
(closes issue #10395 )
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
4e0947c5f1
Convert code that checks the _softhangup member of ast_channel directory to use
...
the ast_check_hangup() funciton. This function takes scheduled hangups into
account.
(closes issue #10230 , patch by Juggie)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
8f1c914c89
'dialplan save' shouldn't be converting '|' back to ',' anymore.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
ceca4d97e1
These fixes take care of two problems: a complaint in asterisk-dev that goto's aren't working in trunk, a side effect of the move to commas as arg seps in apps and funcs; and a problem I spotted myself with dial's 'e' option, where gotos were off by one, because I forgot to set the AUTOLOOP flag in the peer channel.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Russell Bryant
f8483a0d04
Do a massive conversion for using the ast_verb() macro
...
(closes issue #10277 , patches by mvanbaak)
Basically, this changes ...
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3, "Something\n");
to ...
ast_verb(3, "Something\n");
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Steve Murphy
f7213d2411
The upgrade of application argument separators to comma has an effect on AEL; I commented out the code that substitutes commas with vertbars, so we can get apps to parse their args correctly.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago
Tilghman Lesher
55b1ee298e
Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
...
using old methods of parsing arguments to using the standard macros. However, the big
change is that the really old way of specifying application and arguments separated by
a comma will no longer work (e.g. NoOp,foo|bar). Instead, the way that has been
recommended since long before 1.0 will become the only method available (e.g. NoOp(foo,bar).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@76703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
0e969271ae
After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
5ac24b25d3
This corrects the problem with flags and %lld formats on 64-bit machines, where uint64_t is NOT acceptable for %lld, and also works on 32-bit machines. At least, with gcc.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
674dbeb0cf
Merged revisions 75583 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r75583 | file | 2007-07-18 11:18:53 -0300 (Wed, 18 Jul 2007) | 5 lines
(closes issue #10224 )
Reported by: irroot
Record the threadid of each running thread before shutting them down as the thread themselves may change the value.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
4003b31fc5
Minor code tweaks. Variables were being checked wrong in some situations and didn't need to be checked in others.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
8b0b74c9b0
Spotted this bug today myself, trying to reproduce a BE bug. Use a vert bar instead of a comma, when calling RAND.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
8a7732f067
via 10206, I have added an option (e) to Dial to allow the h exten to get run on peer. Had to upgrade ast_flag stuff to 64 bits to do this.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
1040d3f64b
Clean up pbx_spool. So many nested if statements...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
836ea36d3c
Merged revisions 74045 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r74045 | file | 2007-07-09 11:49:05 -0300 (Mon, 09 Jul 2007) | 2 lines
Few minor thread synchronization tweaks. (issue #10124 reported by gzero)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@74046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
d61056132a
Merged revisions 73930 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r73930 | file | 2007-07-08 22:13:57 -0300 (Sun, 08 Jul 2007) | 2 lines
Add a few sanity checks when writing out the dialplan. (issue #10157 reported by dome)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
6a4efe5d5a
In regards to changes for 9508, expr2 system choking on floating point numbers, I'm adding this update to round out (no pun intended) and make this FP-capable version of the Expr2 stuff interoperate better with previous integer-only usage, by providing Functions syntax, with 20 builtin functions for floating pt to integer conversions, and some general floating point math routines that might commonly be used also. Along with this, I made it so if a function was not a builtin, it will try and find it in the ast_custom_function list, and if found, execute it and collect the results. Thus, you can call system functions like CDR(), CHANNEL(), etc, from within $\[..\] exprs, without having to wrap them in $\{...\} (curly brace) notation. Did a valgrind on the standalone and made sure there's no mem leaks. Looks good. Updated the docs, too.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@73449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
3b0f89dae6
Merged revisions 72806 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r72806 | russell | 2007-07-01 18:52:45 -0500 (Sun, 01 Jul 2007) | 13 lines
Merged revisions 72805 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r72805 | russell | 2007-07-01 18:51:34 -0500 (Sun, 01 Jul 2007) | 5 lines
When appending lines to call files to keep track of retries, write a leading
newline just in case the original call file did not have a newline at the end.
This fix is in response to a problem I saw reported on the asterisk-users
mailing list.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
8d89f741a5
Merged revisions 72272 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r72272 | russell | 2007-06-27 16:08:34 -0500 (Wed, 27 Jun 2007) | 13 lines
Merged revisions 72267 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r72267 | russell | 2007-06-27 16:06:45 -0500 (Wed, 27 Jun 2007) | 5 lines
Fix a minor issue with parsing the priority number. You could have as much
whitespace as you want around a numeric priority, but you couldn't have any
whitespace around a special priority like "n" or "hint".
(issue #10039 , reported by mitheloc, fixed by me)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
36668045a6
Merged revisions 72006 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r72006 | file | 2007-06-26 20:58:35 -0400 (Tue, 26 Jun 2007) | 2 lines
Make unloading of pbx_dundi actually work.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Tilghman Lesher
a1bc823136
Issue 9990 - New API ast_mkdir, which creates parent directories as necessary (and is faster than an outcall to mkdir -p)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
c1bb0fc34b
This finishes the changes for making Macro args LOCAL to the call, and allowing users to declare local variables.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Tilghman Lesher
704c756c4a
Merge work to make U(...) option work for Dial
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
9e0458e9f1
Completely remove all of the code related to jumping to priority n + 101. yay!
...
(issue #9926 , caio1982)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Tilghman Lesher
7e52b8620b
Merged revisions 68595 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r68595 | tilghman | 2007-06-10 23:21:30 -0500 (Sun, 10 Jun 2007) | 2 lines
"dialplan save" produced garbage in the config file
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
52efde5c65
Merged revisions 67526 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67526 | murf | 2007-06-05 15:30:18 -0600 (Tue, 05 Jun 2007) | 1 line
this fixes bug 9883, wherein macros were not allowing the includes construct. fixed and tested, looks OK. Now includes can serve as an adjunct to catch.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
00b33aaa49
Merged revisions 67420 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r67420 | murf | 2007-06-05 12:17:28 -0600 (Tue, 05 Jun 2007) | 1 line
Added code to automatically add a default case to switches that don't have one. In some cases, rather than fall thru, it results in a goto with -1 result, which terminates the extension; a sort of dialplan seqfault, sort of. This was required to fix bug reported in 9881
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
e1375b96c2
Change javadoc style code documentation to the same format we use elsewhere.
...
(issue #9864 , patch from snuffy)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Kevin P. Fleming
4573b36af1
use the OpenSSL AES implementation if it's available (unless configured not to)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
4b3a3fb14c
Add a new API call for creating detached threads. Then, go replace all of the
...
places in the code where the same block of code for creating detached threads
was replicated. (patch from bbryant)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
f02e26feff
Make sure that DUNDIRESULT is given an ID.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
dc8f6a9473
Merged revisions 62883 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r62883 | murf | 2007-05-03 07:54:56 -0600 (Thu, 03 May 2007) | 1 line
These mods fix bug 9623, where an '@' in the eswitch contents causes a syntax error. I also updated the regressions.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
b419fc1134
Add support for setting the CoS for VLAN traffic (802.1p) in Linux. The
...
file doc/qos.tex has been updated to document the new functionality.
(issue #9540 , patch submitted by IgorG)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Russell Bryant
c59b8876aa
Merge changes from team/russell/dundi_results
...
This introduces two new dialplan functions: DUNDIQUERY and DUNDIRESULT.
DUNDIQUERY lets you intitiate a DUNDi query from the dialplan. Then,
DUNDIRESULT will let you find out how many results there are, and access each
one without having to the query again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62267 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
f120c26ec1
Merged revisions 59688 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59688 | murf | 2007-04-02 11:31:32 -0600 (Mon, 02 Apr 2007) | 1 line
continue in for-loop should go to the incrementer, not the test. As per 9435, thanks to marcelbarbulescu
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59692 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
e1476b8aab
Merged revisions 59261 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59261 | murf | 2007-03-27 12:16:32 -0600 (Tue, 27 Mar 2007) | 1 line
via 9373 (duplicate context in AEL crashes asterisk), kpfleming pointed on asterisk-dev, that DECLINE in this case the proper thing to do. This change now has it doing the proper thing.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
2ca78b4a6e
added the no. 18 regression test
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
589a8f9214
updated the regressions with regards to 9373, the crash on double contexts, and brought other regressions up to date
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
3433b64703
Merged revisions 59228 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59228 | murf | 2007-03-26 15:41:32 -0600 (Mon, 26 Mar 2007) | 1 line
fix for 9373 (duplicate context in AEL crashes asterisk). I turned a duplicate context from a WARNING to an ERROR. Now you get a module load failure, and asterisk just exits. That's better than a crash, right\?
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
834f783edf
Merged revisions 59206 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59206 | murf | 2007-03-26 11:38:29 -0600 (Mon, 26 Mar 2007) | 1 line
A fix for the flex input files, DONT_COMPILE, and STANDALONE_AEL
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Joshua Colp
133f26f977
Merged revisions 59200 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r59200 | file | 2007-03-26 11:16:29 -0400 (Mon, 26 Mar 2007) | 2 lines
Have ast_copy_string magically appear in the aelparse binary! DONT_OPTIMIZE should now work once again.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago
Steve Murphy
e6d32d3132
The fix for the AEL <<security hole>> (bug 9316) is here...
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago