[asterisk-commits] murf: branch group/CDRfix5 r80414 - in /team/group/CDRfix5: ./ apps/ build_to...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Aug 22 16:43:40 CDT 2007
Author: murf
Date: Wed Aug 22 16:43:38 2007
New Revision: 80414
URL: http://svn.digium.com/view/asterisk?view=rev&rev=80414
Log:
Merged revisions 79595,79611,79623,79634,79638,79660,79666,79687-79688,79691,79714,79719,79724-79725,79736,79747,79749,79755,79764,79788,79794,79813,79824,79841,79858-79862,79885,79888,79894,79901,79903,79905,79907,79913,79915,79940,79949,79972,79980,79988-79990,79999,80023,80033,80037,80045-80046,80048,80050,80075,80087,80089,80113,80131,80133,80157,80184,80217,80226,80241-80242,80256,80258,80262 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r79595 | murf | 2007-08-15 13:21:27 -0600 (Wed, 15 Aug 2007) | 1 line
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.
................
r79611 | file | 2007-08-15 13:34:42 -0600 (Wed, 15 Aug 2007) | 2 lines
Remove properties that appeared from Steve's last branch merge. Automerge has already run so everyone's branches based off of trunk are probably toast by now.
................
r79623 | tilghman | 2007-08-15 15:25:13 -0600 (Wed, 15 Aug 2007) | 2 lines
Missing from murf's last trunk commit, which was why trunk won't compile
................
r79634 | qwell | 2007-08-15 16:53:45 -0600 (Wed, 15 Aug 2007) | 4 lines
Modify the names of functions/variables in res_musiconhold to be useful.
Closes issue #10464, patch by caio1982
................
r79638 | oej | 2007-08-16 00:52:17 -0600 (Thu, 16 Aug 2007) | 2 lines
Doc change
................
r79660 | crichter | 2007-08-16 03:22:23 -0600 (Thu, 16 Aug 2007) | 9 lines
Merged revisions 79642 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79642 | crichter | 2007-08-16 10:21:21 +0200 (Do, 16 Aug 2007) | 1 line
0x80 + protocol is wrong for USERUSER when we want to send IA5 Chars.
........
................
r79666 | phsultan | 2007-08-16 03:45:22 -0600 (Thu, 16 Aug 2007) | 29 lines
Merged revisions 79665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79665 | phsultan | 2007-08-16 11:37:10 +0200 (Thu, 16 Aug 2007) | 21 lines
A fix for two critical problems detected while working with Daniel
McKeehan in issue #10184.
Upon priority change, the resource list is not NULL terminated when
moving an item to the end of the list. This makes Asterisk endlessy
loop whenever it needs to read the list. Jids with different resource and
priority values, like in Gmail's and GoogleTalk's jabber clients put
that problem in evidence.
Upon reception of a 'from' attribute with an empty resource string,
Asterisk crashes when trying to access the found->cap pointer if the
resource list for the given buddy is not empty. This situation is
perfectly valid and must be handled. The Gizmoproject's jabber client
put that problem in evidence.
Also added a few comments in the code as well as a handle for the
capabilities from Gmail's jabber client, which are stored in a caps:c tag
rather than the usual c tag.
Closes issue #10184.
........
................
r79687 | file | 2007-08-16 09:27:33 -0600 (Thu, 16 Aug 2007) | 2 lines
Make conf2ael build on 64-bit systems.
................
r79688 | file | 2007-08-16 09:29:44 -0600 (Thu, 16 Aug 2007) | 6 lines
(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.
................
r79691 | mmichelson | 2007-08-16 09:59:15 -0600 (Thu, 16 Aug 2007) | 13 lines
Merged revisions 79690 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79690 | mmichelson | 2007-08-16 10:58:34 -0500 (Thu, 16 Aug 2007) | 5 lines
base_encode is not trying to open a log file, so we should not call it a log file in the warning.
(related to issue #10452, reported by bcnit)
........
................
r79714 | murf | 2007-08-16 10:50:58 -0600 (Thu, 16 Aug 2007) | 1 line
svn did me dirty for some reason. Left 5 files out of the commit; Tilghman copied them in from the branch, but I had made changes to these. Here they are.
................
r79719 | murf | 2007-08-16 11:34:50 -0600 (Thu, 16 Aug 2007) | 1 line
mvanbaak asks: why did you include that twice? Answer: dunno. removed redundant include
................
r79724 | dhubbard | 2007-08-16 11:44:25 -0600 (Thu, 16 Aug 2007) | 1 line
added counter for voicemail show users, issue 10462, thanks junky
................
r79725 | dhubbard | 2007-08-16 12:23:39 -0600 (Thu, 16 Aug 2007) | 1 line
added counter for iax2 show registry CLI output, closes issue 10461, thanks junky
................
r79736 | murf | 2007-08-16 13:40:28 -0600 (Thu, 16 Aug 2007) | 1 line
Many thanks to mvanbaak for his update to translate hints; I added the -d option for local testing purposes. This is from bug 10472
................
r79747 | tilghman | 2007-08-16 15:09:46 -0600 (Thu, 16 Aug 2007) | 2 lines
Don't reload a configuration file if nothing has changed.
................
r79749 | mmichelson | 2007-08-16 15:21:35 -0600 (Thu, 16 Aug 2007) | 16 lines
Merged revisions 79748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79748 | mmichelson | 2007-08-16 16:16:40 -0500 (Thu, 16 Aug 2007) | 8 lines
Fixes a problem where agents would get stuck busy due to their wrapuptime being longer than the queue's wrapuptime and
ringinuse=no for the queue.
(closes issue #10215, reported by Doug, repaired by me)
Special thanks to fkasumovic for pointing out the source of the problem and to bweschke for helping to come up with a solution!
........
................
r79755 | file | 2007-08-16 15:28:50 -0600 (Thu, 16 Aug 2007) | 2 lines
Fix properties on trunk again.
................
r79764 | russell | 2007-08-16 15:33:38 -0600 (Thu, 16 Aug 2007) | 19 lines
Merged revisions 79756 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79756 | russell | 2007-08-16 16:29:24 -0500 (Thu, 16 Aug 2007) | 11 lines
Fix more deadlocks in chan_iax2 that were introduced by making frame handling
and scheduling multi-threaded. Unfortunately, we have to do some expensive
deadlock avoidance when queueing frames on to the ast_channel owner of the IAX2
pvt struct. This was already handled for regular frames, but ast_queue_hangup
and ast_queue_control were still used directly. Making these changes introduced
even more places where the IAX2 pvt struct can disappear in the context of a
function holding its lock due to calling a function that has to unlock/lock it
to avoid deadlocks. I went through and fixed all of these places to account for
this possibility.
(issue #10362, patch by me)
........
................
r79788 | russell | 2007-08-16 16:30:39 -0600 (Thu, 16 Aug 2007) | 22 lines
Merged revisions 79778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79778 | russell | 2007-08-16 17:24:25 -0500 (Thu, 16 Aug 2007) | 14 lines
This patch fixes a bug where reloading the module with "module reload" did not
delete classes from memory that were no longer in the config. This patch fixes
that problem as well as another one. Previously, if you reloaded MOH using the
"moh reload" CLI command, which behaved differently than "module reload ...",
MOH had to be stopped on every channel and started again immediately. However,
there was no way to tell what class was being used, so they would all fall back
to the default class.
(closes issue #10139)
Reported by: blitzrage
Patches:
asterisk-10139-advanced.diff.txt uploaded by jamesgolovich (license 176)
Tested by: jamesgolovich
........
................
r79794 | russell | 2007-08-16 16:33:02 -0600 (Thu, 16 Aug 2007) | 12 lines
Merged revisions 79792 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79792 | russell | 2007-08-16 17:32:33 -0500 (Thu, 16 Aug 2007) | 4 lines
Fix a little race condition that could cause a crash if two channels had MOH
stopped at the same time that were using a class that had been marked for
deletion when its use count hits zero.
........
................
r79813 | tilghman | 2007-08-16 17:31:14 -0600 (Thu, 16 Aug 2007) | 2 lines
Revise dialplan locks to permit multiple locks per channel, but with deadlock avoidance
................
r79824 | file | 2007-08-16 19:19:04 -0600 (Thu, 16 Aug 2007) | 2 lines
Fix building of chan_zap under development mode without libpri and libss7 installed.
................
r79841 | crichter | 2007-08-17 02:29:56 -0600 (Fri, 17 Aug 2007) | 9 lines
Merged revisions 79833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79833 | crichter | 2007-08-17 10:22:36 +0200 (Fr, 17 Aug 2007) | 1 line
sometimes we don't need to signal dtmf tones to asterisk, we just want them to go through as inband. Otherwise they might be generated by the other channel partner and then there is a double tone.
........
................
r79858 | russell | 2007-08-17 07:39:17 -0600 (Fri, 17 Aug 2007) | 13 lines
Merged revisions 79857 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79857 | russell | 2007-08-17 08:37:08 -0500 (Fri, 17 Aug 2007) | 5 lines
Fix some crashes in chan_sip. This patch changes various places that add items
to the scheduler to ensure that they don't overwrite the ID of a previously
scheduled item. If there is one, it should be removed.
(closes issue #10391, closes issue #10256, probably others, patch by me)
........
................
r79859 | tilghman | 2007-08-17 07:40:11 -0600 (Fri, 17 Aug 2007) | 2 lines
store and destroy implementations for realtime pgsql (closes issue #10372)
................
r79860 | tilghman | 2007-08-17 07:45:44 -0600 (Fri, 17 Aug 2007) | 2 lines
store and destroy implementations for sqlite (closes issue #10446) and odbc (closes issue #10447)
................
r79861 | russell | 2007-08-17 08:07:44 -0600 (Fri, 17 Aug 2007) | 12 lines
This commit adds a scheduler API call, ast_sched_replace that can be used
in place of a very common construct. I also used it in a number of places
in chan_sip.
if (id > -1)
ast_sched_del(sched, id);
id = ast_sched_add(sched, ...);
changes to:
ast_sched_replace(id, sched, ...);
................
r79862 | russell | 2007-08-17 08:14:59 -0600 (Fri, 17 Aug 2007) | 2 lines
Make use of ast_sched_replace() in some places in chan_iax2
................
r79885 | tilghman | 2007-08-17 08:41:33 -0600 (Fri, 17 Aug 2007) | 2 lines
Change this flag... might not otherwise unlock in an OOM situation
................
r79888 | qwell | 2007-08-17 09:27:19 -0600 (Fri, 17 Aug 2007) | 4 lines
Correct the argument separator for a Dial statement in pbx_dundi.
Closes issue #10483, patch by lunn
................
r79894 | qwell | 2007-08-17 10:04:20 -0600 (Fri, 17 Aug 2007) | 4 lines
Fix Dial arguments in res_features.
Closes issue #10484, patch by lunn.
................
r79901 | tilghman | 2007-08-17 10:39:41 -0600 (Fri, 17 Aug 2007) | 2 lines
Documentation for %q in logger.conf, as suggested by jtodd (closes issue #10475)
................
r79903 | qwell | 2007-08-17 11:45:01 -0600 (Fri, 17 Aug 2007) | 13 lines
Merged revisions 79902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10485)
........
r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines
Re-add the setting of callerid name and number.
Issue 10485, reported by and fix explained by paradise.
........
................
r79905 | qwell | 2007-08-17 13:13:25 -0600 (Fri, 17 Aug 2007) | 20 lines
Merged revisions 79904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10430)
........
r79904 | qwell | 2007-08-17 14:12:19 -0500 (Fri, 17 Aug 2007) | 11 lines
Don't send a semicolon over the wire in sip notify messages.
Caused by fix for issue 9938.
I basically took the code that existed before 9938 was fixed, and
copied it into a new function - ast_unescape_semicolon
There should be very few places this will be needed (pbx_config
does NOT need this (see issue 9938 for details))
Issue 10430, patch by me, with help/ideas from murf (thanks murf).
........
................
r79907 | mmichelson | 2007-08-17 13:16:51 -0600 (Fri, 17 Aug 2007) | 14 lines
Merged revisions 79906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79906 | mmichelson | 2007-08-17 14:14:05 -0500 (Fri, 17 Aug 2007) | 6 lines
Patch allows for more seamless transition from file storage voicemail to ODBC storage voicemail.
If a retrieval of a greeting from the database fails, but the file is found on the file system, then
we go ahead an insert the greeting into the database. The result of this is that people who
switch from file storage to ODBC storage do not need to rerecord their voicemail greetings.
........
................
r79913 | russell | 2007-08-17 15:04:33 -0600 (Fri, 17 Aug 2007) | 12 lines
Merged revisions 79912 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79912 | russell | 2007-08-17 16:01:43 -0500 (Fri, 17 Aug 2007) | 4 lines
Avoid a crash in the handling of DTMF based Caller ID. It is valid for
ast_read to return NULL in the case that the channel has been hung up.
(crash reported by anonymouz666 on IRC in #asterisk-dev)
........
................
r79915 | mmichelson | 2007-08-17 15:19:18 -0600 (Fri, 17 Aug 2007) | 3 lines
I broke the build. Now I'm fixing it.
................
r79940 | tilghman | 2007-08-18 07:52:44 -0600 (Sat, 18 Aug 2007) | 2 lines
We weren't properly encapsulating the mtime ignores of config files (closes issue #10488)
................
r79949 | tilghman | 2007-08-18 08:34:47 -0600 (Sat, 18 Aug 2007) | 11 lines
Merged revisions 79947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79947 | tilghman | 2007-08-18 09:30:44 -0500 (Sat, 18 Aug 2007) | 3 lines
Don't allocate vmu for messagecount when we could just use the stack instead (closes issue #10490)
Also, remove a useless (and leaky) SQLAllocHandle (closes issue #10480)
........
................
r79972 | file | 2007-08-18 17:58:51 -0600 (Sat, 18 Aug 2007) | 2 lines
Actually check the return value of epoll_create to make sure it works.
................
r79980 | tilghman | 2007-08-19 08:17:30 -0600 (Sun, 19 Aug 2007) | 2 lines
Add strcompat dependency for check_expr (needed for platforms that don't have strndup)
................
r79988 | file | 2007-08-19 18:37:12 -0600 (Sun, 19 Aug 2007) | 2 lines
Fix building of trunk. I'm doing work on a Sunday night just to avoid watching Snakes on a Plane which my roommate is watching.
................
r79989 | file | 2007-08-19 18:38:20 -0600 (Sun, 19 Aug 2007) | 4 lines
(closes issue #10496)
Reported by: caio1982
Fix building on OSX.
................
r79990 | file | 2007-08-19 18:54:19 -0600 (Sun, 19 Aug 2007) | 4 lines
(closes issue #10495)
Reported by: stevedavies
Make sure context pointer is valid or else chan_iax2 will go kaboom.
................
r79999 | tilghman | 2007-08-19 20:46:02 -0600 (Sun, 19 Aug 2007) | 10 lines
Merged revisions 79998 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r79998 | tilghman | 2007-08-19 21:42:49 -0500 (Sun, 19 Aug 2007) | 2 lines
Missing curly braces. Oops. (Reported by snuffy via IRC)
........
................
r80023 | file | 2007-08-20 08:15:30 -0600 (Mon, 20 Aug 2007) | 2 lines
Fix random segfault issue when loading chan_zap. Trying to access a configuration structure that has already been destroyed is bad, mmmk?
................
r80033 | file | 2007-08-20 09:10:55 -0600 (Mon, 20 Aug 2007) | 2 lines
Bring pval.c in utils up to date with pval.c in res/ael.
................
r80037 | murf | 2007-08-20 09:27:35 -0600 (Mon, 20 Aug 2007) | 1 line
pval.c should not be in svn, in the utils dir
................
r80045 | mmichelson | 2007-08-20 09:37:13 -0600 (Mon, 20 Aug 2007) | 13 lines
Merged revisions 80044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80044 | mmichelson | 2007-08-20 10:34:43 -0500 (Mon, 20 Aug 2007) | 5 lines
Ukrainian language voicemail support.
(closes issue #10458, reported and patched by Oleh)
........
................
r80046 | file | 2007-08-20 09:53:20 -0600 (Mon, 20 Aug 2007) | 2 lines
Remove remnants of last commit so trunk builds again.
................
r80048 | qwell | 2007-08-20 10:12:29 -0600 (Mon, 20 Aug 2007) | 15 lines
Merged revisions 80047 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80047 | qwell | 2007-08-20 11:08:49 -0500 (Mon, 20 Aug 2007) | 7 lines
(closes issue #10499)
Reported by: casper
Patches:
extensions.conf.sample.diff uploaded by casper (license 55)
Update CLI examples in extensions.conf.sample to reflect command changes.
........
................
r80050 | mmichelson | 2007-08-20 10:18:55 -0600 (Mon, 20 Aug 2007) | 12 lines
Merged revisions 80049 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80049 | mmichelson | 2007-08-20 11:17:43 -0500 (Mon, 20 Aug 2007) | 4 lines
Found a pointless ternary if. member->dynamic was set to 1 and has no opportunity to change
between then and this line, so "dynamic" will ALWAYS be output.
........
................
r80075 | murf | 2007-08-20 11:37:36 -0600 (Mon, 20 Aug 2007) | 1 line
Stephn Davies reports that this will help make things work on 64-bit machines
................
r80087 | mmichelson | 2007-08-20 15:42:11 -0600 (Mon, 20 Aug 2007) | 12 lines
Blocked revisions 80086 via svnmerge
........
r80086 | mmichelson | 2007-08-20 16:39:17 -0500 (Mon, 20 Aug 2007) | 5 lines
After a discussion on #asterisk-dev, it was decided that this should be in 1.4 as well.
(issue #10424, reported and patched by irroot)
........
................
r80089 | russell | 2007-08-20 16:00:01 -0600 (Mon, 20 Aug 2007) | 9 lines
Blocked revisions 80088 via svnmerge
........
r80088 | russell | 2007-08-20 16:57:08 -0500 (Mon, 20 Aug 2007) | 2 lines
Fix the build of app_queue
........
................
r80113 | murf | 2007-08-20 16:53:48 -0600 (Mon, 20 Aug 2007) | 1 line
This change set fixes bug 8126 in trunk. It is implemented via compile time options, activated via the menuselect stuff, which defaults to the old way. non-zero sample data added. Translate tables expressed in microseconds instead of milliseconds, with 5-digit data now instead of 3, giving 2 more digits of precision.
................
r80131 | qwell | 2007-08-21 09:04:37 -0600 (Tue, 21 Aug 2007) | 15 lines
Merged revisions 80130 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80130 | qwell | 2007-08-21 10:03:45 -0500 (Tue, 21 Aug 2007) | 7 lines
(closes issue #10510)
Reported by: casper
Patches:
cdr.conf.diff uploaded by casper (license 55)
Fix a few errors in sample cdr config file.
........
................
r80133 | russell | 2007-08-21 09:23:12 -0600 (Tue, 21 Aug 2007) | 11 lines
Merged revisions 80132 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80132 | russell | 2007-08-21 10:22:22 -0500 (Tue, 21 Aug 2007) | 3 lines
Don't try to dereference the owner channel when it may not exist
(issue #10507, maxper)
........
................
r80157 | file | 2007-08-21 09:51:49 -0600 (Tue, 21 Aug 2007) | 2 lines
Minor tweak. Don't manipulate volume of the audio in the buffer if no audio is actually there.
................
r80184 | russell | 2007-08-21 12:49:23 -0600 (Tue, 21 Aug 2007) | 15 lines
Merged revisions 80183 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80183 | russell | 2007-08-21 13:42:15 -0500 (Tue, 21 Aug 2007) | 7 lines
Don't record SIP dialog history if it's not turned on. Also, put an upper
limit on how many history entires will be stored for each SIP dialog. It is
currently set to 50, but can be increased if deemed necessary.
(closes issue #10421, closes issue #10418, patches suggested by jmoldenhauer,
patches updated by me)
(Security implications documented in AST-2007-020)
........
................
r80217 | murf | 2007-08-21 14:55:44 -0600 (Tue, 21 Aug 2007) | 1 line
As per 10472, mvanbaak thought the generated code would look better this way.
................
r80226 | russell | 2007-08-21 15:58:29 -0600 (Tue, 21 Aug 2007) | 1 line
use ast_atomic_fetchadd_int for incrementing resultcount
................
r80241 | murf | 2007-08-22 08:12:24 -0600 (Wed, 22 Aug 2007) | 9 lines
Merged revisions 80166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80166 | murf | 2007-08-21 10:36:34 -0600 (Tue, 21 Aug 2007) | 1 line
This patch solves problem 1 in 8126; it should not slow down the alaw codec, but should prevent signal degradation via multiple trips thru the codec. Fossil estimates the twice thru this codec will prevent fax from working. 4-6 times thru would result hearable, noticeable, voice degradation.
........
................
r80242 | murf | 2007-08-22 08:17:42 -0600 (Wed, 22 Aug 2007) | 1 line
blocking 80167
................
r80256 | file | 2007-08-22 10:16:01 -0600 (Wed, 22 Aug 2007) | 12 lines
Merged revisions 80255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80255 | file | 2007-08-22 13:14:38 -0300 (Wed, 22 Aug 2007) | 4 lines
(closes issue #10526)
Reported by: sinistermidget
Revert commit from issue #10355 and return timestamp skew to 640.
........
................
r80258 | russell | 2007-08-22 10:22:27 -0600 (Wed, 22 Aug 2007) | 12 lines
Merged revisions 80257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r80257 | russell | 2007-08-22 11:21:58 -0500 (Wed, 22 Aug 2007) | 4 lines
Honor the contents of the COPTS variable as custom target CFLAGS. Apparently
this is what openwrt does.
(reported by Brian Capouch on the asterisk-dev list, patch by me)
........
................
r80262 | russell | 2007-08-22 10:27:39 -0600 (Wed, 22 Aug 2007) | 4 lines
Ensure that the object code for ast_atomic_fetchadd_int() gets included in the
check_expr binary when building with LOW_MEMORY defined.
(reported by Brian Capouch on the asterisk-dev list, patch by me)
................
Added:
team/group/CDRfix5/include/asterisk/extconf.h
- copied unchanged from r80262, trunk/include/asterisk/extconf.h
team/group/CDRfix5/include/asterisk/pval.h
- copied unchanged from r80262, trunk/include/asterisk/pval.h
team/group/CDRfix5/res/ael/
- copied from r80262, trunk/res/ael/
team/group/CDRfix5/res/ael/ael.flex
- copied unchanged from r80262, trunk/res/ael/ael.flex
team/group/CDRfix5/res/ael/ael.tab.c
- copied unchanged from r80262, trunk/res/ael/ael.tab.c
team/group/CDRfix5/res/ael/ael.tab.h
- copied unchanged from r80262, trunk/res/ael/ael.tab.h
team/group/CDRfix5/res/ael/ael.y
- copied unchanged from r80262, trunk/res/ael/ael.y
team/group/CDRfix5/res/ael/ael_lex.c
- copied unchanged from r80262, trunk/res/ael/ael_lex.c
team/group/CDRfix5/res/ael/pval.c
- copied unchanged from r80262, trunk/res/ael/pval.c
team/group/CDRfix5/res/res_ael_share.c
- copied unchanged from r80262, trunk/res/res_ael_share.c
team/group/CDRfix5/utils/conf2ael.c
- copied unchanged from r80262, trunk/utils/conf2ael.c
team/group/CDRfix5/utils/extconf.c
- copied, changed from r80262, trunk/utils/extconf.c
Removed:
team/group/CDRfix5/pbx/ael/ael.flex
team/group/CDRfix5/pbx/ael/ael.tab.c
team/group/CDRfix5/pbx/ael/ael.tab.h
team/group/CDRfix5/pbx/ael/ael.y
team/group/CDRfix5/pbx/ael/ael_lex.c
Modified:
team/group/CDRfix5/ (props changed)
team/group/CDRfix5/CHANGES
team/group/CDRfix5/Makefile
team/group/CDRfix5/UPGRADE.txt
team/group/CDRfix5/apps/app_alarmreceiver.c
team/group/CDRfix5/apps/app_amd.c
team/group/CDRfix5/apps/app_directory.c
team/group/CDRfix5/apps/app_festival.c
team/group/CDRfix5/apps/app_followme.c
team/group/CDRfix5/apps/app_meetme.c
team/group/CDRfix5/apps/app_minivm.c
team/group/CDRfix5/apps/app_osplookup.c
team/group/CDRfix5/apps/app_playback.c
team/group/CDRfix5/apps/app_privacy.c
team/group/CDRfix5/apps/app_queue.c
team/group/CDRfix5/apps/app_rpt.c
team/group/CDRfix5/apps/app_voicemail.c
team/group/CDRfix5/build_tools/cflags.xml
team/group/CDRfix5/cdr/cdr_adaptive_odbc.c
team/group/CDRfix5/cdr/cdr_csv.c
team/group/CDRfix5/cdr/cdr_custom.c
team/group/CDRfix5/cdr/cdr_manager.c
team/group/CDRfix5/cdr/cdr_odbc.c
team/group/CDRfix5/cdr/cdr_pgsql.c
team/group/CDRfix5/cdr/cdr_radius.c
team/group/CDRfix5/cdr/cdr_sqlite3_custom.c
team/group/CDRfix5/cdr/cdr_tds.c
team/group/CDRfix5/channels/chan_agent.c
team/group/CDRfix5/channels/chan_alsa.c
team/group/CDRfix5/channels/chan_gtalk.c
team/group/CDRfix5/channels/chan_h323.c
team/group/CDRfix5/channels/chan_iax2.c
team/group/CDRfix5/channels/chan_jingle.c
team/group/CDRfix5/channels/chan_local.c
team/group/CDRfix5/channels/chan_mgcp.c
team/group/CDRfix5/channels/chan_misdn.c
team/group/CDRfix5/channels/chan_oss.c
team/group/CDRfix5/channels/chan_phone.c
team/group/CDRfix5/channels/chan_sip.c
team/group/CDRfix5/channels/chan_skinny.c
team/group/CDRfix5/channels/chan_vpb.cc
team/group/CDRfix5/channels/chan_zap.c
team/group/CDRfix5/channels/iax2-provision.c
team/group/CDRfix5/channels/iax2-provision.h
team/group/CDRfix5/channels/misdn/chan_misdn_config.h
team/group/CDRfix5/channels/misdn/ie.c
team/group/CDRfix5/channels/misdn_config.c
team/group/CDRfix5/codecs/codec_adpcm.c
team/group/CDRfix5/codecs/codec_alaw.c
team/group/CDRfix5/codecs/codec_g722.c
team/group/CDRfix5/codecs/codec_g726.c
team/group/CDRfix5/codecs/codec_gsm.c
team/group/CDRfix5/codecs/codec_lpc10.c
team/group/CDRfix5/codecs/codec_speex.c
team/group/CDRfix5/codecs/codec_ulaw.c
team/group/CDRfix5/codecs/codec_zap.c
team/group/CDRfix5/codecs/slin_ulaw_ex.h
team/group/CDRfix5/codecs/ulaw_slin_ex.h
team/group/CDRfix5/configs/cdr.conf.sample
team/group/CDRfix5/configs/extensions.conf.sample
team/group/CDRfix5/configs/logger.conf.sample
team/group/CDRfix5/configure
team/group/CDRfix5/configure.ac
team/group/CDRfix5/funcs/func_lock.c
team/group/CDRfix5/funcs/func_odbc.c
team/group/CDRfix5/include/asterisk/ael_structs.h
team/group/CDRfix5/include/asterisk/alaw.h
team/group/CDRfix5/include/asterisk/ast_expr.h
team/group/CDRfix5/include/asterisk/config.h
team/group/CDRfix5/include/asterisk/lock.h
team/group/CDRfix5/include/asterisk/pbx.h
team/group/CDRfix5/include/asterisk/sched.h
team/group/CDRfix5/include/asterisk/strings.h
team/group/CDRfix5/include/asterisk/ulaw.h
team/group/CDRfix5/main/alaw.c
team/group/CDRfix5/main/asterisk.c
team/group/CDRfix5/main/audiohook.c
team/group/CDRfix5/main/cdr.c
team/group/CDRfix5/main/config.c
team/group/CDRfix5/main/dnsmgr.c
team/group/CDRfix5/main/enum.c
team/group/CDRfix5/main/http.c
team/group/CDRfix5/main/loader.c
team/group/CDRfix5/main/logger.c
team/group/CDRfix5/main/manager.c
team/group/CDRfix5/main/pbx.c
team/group/CDRfix5/main/rtp.c
team/group/CDRfix5/main/sched.c
team/group/CDRfix5/main/translate.c
team/group/CDRfix5/main/udptl.c
team/group/CDRfix5/main/ulaw.c
team/group/CDRfix5/main/utils.c
team/group/CDRfix5/pbx/Makefile
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-ntest10
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test1
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test11
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test14
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test15
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test16
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test19
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test2
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test3
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test4
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test5
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test6
team/group/CDRfix5/pbx/ael/ael-test/ref.ael-test7
team/group/CDRfix5/pbx/pbx_ael.c
team/group/CDRfix5/pbx/pbx_config.c
team/group/CDRfix5/pbx/pbx_dundi.c
team/group/CDRfix5/res/Makefile
team/group/CDRfix5/res/res_adsi.c
team/group/CDRfix5/res/res_config_odbc.c
team/group/CDRfix5/res/res_config_pgsql.c
team/group/CDRfix5/res/res_config_sqlite.c
team/group/CDRfix5/res/res_features.c
team/group/CDRfix5/res/res_indications.c
team/group/CDRfix5/res/res_jabber.c
team/group/CDRfix5/res/res_musiconhold.c
team/group/CDRfix5/res/res_odbc.c
team/group/CDRfix5/res/res_smdi.c
team/group/CDRfix5/res/res_snmp.c
team/group/CDRfix5/utils/Makefile
team/group/CDRfix5/utils/ael_main.c
team/group/CDRfix5/utils/check_expr.c
Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/CDRfix5/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 22 16:43:38 2007
@@ -1,1 +1,1 @@
-/trunk:1-79566
+/trunk:1-80301
Modified: team/group/CDRfix5/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/CHANGES?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/CHANGES (original)
+++ team/group/CDRfix5/CHANGES Wed Aug 22 16:43:38 2007
@@ -21,6 +21,7 @@
are currently active on the system.
* Added a "ListAllVoicemailUsers" action that allows you to get a list of all
the voicemail users setup.
+ * Added 'DBDel' and 'DBDelTree' manager commands.
Dialplan functions
------------------
@@ -186,6 +187,12 @@
by saying "local myvar=someval;" or using Set() in this
fashion: Set(LOCAL(myvar)=someval); ("local" is now
an AEL keyword).
+ * utils/conf2ael introduced. Will convert an extensions.conf
+ file into extensions.ael. Very crude and unfinished, but
+ will be improved as time goes by. Should be useful for a
+ first pass at conversion.
+ * aelparse will now read extensions.conf to see if a referenced
+ macro or context is there before issueing a warning.
Zaptel channel driver (chan_zap) Changes
----------------------------------------
@@ -246,7 +253,6 @@
* Added G729 passthrough support to chan_phone for Sigma Designs boards.
* Added 's' option to Page application.
* Added 'E' and 'V' commands to ExternalIVR.
- * Added 'DBDel' and 'DBDelTree' manager commands.
* Added 'o' and 'X' options to Chanspy.
* Added a new CDR module, cdr_sqlite3_custom.
* The cdr_manager module has a [mappings] feature, like cdr_custom,
Modified: team/group/CDRfix5/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/Makefile?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/Makefile (original)
+++ team/group/CDRfix5/Makefile Wed Aug 22 16:43:38 2007
@@ -73,6 +73,10 @@
ifneq ($(wildcard makeopts),)
include makeopts
endif
+
+# Some build systems, such as the one in openwrt, like to pass custom target
+# CFLAGS in the COPTS variable.
+ASTCFLAGS+=$(COPTS)
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
Modified: team/group/CDRfix5/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/UPGRADE.txt?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/UPGRADE.txt (original)
+++ team/group/CDRfix5/UPGRADE.txt Wed Aug 22 16:43:38 2007
@@ -16,6 +16,10 @@
best to insert a Return() app call at the end of your macro if you did
not include it, but really, you should make sure that all execution
paths within your macros end in "return;".
+
+* The conf2ael program is 'introduced' in this release; it is in a rather
+ crude state, but deemed useful for making a first pass at converting
+ extensions.conf code into AEL. More intelligence will come with time.
Core:
Modified: team/group/CDRfix5/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_alarmreceiver.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_alarmreceiver.c (original)
+++ team/group/CDRfix5/apps/app_alarmreceiver.c Wed Aug 22 16:43:38 2007
@@ -714,10 +714,11 @@
{
struct ast_config *cfg;
const char *p;
+ struct ast_flags config_flags = { 0 };
/* Read in the config file */
- cfg = ast_config_load(ALMRCV_CONFIG);
+ cfg = ast_config_load(ALMRCV_CONFIG, config_flags);
if(!cfg){
Modified: team/group/CDRfix5/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_amd.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_amd.c (original)
+++ team/group/CDRfix5/apps/app_amd.c Wed Aug 22 16:43:38 2007
@@ -317,16 +317,18 @@
return 0;
}
-static void load_config(void)
+static void load_config(int reload)
{
struct ast_config *cfg = NULL;
char *cat = NULL;
struct ast_variable *var = NULL;
-
- if (!(cfg = ast_config_load("amd.conf"))) {
+ struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+
+ if (!(cfg = ast_config_load("amd.conf", config_flags))) {
ast_log(LOG_ERROR, "Configuration file amd.conf missing.\n");
return;
- }
+ } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+ return;
cat = ast_category_browse(cfg, NULL);
@@ -377,13 +379,13 @@
static int load_module(void)
{
- load_config();
+ load_config(0);
return ast_register_application(app, amd_exec, synopsis, descrip);
}
static int reload(void)
{
- load_config();
+ load_config(1);
return 0;
}
Modified: team/group/CDRfix5/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_directory.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_directory.c (original)
+++ team/group/CDRfix5/apps/app_directory.c Wed Aug 22 16:43:38 2007
@@ -364,9 +364,10 @@
const char *fullname;
const char *hidefromdir;
char tmp[100];
+ struct ast_flags config_flags = { 0 };
/* Load flat file config. */
- cfg = ast_config_load(VOICEMAIL_CONFIG);
+ cfg = ast_config_load(VOICEMAIL_CONFIG, config_flags);
if (!cfg) {
/* Loading config failed. */
@@ -597,6 +598,7 @@
int fromappvm = 0;
const char *dirintro;
char *parse;
+ struct ast_flags config_flags = { 0 };
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(vmcontext);
AST_APP_ARG(dialcontext);
@@ -630,7 +632,7 @@
return -1;
}
- ucfg = ast_config_load("users.conf");
+ ucfg = ast_config_load("users.conf", config_flags);
dirintro = ast_variable_retrieve(cfg, args.vmcontext, "directoryintro");
if (ast_strlen_zero(dirintro))
@@ -674,7 +676,8 @@
static int load_module(void)
{
#ifdef ODBC_STORAGE
- struct ast_config *cfg = ast_config_load(VOICEMAIL_CONFIG);
+ struct ast_flags config_flags = { 0 };
+ struct ast_config *cfg = ast_config_load(VOICEMAIL_CONFIG, config_flags);
const char *tmp;
if (cfg) {
Modified: team/group/CDRfix5/apps/app_festival.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_festival.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_festival.c (original)
+++ team/group/CDRfix5/apps/app_festival.c Wed Aug 22 16:43:38 2007
@@ -306,6 +306,7 @@
char *data;
struct ast_config *cfg;
char *newfestivalcommand;
+ struct ast_flags config_flags = { 0 };
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(text);
AST_APP_ARG(interrupt);
@@ -316,7 +317,7 @@
return -1;
}
- cfg = ast_config_load(FESTIVAL_CONFIG);
+ cfg = ast_config_load(FESTIVAL_CONFIG, config_flags);
if (!cfg) {
ast_log(LOG_WARNING, "No such configuration file %s\n", FESTIVAL_CONFIG);
return -1;
@@ -520,7 +521,8 @@
static int load_module(void)
{
- struct ast_config *cfg = ast_config_load(FESTIVAL_CONFIG);
+ struct ast_flags config_flags = { 0 };
+ struct ast_config *cfg = ast_config_load(FESTIVAL_CONFIG, config_flags);
if (!cfg) {
ast_log(LOG_WARNING, "No such configuration file %s\n", FESTIVAL_CONFIG);
return AST_MODULE_LOAD_DECLINE;
Modified: team/group/CDRfix5/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_followme.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_followme.c (original)
+++ team/group/CDRfix5/apps/app_followme.c Wed Aug 22 16:43:38 2007
@@ -275,7 +275,7 @@
}
/*! \brief Reload followme application module */
-static int reload_followme(void)
+static int reload_followme(int reload)
{
struct call_followme *f;
struct ast_config *cfg;
@@ -289,11 +289,13 @@
const char *takecallstr;
const char *declinecallstr;
const char *tmpstr;
-
- if (!(cfg = ast_config_load("followme.conf"))) {
+ struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+
+ if (!(cfg = ast_config_load("followme.conf", config_flags))) {
ast_log(LOG_WARNING, "No follow me config file (followme.conf), so no follow me\n");
return 0;
- }
+ } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+ return 0;
AST_RWLIST_WRLOCK(&followmes);
@@ -1011,7 +1013,7 @@
static int load_module(void)
{
- if(!reload_followme())
+ if(!reload_followme(0))
return AST_MODULE_LOAD_DECLINE;
return ast_register_application(app, app_exec, synopsis, descrip);
@@ -1019,7 +1021,7 @@
static int reload(void)
{
- reload_followme();
+ reload_followme(1);
return 0;
}
Modified: team/group/CDRfix5/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/CDRfix5/apps/app_meetme.c?view=diff&rev=80414&r1=80413&r2=80414
==============================================================================
--- team/group/CDRfix5/apps/app_meetme.c (original)
+++ team/group/CDRfix5/apps/app_meetme.c Wed Aug 22 16:43:38 2007
@@ -2457,6 +2457,7 @@
{
struct ast_config *cfg;
struct ast_variable *var;
+ struct ast_flags config_flags = { 0 };
struct ast_conference *cnf;
char *parse;
AST_DECLARE_APP_ARGS(args,
@@ -2494,7 +2495,7 @@
}
} else {
/* Check the config */
- cfg = ast_config_load(CONFIG_FILE_NAME);
+ cfg = ast_config_load(CONFIG_FILE_NAME, config_flags);
if (!cfg) {
ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME);
return NULL;
@@ -2601,7 +2602,7 @@
int allowretry = 0;
int retrycnt = 0;
struct ast_conference *cnf = NULL;
- struct ast_flags confflags = {0};
[... 12001 lines stripped ...]
More information about the asterisk-commits
mailing list