[asterisk-commits] branch bweschke/bug_6047 r14567 - in
/team/bweschke/bug_6047: ./ agi/ apps/ c...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Mar 23 15:41:09 MST 2006
Author: bweschke
Date: Thu Mar 23 16:40:58 2006
New Revision: 14567
URL: http://svn.digium.com/view/asterisk?rev=14567&view=rev
Log:
Merged revisions 12842-12843,12878,12893-12897,12923-12924,12926,12928,12960-12962,12995,13027,13067,13096,13132,13160,13162,13206,13238,13246,13280-13281,13323,13357,13393,13423,13453,13483,13513,13545-13546,13548-13549,13587,13621-13622,13627-13631,13633,13635,13637,13674-13675,13708-13710,13733,13738,13749,13787,13815,13850,13852,13887,13889,13926,13962,13967,14000-14001,14027,14053,14079,14110,14141,14188,14220,14235,14277,14279,14320,14351,14382,14425,14463,14470,14479,14508,14519,14521,14525 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r12842 | oej | 2006-03-14 01:09:57 -0600 (Tue, 14 Mar 2006) | 3 lines
- Formatting fix in musiconhold
- One extra doxygen comment in res_features
................
r12843 | oej | 2006-03-14 01:17:30 -0600 (Tue, 14 Mar 2006) | 5 lines
Small fixes to the messagecount function (while trying to understand
a bug report...)
- Remove unused variable "ret"
- Declare char* pointers in the block where they are used
................
r12878 | russell | 2006-03-14 10:00:06 -0600 (Tue, 14 Mar 2006) | 2 lines
fix build without SCHED_MULTITHREADED defined (issue #6719)
................
r12893 | russell | 2006-03-14 10:10:44 -0600 (Tue, 14 Mar 2006) | 2 lines
catch read/write errors and exit if they occur (issue #6721)
................
r12894 | russell | 2006-03-14 10:16:14 -0600 (Tue, 14 Mar 2006) | 2 lines
add a missing header to fix building with -Werror (issue #6717)
................
r12895 | russell | 2006-03-14 10:18:20 -0600 (Tue, 14 Mar 2006) | 2 lines
add header to fix building with -Werror (issue #6718)
................
r12896 | russell | 2006-03-14 10:49:34 -0600 (Tue, 14 Mar 2006) | 3 lines
add an option to cdr.conf that enables ending CDRs before executing
the "h" extension as opposed to afterwards (issue #6193)
................
r12897 | russell | 2006-03-14 10:57:35 -0600 (Tue, 14 Mar 2006) | 2 lines
clarify which global options are enabled by default
................
r12923 | russell | 2006-03-14 12:05:22 -0600 (Tue, 14 Mar 2006) | 2 lines
deprecate the mailboxdetail option and always use its behavior, instead (issue #6665)
................
r12924 | russell | 2006-03-14 12:11:35 -0600 (Tue, 14 Mar 2006) | 2 lines
add a couple of variables to clarify some code (issue #6700)
................
r12926 | russell | 2006-03-14 12:30:52 -0600 (Tue, 14 Mar 2006) | 11 lines
Merged revisions 12925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r12925 | russell | 2006-03-14 13:28:39 -0500 (Tue, 14 Mar 2006) | 3 lines
fix a problem with not loading realtime queue members by always reloading a
realtime queue from the database even if it is found in the list (issue #6680)
........
................
r12928 | russell | 2006-03-14 12:42:56 -0600 (Tue, 14 Mar 2006) | 11 lines
Merged revisions 12927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r12927 | russell | 2006-03-14 13:41:05 -0500 (Tue, 14 Mar 2006) | 3 lines
when using the G() option to Dial, fix sending the called channel to 1 priority
beyond what was specified (issue #6523)
........
................
r12960 | russell | 2006-03-14 13:06:25 -0600 (Tue, 14 Mar 2006) | 2 lines
update UPGRADE.txt to reflect the last change to chan_iax2
................
r12961 | russell | 2006-03-14 13:09:13 -0600 (Tue, 14 Mar 2006) | 2 lines
update to reflect conversion of the accountcode to use stringfields (issue #6722)
................
r12962 | russell | 2006-03-14 13:50:27 -0600 (Tue, 14 Mar 2006) | 3 lines
add a CLI command that allows conversion of files to other formats using
the Asterisk file format and codec translation modules (issue #6062)
................
r12995 | russell | 2006-03-14 18:29:25 -0600 (Tue, 14 Mar 2006) | 2 lines
remove calculations that always evaluate to zero, thanks Luigi!
................
r13027 | oej | 2006-03-15 07:06:48 -0600 (Wed, 15 Mar 2006) | 3 lines
Import of rev 13026 from 1.2 branch: Fix parameters to event: header
in SUBSCRIBE request
................
r13067 | tilghman | 2006-03-15 11:12:15 -0600 (Wed, 15 Mar 2006) | 2 lines
Bug 6316 - Add flag to not speak single user announcement
................
r13096 | tilghman | 2006-03-15 12:15:33 -0600 (Wed, 15 Mar 2006) | 10 lines
Merged revisions 13095 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13095 | tilghman | 2006-03-15 12:07:06 -0600 (Wed, 15 Mar 2006) | 2 lines
Reverting patch from bug 6667
........
................
r13132 | russell | 2006-03-15 15:59:08 -0600 (Wed, 15 Mar 2006) | 3 lines
don't calculate a duration if the CDR wasn't started, as it will result in a
totally bogus value. Thanks, Luigi! :)
................
r13160 | russell | 2006-03-15 16:04:49 -0600 (Wed, 15 Mar 2006) | 2 lines
Furthermore, set the disposition to FAILED if the CDR was never even started
................
r13162 | russell | 2006-03-15 16:24:11 -0600 (Wed, 15 Mar 2006) | 1 line
................
r13206 | oej | 2006-03-16 02:40:45 -0600 (Thu, 16 Mar 2006) | 2 lines
Importing "oops" fix from 1.2 branch.
................
r13238 | russell | 2006-03-16 11:46:15 -0600 (Thu, 16 Mar 2006) | 11 lines
Merged revisions 13237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13237 | russell | 2006-03-16 12:42:46 -0500 (Thu, 16 Mar 2006) | 3 lines
always use the callerid signalling method set in the zt_pvt strucutre as
opposed to the last one read from the config file (issue #6734, with mods)
........
................
r13246 | oej | 2006-03-16 12:01:08 -0600 (Thu, 16 Mar 2006) | 2 lines
Clarify documentation for "progressinband" - imported from 1.2
................
r13280 | russell | 2006-03-16 14:11:05 -0600 (Thu, 16 Mar 2006) | 2 lines
fix compiler warning on mac (issue #6737)
................
r13281 | tilghman | 2006-03-16 14:16:56 -0600 (Thu, 16 Mar 2006) | 10 lines
Merged revisions 13279 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13279 | tilghman | 2006-03-16 14:05:00 -0600 (Thu, 16 Mar 2006) | 2 lines
Bug 6737 - Fix compile warning on OS X
........
................
r13323 | oej | 2006-03-17 02:46:31 -0600 (Fri, 17 Mar 2006) | 3 lines
Add reference to examples for files and custom, too make it more obious
that you're required to read on... (hello xrobau)
................
r13357 | russell | 2006-03-17 15:39:36 -0600 (Fri, 17 Mar 2006) | 4 lines
move the definition of the mappings between extension states and their text
representation into pbx.c so that every file that includes pbx.h does not
unnecessarily get a copy of it
................
r13393 | russell | 2006-03-18 11:38:51 -0600 (Sat, 18 Mar 2006) | 3 lines
- remove some unnecessary extern keywords
- cleanups to doxygen formatted documentation
................
r13423 | russell | 2006-03-18 12:55:35 -0600 (Sat, 18 Mar 2006) | 2 lines
convert malloc+memset to ast_calloc
................
r13453 | russell | 2006-03-18 13:16:36 -0600 (Sat, 18 Mar 2006) | 2 lines
use ast_calloc instead of malloc+memset and remove some unnecessary initializations
................
r13483 | russell | 2006-03-18 18:38:02 -0600 (Sat, 18 Mar 2006) | 2 lines
suppress compiler warning on mac
................
r13513 | russell | 2006-03-18 19:39:14 -0600 (Sat, 18 Mar 2006) | 5 lines
When astmm is in use, define ast_malloc and friends to malloc, etc., so that
it doesn't report that all allocations are coming from utils.h. Also, add some
more information to the error message astmm reports when a memory allocation
failure occurs.
................
r13545 | oej | 2006-03-19 03:07:29 -0600 (Sun, 19 Mar 2006) | 3 lines
- change "regcontext" to "global_regcontext" to mark it as a global setting
- show regexten in "sip show peer <name"
................
r13546 | oej | 2006-03-19 03:08:57 -0600 (Sun, 19 Mar 2006) | 2 lines
- Remove comment about non-existing XML format ;-)
................
r13548 | oej | 2006-03-19 03:32:36 -0600 (Sun, 19 Mar 2006) | 2 lines
Import revision 13547 from branch 1.2 - reset global_rtautoclear at reload
................
r13549 | oej | 2006-03-19 03:35:11 -0600 (Sun, 19 Mar 2006) | 2 lines
Fix reference to README files
................
r13587 | russell | 2006-03-19 04:11:29 -0600 (Sun, 19 Mar 2006) | 12 lines
Merged revisions 13550 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13550 | russell | 2006-03-19 04:59:55 -0500 (Sun, 19 Mar 2006) | 4 lines
revert the change made in revision 12927 in favor of keeping the original
behavior of the option. The documentation has now been updated to reflect
the actual behavior. (issue #6523)
........
................
r13621 | russell | 2006-03-19 09:42:49 -0600 (Sun, 19 Mar 2006) | 2 lines
convert a couple uses of strlen() to use ast_strlen_zero()
................
r13622 | russell | 2006-03-19 09:53:40 -0600 (Sun, 19 Mar 2006) | 2 lines
convert a few more uses of strlen where ast_strlen_zero should be used
................
r13627 | oej | 2006-03-19 14:23:16 -0600 (Sun, 19 Mar 2006) | 2 lines
- Doxygen fixes.
................
r13628 | russell | 2006-03-19 15:01:04 -0600 (Sun, 19 Mar 2006) | 3 lines
fix memory leak due to not freeing the channel's string fields in
ast_channel_destroy() (issue #6746)
................
r13629 | russell | 2006-03-19 15:28:55 -0600 (Sun, 19 Mar 2006) | 2 lines
fix the return value for the provided unsetenv() for Solaris
................
r13630 | russell | 2006-03-19 15:40:42 -0600 (Sun, 19 Mar 2006) | 2 lines
fix the build of eagi-test on Solaris in combination with astmm
................
r13631 | russell | 2006-03-19 20:00:30 -0600 (Sun, 19 Mar 2006) | 3 lines
fix astmm on sparc or any other architecture that doesn't allow unaligned
memory access
................
r13633 | crichter | 2006-03-20 04:00:34 -0600 (Mon, 20 Mar 2006) | 1 line
these traceing option do not exist anymore
................
r13635 | oej | 2006-03-20 11:39:14 -0600 (Mon, 20 Mar 2006) | 2 lines
Don't overwrite ANI if it's already sent with IES (imported from 1.2 branch)
................
r13637 | crichter | 2006-03-20 12:04:05 -0600 (Mon, 20 Mar 2006) | 1 line
removed dynamic switching from transparent to hdlc mode. Instead we've got a config option hdlc=yes now which enables the hdlc controller for a data call
................
r13674 | bweschke | 2006-03-20 15:08:10 -0600 (Mon, 20 Mar 2006) | 3 lines
Set correct SVN properties on these files.
................
r13675 | bweschke | 2006-03-20 15:25:50 -0600 (Mon, 20 Mar 2006) | 3 lines
Fix more svn properties on files that need it.
................
r13708 | tilghman | 2006-03-20 23:30:32 -0600 (Mon, 20 Mar 2006) | 10 lines
Merged revisions 13707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13707 | tilghman | 2006-03-20 23:27:33 -0600 (Mon, 20 Mar 2006) | 2 lines
Do away with some warnings and fix some indentation
........
................
r13709 | tilghman | 2006-03-20 23:48:17 -0600 (Mon, 20 Mar 2006) | 2 lines
Bug 6745 - Fix for ranges that wrap around the ends
................
r13710 | tilghman | 2006-03-20 23:54:04 -0600 (Mon, 20 Mar 2006) | 2 lines
Bug 6699 - Fix for ENUMLOOKUP
................
r13733 | tilghman | 2006-03-21 00:03:58 -0600 (Tue, 21 Mar 2006) | 2 lines
Meetme file is parsed with comma-delimiters, not vertical bars
................
r13738 | russell | 2006-03-21 00:04:49 -0600 (Tue, 21 Mar 2006) | 2 lines
add indications for Malaysia (issue #6758)
................
r13749 | tilghman | 2006-03-21 00:28:19 -0600 (Tue, 21 Mar 2006) | 10 lines
Merged revisions 13748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13748 | tilghman | 2006-03-21 00:24:56 -0600 (Tue, 21 Mar 2006) | 2 lines
Bug 6714 - Workaround to avoid retrieving incomplete voicemail message
........
................
r13787 | crichter | 2006-03-21 03:47:51 -0600 (Tue, 21 Mar 2006) | 1 line
removed unneeded debugs in level=0
................
r13815 | russell | 2006-03-21 08:23:06 -0600 (Tue, 21 Mar 2006) | 13 lines
This was from issue #6765
Merged revisions 13814 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13814 | russell | 2006-03-21 09:20:28 -0500 (Tue, 21 Mar 2006) | 3 lines
re-add the Account parameter to the sample call file since it's not really
deprecated since the CDR function is no longer built in
........
................
r13850 | russell | 2006-03-21 09:12:41 -0600 (Tue, 21 Mar 2006) | 2 lines
spelling and formatting fixes (issue #6760)
................
r13852 | russell | 2006-03-21 09:55:38 -0600 (Tue, 21 Mar 2006) | 10 lines
Merged revisions 13851 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13851 | russell | 2006-03-21 10:53:27 -0500 (Tue, 21 Mar 2006) | 2 lines
don't add conference participant if the user hangs up while recording their name (issue #6661)
........
................
r13887 | russell | 2006-03-21 10:18:54 -0600 (Tue, 21 Mar 2006) | 2 lines
add note about phonetic sounds being removed from asterisk-sounds
................
r13889 | russell | 2006-03-21 10:24:19 -0600 (Tue, 21 Mar 2006) | 10 lines
Merged revisions 13888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13888 | russell | 2006-03-21 11:22:16 -0500 (Tue, 21 Mar 2006) | 2 lines
fix spelling of whiskey
........
................
r13926 | russell | 2006-03-21 11:49:50 -0600 (Tue, 21 Mar 2006) | 1 line
................
r13962 | russell | 2006-03-21 12:22:38 -0600 (Tue, 21 Mar 2006) | 11 lines
Merged revisions 13961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13961 | russell | 2006-03-21 13:21:47 -0500 (Tue, 21 Mar 2006) | 3 lines
fix crash when using the ParkAndAnnounce application. When using this application,
there will be no peer channel to play the parking announcement to. (issue #6756)
........
................
r13967 | russell | 2006-03-21 13:00:26 -0600 (Tue, 21 Mar 2006) | 11 lines
Merged revisions 13964 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r13964 | russell | 2006-03-21 13:59:29 -0500 (Tue, 21 Mar 2006) | 3 lines
add a note explaining how to set the DYNAMIC_FEATURES variable to allow the use
of custom features (issue #6747)
........
................
r14000 | russell | 2006-03-21 13:19:35 -0600 (Tue, 21 Mar 2006) | 2 lines
update LOCAL_USER_ADD to use ast_calloc
................
r14001 | mattf | 2006-03-21 13:28:12 -0600 (Tue, 21 Mar 2006) | 1 line
................
r14027 | russell | 2006-03-21 14:45:29 -0600 (Tue, 21 Mar 2006) | 3 lines
add a CLI command that allows converting files to other formats using
the Asterisk file format and codec translator modules (issue #6062)
................
r14053 | russell | 2006-03-21 15:52:30 -0600 (Tue, 21 Mar 2006) | 2 lines
update enum documentation to reflect recent changes to the ENUMLOOKUP function (issue #6513)
................
r14079 | jdixon | 2006-03-21 16:31:36 -0600 (Tue, 21 Mar 2006) | 3 lines
Added separate outsignalling specification, and fixed FEATDMF to allow for
international inbound calls.
................
r14110 | oej | 2006-03-22 02:00:32 -0600 (Wed, 22 Mar 2006) | 2 lines
Issue #6759, generate warning when refusing connection requiring unsupported SIP extensions
................
r14141 | oej | 2006-03-22 03:14:42 -0600 (Wed, 22 Mar 2006) | 2 lines
Issue #6766 - Make ;user=phone work again - imported from 1.2
................
r14188 | north | 2006-03-22 14:45:00 -0600 (Wed, 22 Mar 2006) | 2 lines
More whitespace and typo fixes for chan_skinny - yay!
................
r14220 | file | 2006-03-22 15:05:24 -0600 (Wed, 22 Mar 2006) | 2 lines
Issue #6780 - ast_pbx_outgoing_cdr_failed description fix. (Reported and fixed by casper) - imported from 1.2
................
r14235 | file | 2006-03-22 15:43:38 -0600 (Wed, 22 Mar 2006) | 10 lines
Merged revisions 14234 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14234 | file | 2006-03-22 17:38:32 -0400 (Wed, 22 Mar 2006) | 2 lines
Issue #5918 - Disposition showing FAILED even though call is answered successfully (Reported by tracinet)
........
................
r14277 | file | 2006-03-22 16:27:11 -0600 (Wed, 22 Mar 2006) | 10 lines
Merged revisions 14275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14275 | file | 2006-03-22 18:13:30 -0400 (Wed, 22 Mar 2006) | 2 lines
Issue #6781 - Verbose levels not enforced in app_voicemail (Reported by flobi)
........
................
r14279 | file | 2006-03-22 16:28:36 -0600 (Wed, 22 Mar 2006) | 10 lines
Merged revisions 14276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14276 | file | 2006-03-22 18:18:32 -0400 (Wed, 22 Mar 2006) | 2 lines
Fix a minor code issue
........
................
r14320 | rizzo | 2006-03-23 06:47:50 -0600 (Thu, 23 Mar 2006) | 6 lines
Fix a compile problem on FreeBSD for a missing header.
In this specific case the problem triggered on app_amd.c,
but it keeps coming out from time to time so it is better
to fix it in a more central place.
................
r14351 | rizzo | 2006-03-23 07:39:36 -0600 (Thu, 23 Mar 2006) | 4 lines
remove duplicate CFLAGS and SOLINK definitions that are
already in the top level Makefile
................
r14382 | rizzo | 2006-03-23 08:28:16 -0600 (Thu, 23 Mar 2006) | 19 lines
Replace ast_say_* functionn with function pointers, so that modules
can override them.
On passing, fix a potential problem in the top level Makefile:
if a static library is not referenced by any of the core objects,
it is not linked in the main program, and will not be available
to modules, which leads to failure at runtime when the modules
are loaded.
This is the case of stdtime/localtime.o, which supplies some core
symbolx, but is only linked in as a library. Fix the problem by
linking in the object.
NOTE: this is intended as a temporary aid to replace the
existing say.c with a newer implementation. Once the
task is completed, we may decide whether or not the ast_say*()
functions should be pluggable or not and possibly revert
part of this change.
................
r14425 | oej | 2006-03-23 13:58:32 -0600 (Thu, 23 Mar 2006) | 2 lines
- In response to asterisk-users discussion - show which peers in "sip show peers" and "sip show peer" that are cached realtime peers.
................
r14463 | russell | 2006-03-23 14:15:01 -0600 (Thu, 23 Mar 2006) | 10 lines
Merged revisions 14462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14462 | russell | 2006-03-23 15:13:48 -0500 (Thu, 23 Mar 2006) | 2 lines
don't crash when asked to read from a file that doesn't exist (issue #6786)
........
................
r14470 | bweschke | 2006-03-23 14:48:08 -0600 (Thu, 23 Mar 2006) | 11 lines
Merged revisions 14467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14467 | bweschke | 2006-03-23 14:43:05 -0600 (Thu, 23 Mar 2006) | 3 lines
Bug #5884 - fix a possible race state in app_meetme when a channel has gone away and we are reading continuously for more frames. (mneuhauser)
........
................
r14479 | kpfleming | 2006-03-23 15:01:19 -0600 (Thu, 23 Mar 2006) | 2 lines
don't wrap this in ifdef... using va_start is safe on all platforms :-)
................
r14508 | kpfleming | 2006-03-23 15:06:26 -0600 (Thu, 23 Mar 2006) | 2 lines
correct typo
................
r14519 | kpfleming | 2006-03-23 15:16:46 -0600 (Thu, 23 Mar 2006) | 2 lines
ensure global variables lock is held during 'show globals' CLI command
................
r14521 | mattf | 2006-03-23 15:41:23 -0600 (Thu, 23 Mar 2006) | 2 lines
Allow channels to be moved if channel change is requested in SETUP_ACK, also add a WAY cool new field to the nsf option
................
r14525 | file | 2006-03-23 16:00:11 -0600 (Thu, 23 Mar 2006) | 10 lines
Merged revisions 14523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r14523 | file | 2006-03-23 17:51:50 -0400 (Thu, 23 Mar 2006) | 2 lines
Issue #6764 - Return BUSY signal when other party is busy at Attended Transfer (Reported by mnachev)
........
................
Added:
team/bweschke/bug_6047/res/res_convert.c (props changed)
- copied unchanged from r14525, trunk/res/res_convert.c
Modified:
team/bweschke/bug_6047/ (props changed)
team/bweschke/bug_6047/Makefile
team/bweschke/bug_6047/UPGRADE.txt
team/bweschke/bug_6047/agi/Makefile
team/bweschke/bug_6047/apps/app_dial.c
team/bweschke/bug_6047/apps/app_meetme.c
team/bweschke/bug_6047/apps/app_queue.c
team/bweschke/bug_6047/apps/app_readfile.c
team/bweschke/bug_6047/apps/app_rpt.c
team/bweschke/bug_6047/apps/app_voicemail.c
team/bweschke/bug_6047/ast_expr2.c
team/bweschke/bug_6047/ast_expr2.h
team/bweschke/bug_6047/ast_expr2.y
team/bweschke/bug_6047/asterisk.c
team/bweschke/bug_6047/astmm.c
team/bweschke/bug_6047/cdr.c
team/bweschke/bug_6047/cdr/Makefile
team/bweschke/bug_6047/cdr/cdr_sqlite.c
team/bweschke/bug_6047/channel.c
team/bweschke/bug_6047/channels/chan_iax2.c
team/bweschke/bug_6047/channels/chan_misdn.c
team/bweschke/bug_6047/channels/chan_sip.c
team/bweschke/bug_6047/channels/chan_skinny.c
team/bweschke/bug_6047/channels/chan_zap.c
team/bweschke/bug_6047/channels/misdn/chan_misdn_config.h
team/bweschke/bug_6047/channels/misdn/isdn_lib.c
team/bweschke/bug_6047/channels/misdn_config.c
team/bweschke/bug_6047/codecs/Makefile
team/bweschke/bug_6047/codecs/gsm/libgsm.vcproj (props changed)
team/bweschke/bug_6047/codecs/ilbc/libilbc.vcproj (props changed)
team/bweschke/bug_6047/codecs/lpc10/liblpc10.vcproj (props changed)
team/bweschke/bug_6047/configs/cdr.conf.sample
team/bweschke/bug_6047/configs/features.conf.sample
team/bweschke/bug_6047/configs/iax.conf.sample
team/bweschke/bug_6047/configs/indications.conf.sample
team/bweschke/bug_6047/configs/misdn.conf.sample
team/bweschke/bug_6047/configs/musiconhold.conf.sample
team/bweschke/bug_6047/configs/sip.conf.sample
team/bweschke/bug_6047/configs/zapata.conf.sample
team/bweschke/bug_6047/contrib/utils/rawplayer.c
team/bweschke/bug_6047/db.c
team/bweschke/bug_6047/doc/enum.txt
team/bweschke/bug_6047/editline/term.c
team/bweschke/bug_6047/funcs/func_enum.c
team/bweschke/bug_6047/image.c
team/bweschke/bug_6047/include/asterisk/cdr.h
team/bweschke/bug_6047/include/asterisk/channel.h
team/bweschke/bug_6047/include/asterisk/compat.h
team/bweschke/bug_6047/include/asterisk/module.h
team/bweschke/bug_6047/include/asterisk/options.h
team/bweschke/bug_6047/include/asterisk/pbx.h
team/bweschke/bug_6047/include/asterisk/say.h
team/bweschke/bug_6047/include/asterisk/utils.h
team/bweschke/bug_6047/include/solaris-compat/compat.h
team/bweschke/bug_6047/pbx.c
team/bweschke/bug_6047/res/res_features.c
team/bweschke/bug_6047/res/res_musiconhold.c
team/bweschke/bug_6047/rtp.c
team/bweschke/bug_6047/sample.call
team/bweschke/bug_6047/say.c
team/bweschke/bug_6047/sched.c
team/bweschke/bug_6047/sounds.txt
team/bweschke/bug_6047/strcompat.c
team/bweschke/bug_6047/utils.c
Propchange: team/bweschke/bug_6047/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/bweschke/bug_6047/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/bweschke/bug_6047/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 23 16:40:58 2006
@@ -1,1 +1,1 @@
-/trunk:1-12838
+/trunk:1-14566
Modified: team/bweschke/bug_6047/Makefile
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/Makefile?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/Makefile (original)
+++ team/bweschke/bug_6047/Makefile Thu Mar 23 16:40:58 2006
@@ -357,7 +357,7 @@
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
- translate.o file.o say.o pbx.o cli.o md5.o term.o \
+ translate.o file.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
@@ -365,6 +365,15 @@
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
cryptostub.o sha1.o
+
+# we need to link in the objects statically, not as a library, because
+# otherwise modules will not have them available if none of the static
+# objects use it.
+OBJS+= stdtime/localtime.o
+
+# At the moment say.o is an optional component which can be overridden
+# by a module.
+OBJS+= say.o
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
OBJS+= poll.o
Modified: team/bweschke/bug_6047/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/UPGRADE.txt?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/UPGRADE.txt (original)
+++ team/bweschke/bug_6047/UPGRADE.txt Thu Mar 23 16:40:58 2006
@@ -53,6 +53,15 @@
* The ENUMLOOKUP() function with the 'c' option (for counting the number of records),
but the lookup fails to match any records, the returned value will now be "0" instead of blank.
+The IAX2 channel:
+
+* The "mailboxdetail" option has been deprecated. Previously, if this option
+ was not enabled, the 2 byte MSGCOUNT information element would be set to all
+ 1's to indicate there there is some number of messages waiting. With this
+ option enabled, the number of new messages were placed in one byte and the
+ number of old messages are placed in the other. This is now the default
+ (and the only) behavior.
+
The SIP channel:
* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
@@ -66,3 +75,11 @@
ASTETCDIR /usr/local/etc/asterisk
ASTBINDIR /usr/local/bin/asterisk
ASTSBINDIR /usr/local/sbin/asterisk
+
+Sounds:
+
+* The phonetic sounds directory has been removed from the asterisk-sounds package
+ because they are now included directly in Asterisk. However, it is important to
+ note that the phonetic sounds that existed in asterisk-sounds used a different
+ naming convention than the sounds in Asterisk. For example, instead of alpha.gsm
+ and bravo.gsm, Asterisk has a_p.gsm and b_p.gsm.
Modified: team/bweschke/bug_6047/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/agi/Makefile?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/agi/Makefile (original)
+++ team/bweschke/bug_6047/agi/Makefile Thu Mar 23 16:40:58 2006
@@ -13,15 +13,11 @@
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
-CFLAGS+=
+CFLAGS+=-DNO_AST_MM
LIBS=
ifeq ($(OSARCH),SunOS)
LIBS=-lsocket -lnsl ../strcompat.o
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
all: depend $(AGIS)
Modified: team/bweschke/bug_6047/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/apps/app_dial.c?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/apps/app_dial.c (original)
+++ team/bweschke/bug_6047/apps/app_dial.c Thu Mar 23 16:40:58 2006
@@ -112,9 +112,10 @@
" other than the number assigned to the caller.\n"
" g - Proceed with dialplan execution at the current extension if the\n"
" destination channel hangs up.\n"
-" G(context^exten^pri) - If the call is answered, transfer both parties to\n"
-" the specified priority. Optionally, an extension, or extension and\n"
-" context may be specified. Otherwise, the current extension is used.\n"
+" G(context^exten^pri) - If the call is answered, transfer the calling party to\n"
+" the specified priority and the called party to the specified priority+1.\n"
+" Optionally, an extension, or extension and context may be specified. \n"
+" Otherwise, the current extension is used.\n"
" h - Allow the called party to hang up by sending the '*' DTMF digit.\n"
" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
" j - Jump to priority n+101 if all of the requested channels were busy.\n"
Modified: team/bweschke/bug_6047/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/apps/app_meetme.c?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/apps/app_meetme.c (original)
+++ team/bweschke/bug_6047/apps/app_meetme.c Thu Mar 23 16:40:58 2006
@@ -71,18 +71,18 @@
static const char *synopsis3 = "MeetMe conference Administration";
static const char *descrip =
-" MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe conference.\n"
-"If the conference number is omitted, the user will be prompted to enter\n"
-"one. \n"
-"User can exit the conference by hangup, or if the 'p' option is specified, by pressing '#'.\n"
+" MeetMe([confno][,[options][,pin]]): Enters the user into a specified MeetMe\n"
+"conference. If the conference number is omitted, the user will be prompted\n"
+"to enter one. User can exit the conference by hangup, or if the 'p' option\n"
+"is specified, by pressing '#'.\n"
"Please note: A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING TO WORK!\n\n"
"The option string may contain zero or more of the following characters:\n"
" 'a' -- set admin mode\n"
" 'A' -- set marked mode\n"
" 'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n"
-" Default: conf-background.agi\n"
-" (Note: This does not work with non-Zap channels in the same conference)\n"
+" Default: conf-background.agi (Note: This does not work with\n"
+" non-Zap channels in the same conference)\n"
" 'c' -- announce user(s) count on joining a conference\n"
" 'd' -- dynamically add conference\n"
" 'D' -- dynamically add conference, prompting for a PIN\n"
@@ -91,31 +91,34 @@
" 'i' -- announce user join/leave\n"
" 'm' -- set monitor only mode (Listen only, no talking)\n"
" 'M' -- enable music on hold when the conference has a single caller\n"
+" 'o' -- set talker optimization - treats talkers who aren't speaking as\n"
+" being muted, meaning (a) No encode is done on transmission and\n"
+" (b) Received audio that is not registered as talking is omitted\n"
+" causing no buildup in background noise\n"
" 'p' -- allow user to exit the conference by pressing '#'\n"
" 'P' -- always prompt for the pin even if it is specified\n"
" 'q' -- quiet mode (don't play enter/leave sounds)\n"
" 'r' -- Record conference (records as ${MEETME_RECORDINGFILE}\n"
" using format ${MEETME_RECORDINGFORMAT}). Default filename is\n"
-" meetme-conf-rec-${CONFNO}-${UNIQUEID} and the default format is wav.\n"
+" meetme-conf-rec-${CONFNO}-${UNIQUEID} and the default format is\n"
+" wav.\n"
" 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
" 't' -- set talk only mode. (Talk only, no listening)\n"
" 'T' -- set talker detection (sent to manager interface and meetme list)\n"
-" 'o' -- set talker optimization - treats talkers who aren't speaking as\n"
-" being muted, meaning (a) No encode is done on transmission and\n"
-" (b) Received audio that is not registered as talking is omitted\n"
-" causing no buildup in background noise\n"
" 'v' -- video mode\n"
" 'w' -- wait until the marked user enters the conference\n"
" 'x' -- close the conference when last marked user exits\n"
" 'X' -- allow user to exit the conference by entering a valid single\n"
" digit extension ${MEETME_EXIT_CONTEXT} or the current context\n"
-" if that variable is not defined.\n";
+" if that variable is not defined.\n"
+" '1' -- do not play message when first person enters\n";
static const char *descrip2 =
" MeetMeCount(confno[|var]): Plays back the number of users in the specified\n"
"MeetMe conference. If var is specified, playback will be skipped and the value\n"
-"will be returned in the variable. Upon app completion, MeetMeCount will hangup the\n"
-"channel, unless priority n+1 exists, in which case priority progress will continue.\n"
+"will be returned in the variable. Upon app completion, MeetMeCount will hangup\n"
+"the channel, unless priority n+1 exists, in which case priority progress will\n"
+"continue.\n"
"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n";
static const char *descrip3 =
@@ -245,31 +248,33 @@
#define CONFFLAG_ALWAYSPROMPT (1 << 21)
#define CONFFLAG_ANNOUNCEUSERCOUNT (1 << 22) /* If set, when user joins the conference, they will be told the number of users that are already in */
#define CONFFLAG_OPTIMIZETALKER (1 << 23) /* If set, treats talking users as muted users */
+#define CONFFLAG_NOONLYPERSON (1 << 24) /* If set, won't speak the extra prompt when the first person enters the conference */
AST_APP_OPTIONS(meetme_opts, {
+ AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
AST_APP_OPTION('a', CONFFLAG_ADMIN ),
+ AST_APP_OPTION('b', CONFFLAG_AGI ),
AST_APP_OPTION('c', CONFFLAG_ANNOUNCEUSERCOUNT ),
+ AST_APP_OPTION('D', CONFFLAG_DYNAMICPIN ),
+ AST_APP_OPTION('d', CONFFLAG_DYNAMIC ),
+ AST_APP_OPTION('E', CONFFLAG_EMPTYNOPIN ),
+ AST_APP_OPTION('e', CONFFLAG_EMPTY ),
+ AST_APP_OPTION('i', CONFFLAG_INTROUSER ),
+ AST_APP_OPTION('M', CONFFLAG_MOH ),
+ AST_APP_OPTION('m', CONFFLAG_MONITOR ),
+ AST_APP_OPTION('o', CONFFLAG_OPTIMIZETALKER ),
+ AST_APP_OPTION('P', CONFFLAG_ALWAYSPROMPT ),
+ AST_APP_OPTION('p', CONFFLAG_POUNDEXIT ),
+ AST_APP_OPTION('q', CONFFLAG_QUIET ),
+ AST_APP_OPTION('r', CONFFLAG_RECORDCONF ),
+ AST_APP_OPTION('s', CONFFLAG_STARMENU ),
AST_APP_OPTION('T', CONFFLAG_MONITORTALKER ),
- AST_APP_OPTION('o', CONFFLAG_OPTIMIZETALKER ),
- AST_APP_OPTION('i', CONFFLAG_INTROUSER ),
- AST_APP_OPTION('m', CONFFLAG_MONITOR ),
- AST_APP_OPTION('p', CONFFLAG_POUNDEXIT ),
- AST_APP_OPTION('s', CONFFLAG_STARMENU ),
AST_APP_OPTION('t', CONFFLAG_TALKER ),
- AST_APP_OPTION('q', CONFFLAG_QUIET ),
- AST_APP_OPTION('M', CONFFLAG_MOH ),
+ AST_APP_OPTION('w', CONFFLAG_WAITMARKED ),
+ AST_APP_OPTION('X', CONFFLAG_EXIT_CONTEXT ),
AST_APP_OPTION('x', CONFFLAG_MARKEDEXIT ),
- AST_APP_OPTION('X', CONFFLAG_EXIT_CONTEXT ),
- AST_APP_OPTION('A', CONFFLAG_MARKEDUSER ),
- AST_APP_OPTION('b', CONFFLAG_AGI ),
- AST_APP_OPTION('w', CONFFLAG_WAITMARKED ),
- AST_APP_OPTION('r', CONFFLAG_RECORDCONF ),
- AST_APP_OPTION('d', CONFFLAG_DYNAMIC ),
- AST_APP_OPTION('D', CONFFLAG_DYNAMICPIN ),
- AST_APP_OPTION('e', CONFFLAG_EMPTY ),
- AST_APP_OPTION('E', CONFFLAG_EMPTYNOPIN ),
- AST_APP_OPTION('P', CONFFLAG_ALWAYSPROMPT ),
+ AST_APP_OPTION('1', CONFFLAG_NOONLYPERSON ),
});
static char *istalking(int x)
@@ -774,6 +779,8 @@
f = ast_read(chan);
if (f)
ast_frfree(f);
+ else /* channel was hung up or something else happened */
+ break;
}
}
@@ -952,10 +959,12 @@
snprintf(user->namerecloc, sizeof(user->namerecloc),
"%s/meetme/meetme-username-%s-%d", ast_config_AST_SPOOL_DIR,
conf->confno, user->user_no);
- ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
- }
-
- if (!(confflags & CONFFLAG_QUIET)) {
+ res = ast_record_review(chan, "vm-rec-name", user->namerecloc, 10, "sln", &duration, NULL);
+ if (res == -1)
+ goto outrun;
+ }
+
+ if ( !(confflags & (CONFFLAG_QUIET | CONFFLAG_NOONLYPERSON)) ) {
if (conf->users == 1 && !(confflags & CONFFLAG_WAITMARKED))
if (!ast_streamfile(chan, "conf-onlyperson", chan->language))
ast_waitstream(chan, "");
@@ -1825,28 +1834,20 @@
ast_log(LOG_WARNING, "No %s file :(\n", CONFIG_FILE_NAME);
return NULL;
}
- var = ast_variable_browse(cfg, "rooms");
- for (; var; var = var->next) {
+ for (var = ast_variable_browse(cfg, "rooms"); var; var = var->next) {
if (strcasecmp(var->name, "conf"))
continue;
if (!(parse = ast_strdupa(var->value)))
return NULL;
- AST_STANDARD_APP_ARGS(args, parse);
+ AST_NONSTANDARD_APP_ARGS(args, parse, ',');
if (!strcasecmp(args.confno, confno)) {
/* Bingo it's a valid conference */
- if (args.pin) {
- if (args.pinadmin)
- cnf = build_conf(args.confno, args.pin, args.pinadmin, make, dynamic, refcount);
- else
- cnf = build_conf(args.confno, args.pin, "", make, dynamic, refcount);
- } else {
- if (args.pinadmin)
- cnf = build_conf(args.confno, "", args.pinadmin, make, dynamic, refcount);
- else
- cnf = build_conf(args.confno, "", "", make, dynamic, refcount);
- }
+ cnf = build_conf(args.confno,
+ ast_strlen_zero(args.pin) ? "" : args.pin,
+ ast_strlen_zero(args.pinadmin) ? "" : args.pinadmin,
+ make, dynamic, refcount);
break;
}
}
@@ -2021,7 +2022,7 @@
AST_LIST_UNLOCK(&confs);
if (!found) {
/* At this point, we have a confno_tmp (static conference) that is empty */
- if ((empty_no_pin && ((!stringp) || (stringp && (stringp[0] == '\0')))) || (!empty_no_pin)) {
+ if ((empty_no_pin && ast_strlen_zero(stringp)) || (!empty_no_pin)) {
/* Case 1: empty_no_pin and pin is nonexistent (NULL)
* Case 2: empty_no_pin and pin is blank (but not NULL)
* Case 3: not empty_no_pin
Modified: team/bweschke/bug_6047/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/apps/app_queue.c?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/apps/app_queue.c (original)
+++ team/bweschke/bug_6047/apps/app_queue.c Thu Mar 23 16:40:58 2006
@@ -952,7 +952,7 @@
}
AST_LIST_UNLOCK(&queues);
- if (!q) {
+ if (!q || q->realtime) {
/*! \note Load from realtime before taking the global qlock, to avoid blocking all
queue operations while waiting for the DB.
Modified: team/bweschke/bug_6047/apps/app_readfile.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/bug_6047/apps/app_readfile.c?rev=14567&r1=14566&r2=14567&view=diff
==============================================================================
--- team/bweschke/bug_6047/apps/app_readfile.c (original)
+++ team/bweschke/bug_6047/apps/app_readfile.c Thu Mar 23 16:40:58 2006
@@ -92,15 +92,16 @@
}
}
- returnvar = ast_read_textfile(file);
- if(len > 0){
- if(len < strlen(returnvar))
- returnvar[len]='\0';
- else
- ast_log(LOG_WARNING,"%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar));
+ if ((returnvar = ast_read_textfile(file))) {
+ if (len > 0) {
+ if (len < strlen(returnvar))
+ returnvar[len]='\0';
[... 7169 lines stripped ...]
More information about the asterisk-commits
mailing list