Commit graph

2668 commits

Author SHA1 Message Date
Russell Bryant
6335b4b30d Merge changes from team/russell/sla_trunk_moh ...
* Added the ability to specify the music on hold class used to play into the
   conference when there is only one member and the M option is used.
* Added the ability to specify a music on hold class to play instead of ringing
   for the SLATrunk application.

(patched by me, and tested internally)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-21 00:21:38 +00:00
Tilghman Lesher
cbfc6dcbea Make trunk build again
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-20 23:29:33 +00:00
Luigi Rizzo
a23c055c3d move asterisk/paths.h outside asterisk.h and into those files
who really need it.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-20 23:16:15 +00:00
Luigi Rizzo
6938f4b2b0 Fix building of modules under cygwin.
After this commit we can actually load modules under windows,
and we can start debugging more interesting problems related
to the load order and functionality of modules.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-20 16:12:10 +00:00
Luigi Rizzo
ffd86fc964 more errno.h removal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19 21:12:08 +00:00
Luigi Rizzo
0595b5e2aa include "logger.h" and errno.h from asterisk.h - usage shows that they
were included almost everywhere.
Remove some of the instances.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19 18:52:04 +00:00
Joshua Colp
23cfef1cc9 Change warning messages (which are really debug messages) into debug messages.
(closes issue #11288)
Reported by: IgorG
Patches:
      saydebug-89394-1-trunk.patch uploaded by IgorG (license 20)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19 14:03:30 +00:00
Luigi Rizzo
24c2e47e0d another cygwin compatibility fix.
This one must be handled in a better way in configure, also for other
architectures



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-17 11:08:58 +00:00
Luigi Rizzo
d82a631f9c more removal of duplicate #include lines
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-17 00:02:33 +00:00
Luigi Rizzo
5490960453 remove a bunch of duplicate includes
Reproduce with

grep -r #include . | grep -v .svn | grep -v Binary | sort | uniq -c | sort -nr 



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16 23:54:45 +00:00
Luigi Rizzo
fdb7f7ba3d Start untangling header inclusion in a way that does not affect
build times - tested, there is no measureable difference before and
after this commit.

In this change:

use asterisk/compat.h to include a small set of system headers:
inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h,
stdlib.h, alloca.h, stdio.h

Where available, the inclusion is conditional on HAVE_FOO_H as determined
by autoconf.

Normally, source files should not include any of the above system headers,
and instead use either "asterisk.h" or "asterisk/compat.h" which does it
better. 

For the time being I have left alone second-level directories
(main/db1-ast, etc.).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16 20:04:58 +00:00
Mark Michelson
68a805b70b Adding confirmation playback when forwarding voicemail messages. This will attempt
to play the name(s) of the person(s) to whom you are forwarding the message prior to
prompting for prepending. If no name is found, the extension is read back verbatim.

(closes issue #9046, reported and patched by jaroth)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16 17:11:43 +00:00
Mark Michelson
2f7440932c Merged revisions 89323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89323 | mmichelson | 2007-11-16 09:28:22 -0600 (Fri, 16 Nov 2007) | 5 lines

Make realtime queues accessible from the QUEUE_MEMBER_COUNT function.

(closes issue #11271, reported and patched by atis, with small modifications from me)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16 15:44:27 +00:00
Tilghman Lesher
8044dce3c0 Fix trunk breakage due to chan->lock being renamed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89300 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15 18:15:48 +00:00
Russell Bryant
1bf63d1c5b Merged revisions 89296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89296 | russell | 2007-11-15 11:19:28 -0600 (Thu, 15 Nov 2007) | 8 lines

Update the SLAStation application to account for the case where the SLA thread
has a call out to the station,  but the user has pressed a line button to answer
the call instead of picking up the handset.  If they do, the phone sends out a
new INVITE.  So, the SLAStation app must check to see if it is picking up a
ringing trunk, and ensure that the other stations stop ringing.

(reported internally, patched by me, tested by mogorman)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15 17:27:27 +00:00
Luigi Rizzo
09d9cce1d8 access channel locks through ast_channel_lock/unlock/trylock and not
through ast_mutex primitives.

To detect all occurrences, I have renamed the lock field in struct ast_channel
so it is clear that it shouldn't be used directly.

There are some uses in res/res_features.c (see details of the diff)
that are error prone as they try and lock two channels without
caring about the order (or without explaining why it is safe).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-15 16:20:47 +00:00
Luigi Rizzo
7f8ecd2cd3 make the 'name' and 'value' fields in ast_variable const char *
This prevents modifying the strings in the stored variables, 
and catched a few instances where this was actually done.

Given the differences between trunk and 1.4 (and the fact that this
is effectively an API change) it is better to fix 1.4 independently.
These are

chan_sip.c::sip_register()
chan_skinny.c:: near line 2847
config.c:: near line 1774
logger.c::make_components()
res_adsi.c:: near line 1049

I may have missed some instances for modules that do not build here.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-14 13:18:40 +00:00
Russell Bryant
0df5e50e97 Use BEGIN_OPTIONS / END_OPTIONS to make the syntax highlighting in my editor happy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89264 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-14 01:40:47 +00:00
Russell Bryant
31512895ae Instead of reserving 800 bytes for periodic announcements, use an array of
ast_str pointers and only alloate space for the strings as needed.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-14 01:35:28 +00:00
Russell Bryant
76696ac65f Convert most of the strings in the call_queue struct to use stringfields.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-14 01:15:26 +00:00
Mark Michelson
e4bb565530 Merged revisions 89241 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89241 | mmichelson | 2007-11-13 10:02:02 -0600 (Tue, 13 Nov 2007) | 5 lines

Reverting commit made in revision 89205 since it is unnecessary.

Thanks to Kevin for pointing this out


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-13 16:03:10 +00:00
Mark Michelson
13c49f6cce There is the potential to copy uninitialized memory into the mixmonitor->post_process
string. This fix prevents that.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89207 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-13 01:19:53 +00:00
Mark Michelson
1d4c579422 Merged revisions 89205 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89205 | mmichelson | 2007-11-12 18:56:46 -0600 (Mon, 12 Nov 2007) | 5 lines

Some sanity checking for MixMonitor. If only 1 argument is given, then the args.options
and args.post_process strings are uninitialized and could contain garbage. This change
handles this situation properly by only using arguments that we have parsed.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89206 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-13 00:57:34 +00:00
Steve Murphy
98429d37b2 Based on a note in asterisk-dev by Brian Capouch, I determined I too agressive in not initializing arrays passed to pbx_substitute_variables_xxxx; I reviewed the code (again) and hopefully found every possible spot where substitute_variables is called conditionally, and made sure the char array involved was set to a null string.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89186 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-12 18:44:36 +00:00
Mark Michelson
35d7946cda app_voicemail failed to build when compiling with IMAP_STORAGE
Now it does not.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 22:33:59 +00:00
Tilghman Lesher
3a70afbc3e Add the FILE() dialplan function and deprecate ReadFile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 17:32:15 +00:00
Luigi Rizzo
01a1cfd262 use %f instead of %lf (the 'l' is ignored anyways).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 09:21:02 +00:00
Kevin P. Fleming
edc78d6023 improve linked-list macros in two ways:
- the *_CURRENT macros no longer need the list head pointer argument
  - add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 05:28:47 +00:00
Tilghman Lesher
97744f54e7 Merged revisions 89093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89093 | tilghman | 2007-11-07 17:39:37 -0600 (Wed, 07 Nov 2007) | 7 lines

The member refcount must be incremented, to avoid using it after deallocation.
A huge thanks go to lvl- for patiently providing the necessary valgrind output
that was necessary to finding this problem of memory corruption.
Reported by: lvl-
Patch by: tilghman
Closes issue #11174

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89094 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 23:47:45 +00:00
Mark Michelson
4f34bc609b If imapfolder has been specified in voicemail.conf, we should not connect to INBOX...
ever. It may not exist.

(closes issue #11151, reported by selsky, patched by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89092 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 23:18:22 +00:00
Tilghman Lesher
6f3f010ca0 Suppress erroneous warnings on load.
Reported by: eliel
Patch by: eliel
Closes issue #11177


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 04:21:27 +00:00
Russell Bryant
e309393920 Added the ability to do "meetme concise" with the "meetme" CLI command.
This extends the concise capabilities of this CLI command to include
listing all conferences, instead of an addition to the other sub commands
for the "meetme" command.

(closes issue #11078)
Reported by: jthomas
Patches: 
      meetme-concise.patch uploaded by jthomas (license 293)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 23:44:39 +00:00
Mark Michelson
0cd3118a62 Adding the queue strategy wrandom
(closes issue #10942, reported and patched by julianjm, documentation changes by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 22:36:55 +00:00
Russell Bryant
a06218ee6d Added the S() and L() options to the MeetMe application. These are pretty
much identical to the S() and L() options to Dial().  They let you set
timeouts for the conference, as well as have warning sounds played to
let the caller know how much time is left, and when it is running out.

(closes issue #8030)
Reported by: areski
Patches: 
      meetme_timeout_timelimit_v2.patch uploaded by areski (license 29)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89069 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 22:15:32 +00:00
Mark Michelson
01e1f6cc94 Added CLI and manager commands for changing a queue member's penalty
(closes issue #9374, reported and initially patched by wuwu, intermediate patch by eliel, and final patch by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 22:05:56 +00:00
Mark Michelson
5a4867543d "show application <foo>" changes for clarity.
(closes issue #11171, reported and patched by blitzrage)

Many thanks!



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 19:04:45 +00:00
Luigi Rizzo
08b10da53b Simplify the implementation and the API for stringfields;
details and examples are in include/asterisk/stringfields.h.

Not applicable to older branches except for 1.4 which will
receive a fix for the routines that free memory pools.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-04 19:44:31 +00:00
Steve Murphy
63f2f04cf4 This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:26:51 +00:00
Joshua Colp
e3f3a640c0 Merged revisions 88026 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r88026 | file | 2007-11-01 10:27:37 -0300 (Thu, 01 Nov 2007) | 2 lines

Fix up commit for my Zap channel with spies in Meetme fix. (thanks Tony Mountifield!)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 13:30:28 +00:00
Tilghman Lesher
97fe45ab93 Janitor: use ast_free to pair calls of ast_malloc and ast_calloc
Reported by: eliel
Patch by: eliel
Closes issue #11135


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 06:07:18 +00:00
Joshua Colp
78cae359c8 Merged revisions 87970 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87970 | file | 2007-10-31 22:53:55 -0300 (Wed, 31 Oct 2007) | 4 lines

If a Zap channel contains a spy or a spy is added take it out of the conference in kernel space and make it go through Asterisk so the spy gets audio from both sides.
(closes issue #10060)
Reported by: mparker

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87971 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 01:55:38 +00:00
Joshua Colp
df6237eac3 Add volume adjustment in.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31 18:03:17 +00:00
Joshua Colp
f066bfc38a Restore operation of the option that only writes when the channel is bridged.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31 17:56:21 +00:00
Joshua Colp
d13f7d94b1 Add volume adjustment to spy audiohook in app_chanspy.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31 17:25:16 +00:00
Tilghman Lesher
f595811265 If no '?' is found in the arguments, don't attempt to continue.
Reported by: blitzrage
Fixed by: tilghman
Closes issue #11111


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-30 22:15:28 +00:00
Russell Bryant
c1e08b1ae0 If a caller is listen-only, then don't bother with doing talker detection.
(closes issue #10911, reported by junky, patched by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29 21:34:47 +00:00
Mark Michelson
3ffc123db9 Adding the more flexible QUEUE_MEMBER function to replace the QUEUE_MEMBER_COUNT function.
A deprecation notice will be issued the first time QUEUE_MEMBER_COUNT is used.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29 20:13:23 +00:00
Jason Parker
98617d82a1 Make sure we set flags to a 0 value before trying to use it. Pointed out by seanbright while I was debugging issue 11109.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29 19:56:50 +00:00
Joshua Colp
34fd65ba3c Remove duplicate stdlib.h include.
(closes issue #11105)
Reported by: eliel
Patches:
      app_voicemail.c.patch uploaded by eliel (license 64)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-29 16:38:31 +00:00
Mark Michelson
cf861b38c7 Added queue strategy "linear". This strategy is useful for those who always wish for their
phones to be rung in a specific order.

(closes issue #7279, reported and initially patched by diLLec, patch reworked by me)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-26 15:19:46 +00:00