[svn-commits] nadi: branch group/trunk-cm-csel-hash r47963 - in
/team/group/trunk-cm-csel-h...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Nov 23 05:57:10 MST 2006
Author: nadi
Date: Thu Nov 23 06:57:09 2006
New Revision: 47963
URL: http://svn.digium.com/view/asterisk?view=rev&rev=47963
Log:
Merged revisions 47727,47731-47732,47734,47737,47740,47746-47747,47749,47752,47756,47759,47763,47765,47769-47772,47775,47778-47779,47783-47784,47787-47790,47801,47806,47813-47815,47817-47818,47821-47822,47824,47827,47829,47834-47836,47844,47846-47847,47851,47853-47854,47857,47861,47866,47880-47881,47893,47898,47912,47923,47933-47935,47945,47957,47960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r47727 | rizzo | 2006-11-16 15:21:30 +0100 (Do, 16 Nov 2006) | 9 lines
make kevin (and 64 bit machines) happy and
remove a cast from char* to int in handling the return
values from new-style handlers.
On passing, note that main/loader.c::ast_load_resource() always return 0
so errors are not propagated up. I am not sure this is the intended
behaviour.
................
r47731 | rizzo | 2006-11-16 15:41:28 +0100 (Do, 16 Nov 2006) | 6 lines
use atomic instructions to update the inuse counters
for CLI entriesC. The lock is not protecting this field.
I wonder if the field should be declared 'volatile' as well.
................
r47732 | rizzo | 2006-11-16 15:58:24 +0100 (Do, 16 Nov 2006) | 3 lines
reduce indentation on a large function.
................
r47734 | oej | 2006-11-16 16:12:30 +0100 (Do, 16 Nov 2006) | 3 lines
- CANCEL never uses authentication
- Add docs on canreinvite
................
r47737 | oej | 2006-11-16 16:22:24 +0100 (Do, 16 Nov 2006) | 2 lines
Block upgrade to UPGRADE
................
r47740 | oej | 2006-11-16 17:02:41 +0100 (Do, 16 Nov 2006) | 8 lines
Merging implementation of invite states from my "invitestate" branch for 1.2. This is a bit more
clean platform for the handling of BYE/CANCEL than what we had. It might also need to changes
in other parts of the code, since we know the state of the INVITE transaction.
Please observe that this is is not dialog states at all, this is INVITE transaction states.
Hello Michael Proctor, and thank you! :-)
................
r47746 | oej | 2006-11-16 18:15:42 +0100 (Do, 16 Nov 2006) | 2 lines
Merging a fix that was already fixed.
................
r47747 | file | 2006-11-16 18:17:16 +0100 (Do, 16 Nov 2006) | 2 lines
Be gone 1.2 props!
................
r47749 | file | 2006-11-16 18:53:58 +0100 (Do, 16 Nov 2006) | 10 lines
Merged revisions 47748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47748 | file | 2006-11-16 12:52:48 -0500 (Thu, 16 Nov 2006) | 2 lines
Don't unreference the SLA object if there is no SLA object in the devicestate callback. (issue #8354 reported by loloski)
........
................
r47752 | file | 2006-11-16 19:32:27 +0100 (Do, 16 Nov 2006) | 18 lines
Merged revisions 47751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47751 | file | 2006-11-16 13:29:12 -0500 (Thu, 16 Nov 2006) | 10 lines
Merged revisions 47750 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47750 | file | 2006-11-16 13:26:50 -0500 (Thu, 16 Nov 2006) | 2 lines
Because of the way chan_local is written we should be extra careful and make sure our callback functions have a tech_pvt. (issue #8275 reported by mflorell)
........
................
................
r47756 | oej | 2006-11-16 20:29:28 +0100 (Do, 16 Nov 2006) | 3 lines
Make it possible to enable/disable onhold tracking, in order to make life easier
for realtime users.
................
r47759 | kpfleming | 2006-11-16 21:10:59 +0100 (Do, 16 Nov 2006) | 10 lines
Merged revisions 47758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47758 | kpfleming | 2006-11-16 14:09:10 -0600 (Thu, 16 Nov 2006) | 2 lines
check for pre-1.4 versions of Zaptel and abort the configure script if found with an appropriate error message
........
................
r47763 | file | 2006-11-16 21:32:17 +0100 (Do, 16 Nov 2006) | 16 lines
Blocked revisions 47762 via svnmerge
................
r47762 | file | 2006-11-16 15:30:54 -0500 (Thu, 16 Nov 2006) | 9 lines
Blocked revisions 47761 via svnmerge
........
r47761 | file | 2006-11-16 15:29:28 -0500 (Thu, 16 Nov 2006) | 2 lines
Look for the header file specifically in all cases, not just the existence of the directory. (issue #8358 reported by mrness)
........
................
................
r47765 | file | 2006-11-16 22:13:17 +0100 (Do, 16 Nov 2006) | 10 lines
Merged revisions 47764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47764 | file | 2006-11-16 16:11:06 -0500 (Thu, 16 Nov 2006) | 2 lines
Compare technology using the pointers instead of a straight comparison based on name. (issue #8228 reported by dean bath)
........
................
r47769 | rizzo | 2006-11-16 22:57:23 +0100 (Do, 16 Nov 2006) | 3 lines
remove an unused function
................
r47770 | rizzo | 2006-11-16 23:03:27 +0100 (Do, 16 Nov 2006) | 3 lines
fix indentation
................
r47771 | qwell | 2006-11-16 23:32:23 +0100 (Do, 16 Nov 2006) | 4 lines
Add ability to modify range for dring matching.
Issue #8369, patch by ssuehring, modified slightly by me.
................
r47772 | rizzo | 2006-11-16 23:44:29 +0100 (Do, 16 Nov 2006) | 3 lines
convert some handlers to new style.
................
r47775 | qwell | 2006-11-16 23:51:00 +0100 (Do, 16 Nov 2006) | 5 lines
Remove the interim variable for range modifications, and set it on the structure directly.
Also move the default checking to where it gets set initially.
Fixes suggested by file.
................
r47778 | kpfleming | 2006-11-17 00:00:51 +0100 (Fr, 17 Nov 2006) | 20 lines
Merged revisions 47777 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47777 | kpfleming | 2006-11-16 17:00:10 -0600 (Thu, 16 Nov 2006) | 12 lines
update documentation regarding IAX2 transfers and CDRs
Merged revisions 47776 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47776 | kpfleming | 2006-11-16 16:57:31 -0600 (Thu, 16 Nov 2006) | 2 lines
update clearly wrong documentation regarding cdr_custom
........
................
................
r47779 | rizzo | 2006-11-17 00:05:50 +0100 (Fr, 17 Nov 2006) | 3 lines
convert two entries to new style
................
r47783 | qwell | 2006-11-17 00:20:52 +0100 (Fr, 17 Nov 2006) | 10 lines
Merged revisions 47782 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47782 | qwell | 2006-11-16 17:19:46 -0600 (Thu, 16 Nov 2006) | 2 lines
Fix a couple of typos. Initially pointed out by mrobinson.
........
................
r47784 | mattf | 2006-11-17 02:05:28 +0100 (Fr, 17 Nov 2006) | 2 lines
Make sure we choose the last channel as the dchannel if it's not E1 (for BRI). (#8077) Thanks Tzafrir.
................
r47787 | rizzo | 2006-11-17 12:12:13 +0100 (Fr, 17 Nov 2006) | 18 lines
introduce a bit of regexp support in the internal CLI api.
Now you can specify a cli command as
"console autoanswer [on|off]"
which means the on|off argument is optional, or
"console {mute|unmute}"
which means the mute|unmute argument is mandatory.
The blocks in [] or {} do not necessarily need to be at the
end of the string.
Completions for the variant parts are generated automatically.
This should significantly simplify the implementation of
the various handlers.
................
r47788 | rizzo | 2006-11-17 12:15:54 +0100 (Fr, 17 Nov 2006) | 3 lines
use the regexp cli support on some of the command
................
r47789 | rizzo | 2006-11-17 12:31:55 +0100 (Fr, 17 Nov 2006) | 3 lines
remove an unused function
................
r47790 | rizzo | 2006-11-17 13:26:15 +0100 (Fr, 17 Nov 2006) | 4 lines
merge the implemenmtation of "core set debug" and "core set verbose".
No externally visible changes.
................
r47801 | mattf | 2006-11-17 19:26:33 +0100 (Fr, 17 Nov 2006) | 3 lines
Add some sense of link state. Don't make calls if link is down. Only reset if we're bringing the
link up for the first time.
................
r47806 | qwell | 2006-11-17 21:46:36 +0100 (Fr, 17 Nov 2006) | 4 lines
Add ability to add custom queue log via manager interface.
Issue 7806, patch by alexrch, with slight modifications by me.
................
r47813 | rizzo | 2006-11-17 22:50:55 +0100 (Fr, 17 Nov 2006) | 9 lines
describe a bit the patterns that you can have in the commands,
and add support for wildcard (spelled as '%').
On passing fix a bug in the expansion code which was hidden and
appeared when implementing the wildcard
The fix is just the line 'src != argindex', in case someone wants
to test this on 1.4 - but i would just keep this in trunk.
................
r47814 | qwell | 2006-11-17 22:51:42 +0100 (Fr, 17 Nov 2006) | 6 lines
Add ability to notify an external application/script that the voicemail password was,
while also still changing the password "internally".
Issue 7371, initial patch by pdunkel, with rewrite/config comments by me.
Additional modifications (yay bitmask) by pdunkel.
................
r47815 | rizzo | 2006-11-17 23:02:15 +0100 (Fr, 17 Nov 2006) | 3 lines
standardize "module show [like]"
................
r47817 | rizzo | 2006-11-17 23:53:57 +0100 (Fr, 17 Nov 2006) | 5 lines
convert "help" to new style,
fix completion of arguments past the first one
that i broke earlier today.
................
r47818 | rizzo | 2006-11-17 23:56:58 +0100 (Fr, 17 Nov 2006) | 3 lines
remove a debugging message
................
r47821 | murf | 2006-11-18 00:18:51 +0100 (Sa, 18 Nov 2006) | 1 line
This update fulfils the request of bug 7109, which claimed the language arg to ast_stream_and_wait() was redundant. Almost all calls just used chan->language, and seeing how chan is the first argument, this certainly seems redundant. A change of language could just as easily be done by simply changing the channel language before calling.
................
r47822 | rizzo | 2006-11-18 09:19:41 +0100 (Sa, 18 Nov 2006) | 15 lines
prevent the sound thread from consuming all the available CPU
doing busy-wait on the output audio device.
As it is set now, it tries to push a frame every 10ms,
which is still too frequent but avoids deep restructuring
of the code (which i should do, though).
Note, this is only for ring tones, regular audio coming
from the network is still delivered as soon as it is
available.
Eventually this could well end up in the 1.4 branch, but
since i am probably the only user of chan_oss there isn't
much urgency to do that.
................
r47824 | rizzo | 2006-11-18 19:03:42 +0100 (Sa, 18 Nov 2006) | 14 lines
Merged revisions 47823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47823 | rizzo | 2006-11-18 18:59:35 +0100 (Sat, 18 Nov 2006) | 5 lines
fix bug 7450 - Parsing fails if From header contains angle brackets
(the bug was only in a corner case where the < was right after the
opening quote, and the fix is trivial).
........
................
r47827 | rizzo | 2006-11-18 21:08:17 +0100 (Sa, 18 Nov 2006) | 11 lines
Move this macro from cli.c to cli.h so apps can use it
without duplicating the macro or the code:
/*!
* In many cases we need to print singular or plural
* words depending on a count. This macro helps us e.g.
* printf("we have %d object%s", n, ESS(n));
*/
#define ESS(x) ((x) == 1 ? "" : "s")
................
r47829 | rizzo | 2006-11-18 21:17:06 +0100 (Sa, 18 Nov 2006) | 5 lines
ESS-ification.
no need to bring this in 1.4, it is just code cleanup
................
r47834 | rizzo | 2006-11-18 23:14:20 +0100 (Sa, 18 Nov 2006) | 5 lines
comments-only change:
document a bit more when manager events are delivered
to the clients.
................
r47835 | murf | 2006-11-19 05:12:39 +0100 (So, 19 Nov 2006) | 1 line
Added a few words of explanation about macros
................
r47836 | murf | 2006-11-19 05:22:33 +0100 (So, 19 Nov 2006) | 1 line
Added a few words to explain the change to AEL concerning Gosub()
................
r47844 | oej | 2006-11-20 12:36:45 +0100 (Mo, 20 Nov 2006) | 2 lines
Properly reset schedule items (rizzo)
................
r47846 | oej | 2006-11-20 12:46:45 +0100 (Mo, 20 Nov 2006) | 2 lines
Update docs for videosupport
................
r47847 | murf | 2006-11-20 15:08:04 +0100 (Mo, 20 Nov 2006) | 1 line
Erased the svnmerge-integrated prop from trunk. Please, in your svnmerge-ings, don't let these props leak into the trunk or branches.
................
r47851 | file | 2006-11-20 16:55:58 +0100 (Mo, 20 Nov 2006) | 10 lines
Merged revisions 47850 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47850 | file | 2006-11-20 10:51:37 -0500 (Mon, 20 Nov 2006) | 2 lines
Use a separate variable in the channel structure to store the context that the channel was dialed from. (issue #8382 reported by jiddings)
........
................
r47853 | file | 2006-11-20 17:04:14 +0100 (Mo, 20 Nov 2006) | 10 lines
Merged revisions 47852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47852 | file | 2006-11-20 10:58:50 -0500 (Mon, 20 Nov 2006) | 2 lines
Only remove/destroy the RTCP I/O item if it exists.
........
................
r47854 | file | 2006-11-20 17:06:10 +0100 (Mo, 20 Nov 2006) | 2 lines
Use RTP/RTCP fds on the RTP structure, don't bother storing them.
................
r47857 | file | 2006-11-20 17:19:13 +0100 (Mo, 20 Nov 2006) | 16 lines
Blocked revisions 47856 via svnmerge
................
r47856 | file | 2006-11-20 11:17:47 -0500 (Mon, 20 Nov 2006) | 9 lines
Blocked revisions 47855 via svnmerge
........
r47855 | file | 2006-11-20 11:16:22 -0500 (Mon, 20 Nov 2006) | 2 lines
Free history items at the end of use of the temporary SIP pvt structure. (issue #8383 reported by benh)
........
................
................
r47861 | file | 2006-11-20 20:52:38 +0100 (Mo, 20 Nov 2006) | 18 lines
Merged revisions 47860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47860 | file | 2006-11-20 14:51:36 -0500 (Mon, 20 Nov 2006) | 10 lines
Merged revisions 47859 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47859 | file | 2006-11-20 14:50:21 -0500 (Mon, 20 Nov 2006) | 2 lines
Don't forget to byte swap if we are exiting the smoother feed early. (issue #8287 reported by arturs)
........
................
................
r47866 | tilghman | 2006-11-20 21:04:11 +0100 (Mo, 20 Nov 2006) | 11 lines
Merged revisions 47864-47865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47864 | tilghman | 2006-11-20 14:01:58 -0600 (Mon, 20 Nov 2006) | 2 lines
Oops, merge missed release of odbc object
........
........
................
r47880 | rizzo | 2006-11-21 12:07:30 +0100 (Di, 21 Nov 2006) | 8 lines
do not ast_hangup() on a NULL channel.
In the original code this would happen in the case of
o->forwards >= AST_MAX_FORWARDS
Likely an 1.2/1.4 isse as well - please someone have a look,
while I am hunting a few more similar panics now.
................
r47881 | rizzo | 2006-11-21 12:53:06 +0100 (Di, 21 Nov 2006) | 10 lines
better fix for the previous bug.
In general this code needs a deep revision, because the body of
do_forward() deletes/overwrites the output channel without freeing
the resouce in some cases, and without notifying the caller.
Also, on FreeBSD with MALLOC_OPTIONS set i am seeing various panics
(duplicate freee etc.)
................
r47893 | oej | 2006-11-21 16:25:38 +0100 (Di, 21 Nov 2006) | 2 lines
Treat 101 as 100, not 183 session progress
................
r47898 | file | 2006-11-21 18:34:22 +0100 (Di, 21 Nov 2006) | 10 lines
Merged revisions 47897 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47897 | file | 2006-11-21 12:32:27 -0500 (Tue, 21 Nov 2006) | 2 lines
If we have the non standard G726-32 setting turned on we want to return G726-32 to the SDP, not our AAL2 string. (issue #8330 reported by voipgate)
........
................
r47912 | markster | 2006-11-22 06:49:06 +0100 (Mi, 22 Nov 2006) | 2 lines
Restore some sense of security to manager
................
r47923 | oej | 2006-11-22 12:28:12 +0100 (Mi, 22 Nov 2006) | 2 lines
Don't over-deprecate... :-)
................
r47933 | file | 2006-11-22 18:41:07 +0100 (Mi, 22 Nov 2006) | 2 lines
Add support to set the maximum number of files open when Asterisk loads using the 'maxfiles' configuration option. (issue #7499 reported by rkarlsba)
................
r47934 | file | 2006-11-22 18:43:36 +0100 (Mi, 22 Nov 2006) | 2 lines
Need to update the CHANGES file as well for the maxfiles option.
................
r47935 | file | 2006-11-22 18:47:14 +0100 (Mi, 22 Nov 2006) | 2 lines
Clarify a bit more.
................
r47945 | file | 2006-11-22 22:49:11 +0100 (Mi, 22 Nov 2006) | 10 lines
Merged revisions 47944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47944 | file | 2006-11-22 16:47:43 -0500 (Wed, 22 Nov 2006) | 2 lines
Video will never reach Packet2Packet bridging and can do more harm then good.
........
................
r47957 | oej | 2006-11-23 11:46:09 +0100 (Do, 23 Nov 2006) | 2 lines
Document new configuration option.
................
r47960 | oej | 2006-11-23 12:04:25 +0100 (Do, 23 Nov 2006) | 2 lines
Remove unused memory allocation
................
Modified:
team/group/trunk-cm-csel-hash/ (props changed)
team/group/trunk-cm-csel-hash/.cleancount
team/group/trunk-cm-csel-hash/CHANGES
team/group/trunk-cm-csel-hash/UPGRADE.txt
team/group/trunk-cm-csel-hash/apps/app_db.c
team/group/trunk-cm-csel-hash/apps/app_dial.c
team/group/trunk-cm-csel-hash/apps/app_directed_pickup.c
team/group/trunk-cm-csel-hash/apps/app_directory.c
team/group/trunk-cm-csel-hash/apps/app_followme.c
team/group/trunk-cm-csel-hash/apps/app_meetme.c
team/group/trunk-cm-csel-hash/apps/app_queue.c
team/group/trunk-cm-csel-hash/apps/app_voicemail.c
team/group/trunk-cm-csel-hash/channels/chan_h323.c
team/group/trunk-cm-csel-hash/channels/chan_local.c
team/group/trunk-cm-csel-hash/channels/chan_oss.c
team/group/trunk-cm-csel-hash/channels/chan_sip.c
team/group/trunk-cm-csel-hash/channels/chan_zap.c
team/group/trunk-cm-csel-hash/configs/sip.conf.sample
team/group/trunk-cm-csel-hash/configs/voicemail.conf.sample
team/group/trunk-cm-csel-hash/configs/zapata.conf.sample
team/group/trunk-cm-csel-hash/configure
team/group/trunk-cm-csel-hash/configure.ac
team/group/trunk-cm-csel-hash/doc/ael.txt
team/group/trunk-cm-csel-hash/doc/asterisk-conf.txt
team/group/trunk-cm-csel-hash/doc/billing.txt
team/group/trunk-cm-csel-hash/include/asterisk/channel.h
team/group/trunk-cm-csel-hash/include/asterisk/cli.h
team/group/trunk-cm-csel-hash/include/asterisk/file.h
team/group/trunk-cm-csel-hash/main/app.c
team/group/trunk-cm-csel-hash/main/asterisk.c
team/group/trunk-cm-csel-hash/main/cdr.c
team/group/trunk-cm-csel-hash/main/channel.c
team/group/trunk-cm-csel-hash/main/cli.c
team/group/trunk-cm-csel-hash/main/file.c
team/group/trunk-cm-csel-hash/main/frame.c
team/group/trunk-cm-csel-hash/main/manager.c
team/group/trunk-cm-csel-hash/main/rtp.c
team/group/trunk-cm-csel-hash/res/res_features.c
team/group/trunk-cm-csel-hash/res/res_realtime.c
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/trunk-cm-csel-hash/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 23 06:57:09 2006
@@ -1,1 +1,1 @@
-/trunk:1-47719
+/trunk:1-47961
Modified: team/group/trunk-cm-csel-hash/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/.cleancount?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/.cleancount (original)
+++ team/group/trunk-cm-csel-hash/.cleancount Thu Nov 23 06:57:09 2006
@@ -1,1 +1,1 @@
-25
+26
Modified: team/group/trunk-cm-csel-hash/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/CHANGES?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/CHANGES (original)
+++ team/group/trunk-cm-csel-hash/CHANGES Thu Nov 23 06:57:09 2006
@@ -61,3 +61,5 @@
* CID matching information is now shown when doing 'dialplan show'.
* app_queue now has a 'loose' option which is almost exactly like 'strict' except it
does not count paused queue members as unavailable.
+ * Added maxfiles option to options section of asterisk.conf which allows you to specify
+ what Asterisk should set as the maximum number of open files when it loads.
Modified: team/group/trunk-cm-csel-hash/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/UPGRADE.txt?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/UPGRADE.txt (original)
+++ team/group/trunk-cm-csel-hash/UPGRADE.txt Thu Nov 23 06:57:09 2006
@@ -6,3 +6,14 @@
* The CallerID fields across Manager events have now been made more
consistent. CallerID Number will be sent as CallerIDNum and CallerID
Name will be sent as CallerIDName wherever used.
+
+AEL:
+
+* Macros are now implemented underneath with the Gosub() application.
+ Heaven Help You if you wrote code depending on any aspect of this!
+ Previous to 1.6, macros were implemented with the Macro() app, which
+ provided a nice feature of auto-returning. The compiler will do its
+ 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;".
+
Modified: team/group/trunk-cm-csel-hash/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_db.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_db.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_db.c Thu Nov 23 06:57:09 2006
@@ -50,7 +50,7 @@
/*! \todo XXX Remove this application after 1.4 is relased */
static char *d_descrip =
-" DBdel(family/key): This applicaiton will delete a key from the Asterisk\n"
+" DBdel(family/key): This application will delete a key from the Asterisk\n"
"database.\n"
" This application has been DEPRECATED in favor of the DB_DELETE function.\n";
Modified: team/group/trunk-cm-csel-hash/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_dial.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_dial.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_dial.c Thu Nov 23 06:57:09 2006
@@ -67,7 +67,7 @@
static char *descrip =
" Dial(Technology/resource[&Tech2/resource2...][|timeout][|options][|URL]):\n"
-"This applicaiton will place calls to one or more specified channels. As soon\n"
+"This application will place calls to one or more specified channels. As soon\n"
"as one of the requested channels answers, the originating channel will be\n"
"answered, if it has not already been answered. These two channels will then\n"
"be active in a bridged call. All other channels that were requested will then\n"
@@ -419,7 +419,12 @@
src->name, dialstatus);
}
-/* helper function for wait_for_answer() */
+/*!
+ * helper function for wait_for_answer()
+ *
+ * XXX this code is highly suspicious, as it essentially overwrites
+ * the outgoing channel without properly deleting it.
+ */
static void do_forward(struct dial_localuser *o,
struct cause_args *num, struct ast_flags *peerflags, int single)
{
@@ -504,10 +509,10 @@
char cidname[AST_MAX_EXTENSION];
ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
}
- }
- }
- /* Hangup the original channel now, in case we needed it */
- ast_hangup(c);
+ /* Hangup the original channel now, in case we needed it */
+ ast_hangup(c);
+ }
+ }
}
/* argument used for some functions. */
@@ -590,7 +595,7 @@
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK |
DIAL_NOFORWARDHTML);
- ast_copy_string(c->context, "", sizeof(c->context));
+ ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
ast_copy_string(c->exten, "", sizeof(c->exten));
}
continue;
@@ -625,7 +630,7 @@
OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
OPT_CALLEE_PARK | OPT_CALLER_PARK |
DIAL_NOFORWARDHTML);
- ast_copy_string(c->context, "", sizeof(c->context));
+ ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
ast_copy_string(c->exten, "", sizeof(c->exten));
/* Setup early bridge if appropriate */
ast_channel_early_bridge(in, peer);
@@ -1369,7 +1374,7 @@
ast_app_group_set_channel(tmp->chan, outbound_group);
/* Inherit context and extension */
- ast_copy_string(tmp->chan->context, chan->context, sizeof(tmp->chan->context));
+ ast_copy_string(tmp->chan->dialcontext, chan->context, sizeof(tmp->chan->dialcontext));
ast_copy_string(tmp->chan->exten, chan->exten, sizeof(tmp->chan->exten));
/* Place the call, but don't wait on the answer */
Modified: team/group/trunk-cm-csel-hash/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_directed_pickup.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_directed_pickup.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_directed_pickup.c Thu Nov 23 06:57:09 2006
@@ -97,7 +97,7 @@
while ((target = ast_channel_walk_locked(target))) {
if (!strcasecmp(target->exten, exten) &&
- !strcasecmp(target->context, context) &&
+ !strcasecmp(target->dialcontext, context) &&
can_pickup(target)) {
res = pickup_do(chan, target);
ast_channel_unlock(target);
Modified: team/group/trunk-cm-csel-hash/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_directory.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_directory.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_directory.c Thu Nov 23 06:57:09 2006
@@ -282,17 +282,17 @@
#endif
if (ast_fileexists(fn, NULL, chan->language) > 0) {
- res = ast_stream_and_wait(chan, fn, chan->language, AST_DIGIT_ANY);
+ res = ast_stream_and_wait(chan, fn, AST_DIGIT_ANY);
ast_stopstream(chan);
/* If Option 'e' was specified, also read the extension number with the name */
if (readext) {
- ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
+ ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY);
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
}
} else {
res = ast_say_character_str(chan, S_OR(name, ext), AST_DIGIT_ANY, chan->language);
if (!ast_strlen_zero(name) && readext) {
- ast_stream_and_wait(chan, "vm-extension", chan->language, AST_DIGIT_ANY);
+ ast_stream_and_wait(chan, "vm-extension", AST_DIGIT_ANY);
res = ast_say_character_str(chan, ext, AST_DIGIT_ANY, chan->language);
}
}
@@ -303,7 +303,7 @@
for (loop = 3 ; loop > 0; loop--) {
if (!res)
- res = ast_stream_and_wait(chan, "dir-instr", chan->language, AST_DIGIT_ANY);
+ res = ast_stream_and_wait(chan, "dir-instr", AST_DIGIT_ANY);
if (!res)
res = ast_waitfordigit(chan, 3000);
ast_stopstream(chan);
@@ -622,7 +622,7 @@
for (;;) {
if (!res)
- res = ast_stream_and_wait(chan, dirintro, chan->language, AST_DIGIT_ANY);
+ res = ast_stream_and_wait(chan, dirintro, AST_DIGIT_ANY);
ast_stopstream(chan);
if (!res)
res = ast_waitfordigit(chan, 5000);
Modified: team/group/trunk-cm-csel-hash/apps/app_followme.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_followme.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_followme.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_followme.c Thu Nov 23 06:57:09 2006
@@ -982,7 +982,7 @@
ast_mutex_unlock(&f->lock);
if (targs.followmeflags.flags & FOLLOWMEFLAG_STATUSMSG)
- ast_stream_and_wait(chan, targs.statusprompt, chan->language, "");
+ ast_stream_and_wait(chan, targs.statusprompt, "");
snprintf(namerecloc,sizeof(namerecloc),"%s/followme.%s",ast_config_AST_SPOOL_DIR,chan->uniqueid);
duration = 5;
@@ -1022,7 +1022,7 @@
if (targs.status != 100) {
ast_moh_stop(chan);
if (targs.followmeflags.flags & FOLLOWMEFLAG_UNREACHABLEMSG)
- ast_stream_and_wait(chan, targs.sorryprompt, chan->language, "");
+ ast_stream_and_wait(chan, targs.sorryprompt, "");
res = 0;
} else {
caller = chan;
Modified: team/group/trunk-cm-csel-hash/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_meetme.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_meetme.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_meetme.c Thu Nov 23 06:57:09 2006
@@ -2953,6 +2953,10 @@
/* Find conference */
sla = sla2 = ASTOBJ_CONTAINER_FIND(&slas, data);
+
+ if (!sla2)
+ return AST_DEVICE_INVALID;
+
ASTOBJ_UNREF(sla2, sla_destroy);
if (option_debug)
Modified: team/group/trunk-cm-csel-hash/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_queue.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_queue.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_queue.c Thu Nov 23 06:57:09 2006
@@ -4461,6 +4461,27 @@
return 0;
}
+static int manager_queue_log_custom(struct mansession *s, struct message *m)
+{
+ char *queuename, *event, *message, *interface, *uniqueid;
+
+ queuename = astman_get_header(m, "Queue");
+ uniqueid = astman_get_header(m, "UniqueId");
+ interface = astman_get_header(m, "Interface");
+ event = astman_get_header(m, "Event");
+ message = astman_get_header(m, "Message");
+
+ if (ast_strlen_zero(queuename) || ast_strlen_zero(event)) {
+ astman_send_error(s, m, "Need 'Queue' and 'Event' parameters.");
+ return 0;
+ }
+
+ ast_queue_log(queuename, S_OR(uniqueid, "NONE"), interface, event, "%s", message);
+ astman_send_ack(s, m, "Event added successfully");
+
+ return 0;
+}
+
static int handle_queue_add_member(int fd, int argc, char *argv[])
{
char *queuename, *interface, *membername;
@@ -4648,6 +4669,7 @@
res |= ast_manager_unregister("QueueAdd");
res |= ast_manager_unregister("QueueRemove");
res |= ast_manager_unregister("QueuePause");
+ res |= ast_manager_unregister("QueueLog");
res |= ast_unregister_application(app_aqm);
res |= ast_unregister_application(app_rqm);
res |= ast_unregister_application(app_pqm);
@@ -4686,6 +4708,7 @@
res |= ast_manager_register("QueueAdd", EVENT_FLAG_AGENT, manager_add_queue_member, "Add interface to queue.");
res |= ast_manager_register("QueueRemove", EVENT_FLAG_AGENT, manager_remove_queue_member, "Remove interface from queue.");
res |= ast_manager_register("QueuePause", EVENT_FLAG_AGENT, manager_pause_queue_member, "Makes a queue member temporarily unavailable");
+ res |= ast_manager_register("QueueLog", EVENT_FLAG_AGENT, manager_queue_log_custom, "Adds custom entry in queue_log");
res |= ast_custom_function_register(&queuevar_function);
res |= ast_custom_function_register(&queuemembercount_function);
res |= ast_custom_function_register(&queuememberlist_function);
Modified: team/group/trunk-cm-csel-hash/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/apps/app_voicemail.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/apps/app_voicemail.c (original)
+++ team/group/trunk-cm-csel-hash/apps/app_voicemail.c Thu Nov 23 06:57:09 2006
@@ -401,6 +401,10 @@
static char VM_SPOOL_DIR[PATH_MAX];
static char ext_pass_cmd[128];
+
+#define PWDCHANGE_INTERNAL (1 << 1)
+#define PWDCHANGE_EXTERNAL (1 << 2)
+static int pwdchange = PWDCHANGE_INTERNAL;
#if ODBC_STORAGE
#define tdesc "Comedian Mail (Voicemail System) with ODBC Storage"
@@ -1105,8 +1109,14 @@
fd = -1;
continue;
}
- if (fd > -1)
- fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (fd > -1) {
+ if ((fdm = mmap(NULL, fdlen, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == -1) {
+ ast_log(LOG_WARNING, "Could not mmap the output file: %s (%d)\n", strerror(errno), errno);
+ SQLFreeHandle(SQL_HANDLE_STMT, stmt);
+ ast_odbc_release_obj(obj);
+ goto yuck;
+ }
+ }
}
if (fdm) {
memset(fdm, 0, fdlen);
@@ -2143,7 +2153,7 @@
snprintf(fn, sizeof(fn), "%s%s/%s/greet", VM_SPOOL_DIR, context, ext);
RETRIEVE(fn, -1);
if (ast_fileexists(fn, NULL, NULL) > 0) {
- res = ast_stream_and_wait(chan, fn, chan->language, ecodes);
+ res = ast_stream_and_wait(chan, fn, ecodes);
if (res) {
DISPOSE(fn, -1);
return res;
@@ -2151,14 +2161,14 @@
} else {
/* Dispose just in case */
DISPOSE(fn, -1);
- res = ast_stream_and_wait(chan, "vm-theperson", chan->language, ecodes);
+ res = ast_stream_and_wait(chan, "vm-theperson", ecodes);
if (res)
return res;
res = ast_say_digit_str(chan, ext, ecodes, chan->language);
if (res)
return res;
}
- res = ast_stream_and_wait(chan, busy ? "vm-isonphone" : "vm-isunavail", chan->language, ecodes);
+ res = ast_stream_and_wait(chan, busy ? "vm-isonphone" : "vm-isunavail", ecodes);
return res;
}
@@ -2925,7 +2935,7 @@
res = 0;
}
if (!res && !ast_test_flag(options, OPT_SILENT)) {
- res = ast_stream_and_wait(chan, INTRO, chan->language, ecodes);
+ res = ast_stream_and_wait(chan, INTRO, ecodes);
if (res == '#') {
ast_set_flag(options, OPT_SILENT);
res = 0;
@@ -3039,7 +3049,7 @@
/* Now play the beep once we have the message number for our next message. */
if (res >= 0) {
/* Unless we're *really* silent, try to send the beep */
- res = ast_stream_and_wait(chan, "beep", chan->language, "");
+ res = ast_stream_and_wait(chan, "beep", "");
}
/* Store information */
@@ -4152,7 +4162,7 @@
static int wait_file2(struct ast_channel *chan, struct vm_state *vms, char *file)
{
int res;
- if ((res = ast_stream_and_wait(chan, file, chan->language, AST_DIGIT_ANY)) < 0)
+ if ((res = ast_stream_and_wait(chan, file, AST_DIGIT_ANY)) < 0)
ast_log(LOG_WARNING, "Unable to play message %s\n", file);
return res;
}
@@ -4283,7 +4293,7 @@
ast_verbose(VERBOSE_PREFIX_3 "Playing envelope info: CID number '%s' matches mailbox number, playing recorded name\n", callerid);
if (!callback)
res = wait_file2(chan, vms, "vm-from");
- res = ast_stream_and_wait(chan, prefile, chan->language, "");
+ res = ast_stream_and_wait(chan, prefile, "");
} else {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Playing envelope info: message from '%s'\n", callerid);
@@ -5741,10 +5751,11 @@
if (++tries == 3)
return -1;
}
- if (ast_strlen_zero(ext_pass_cmd))
- vm_change_password(vmu,newpassword);
- else
- vm_change_password_shell(vmu,newpassword);
+ if (pwdchange & PWDCHANGE_INTERNAL)
+ vm_change_password(vmu, newpassword);
+ if ((pwdchange & PWDCHANGE_EXTERNAL) && !ast_strlen_zero(ext_pass_cmd))
+ vm_change_password_shell(vmu, newpassword);
+
if (option_debug)
ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
cmd = ast_play_and_wait(chan, vm_passchanged);
@@ -5844,10 +5855,11 @@
cmd = ast_play_and_wait(chan, vm_mismatch);
break;
}
- if (ast_strlen_zero(ext_pass_cmd))
- vm_change_password(vmu,newpassword);
- else
- vm_change_password_shell(vmu,newpassword);
+ if (pwdchange & PWDCHANGE_INTERNAL)
+ vm_change_password(vmu, newpassword);
+ if ((pwdchange & PWDCHANGE_EXTERNAL) && !ast_strlen_zero(ext_pass_cmd))
+ vm_change_password_shell(vmu, newpassword);
+
if (option_debug)
ast_log(LOG_DEBUG,"User %s set password to %s of length %d\n",vms->username,newpassword,(int)strlen(newpassword));
cmd = ast_play_and_wait(chan, vm_passchanged);
@@ -7176,7 +7188,12 @@
/* External password changing command */
if ((extpc = ast_variable_retrieve(cfg, "general", "externpass"))) {
ast_copy_string(ext_pass_cmd,extpc,sizeof(ext_pass_cmd));
- }
+ pwdchange = PWDCHANGE_EXTERNAL;
+ } else if ((extpc = ast_variable_retrieve(cfg, "general", "externpassnotify"))) {
+ ast_copy_string(ext_pass_cmd,extpc,sizeof(ext_pass_cmd));
+ pwdchange = PWDCHANGE_EXTERNAL | PWDCHANGE_INTERNAL;
+ }
+
#ifdef IMAP_STORAGE
/* IMAP server address */
if ((imap_server = ast_variable_retrieve(cfg, "general", "imapserver"))) {
@@ -7994,7 +8011,7 @@
/* Otherwise 1 is to save the existing message */
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Saving message as is\n");
- ast_stream_and_wait(chan, "vm-msgsaved", chan->language, "");
+ ast_stream_and_wait(chan, "vm-msgsaved", "");
cmd = 't';
return res;
}
@@ -8002,7 +8019,7 @@
/* Review */
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n");
- cmd = ast_stream_and_wait(chan, recordfile, chan->language, AST_DIGIT_ANY);
+ cmd = ast_stream_and_wait(chan, recordfile, AST_DIGIT_ANY);
break;
case '3':
message_exists = 0;
Modified: team/group/trunk-cm-csel-hash/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/group/trunk-cm-csel-hash/channels/chan_h323.c?view=diff&rev=47963&r1=47962&r2=47963
==============================================================================
--- team/group/trunk-cm-csel-hash/channels/chan_h323.c (original)
+++ team/group/trunk-cm-csel-hash/channels/chan_h323.c Thu Nov 23 06:57:09 2006
@@ -2754,21 +2754,6 @@
h323_tokens_show, "Show all active call tokens",
show_tokens_usage };
-static struct ast_cli_entry cli_h323_debug_deprecated = {
- { "h.323", "debug", NULL },
- h323_do_debug, "Enable H.323 debug",
- debug_usage };
-
-static struct ast_cli_entry cli_h323_trace_deprecated = {
- { "h.323", "trace", NULL },
- h323_do_trace, "Enable H.323 Stack Tracing",
- trace_usage };
-
-static struct ast_cli_entry cli_h323_gk_cycle_deprecated = {
- { "h323", "cycle", "gk", NULL },
- h323_gk_cycle, "Manually re-register with the Gatekeper",
- show_cycle_usage };
-
static struct ast_cli_entry cli_h323[] = {
{ { "h323", "set", "trace", NULL },
h323_do_trace, "Enable H.323 Stack Tracing",
Modified: team/group/trunk-cm-csel-hash/channels/chan_local.c
[... 3092 lines stripped ...]
More information about the svn-commits
mailing list