[asterisk-commits] seanbright: branch seanbright/resolve-shadow-warnings r117254 - in /team/sean...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 19 18:08:04 CDT 2008
Author: seanbright
Date: Mon May 19 18:08:04 2008
New Revision: 117254
URL: http://svn.digium.com/view/asterisk?view=rev&rev=117254
Log:
Merged revisions 115886,115939,115941,115945,116001,116039,116089,116138,116179,116222-116224,116229,116234,116237,116239-116240,116297-116298,116350,116353,116407,116410,116461,116467,116469,116471,116522,116557,116590,116592,116594,116631,116663,116694,116731,116765,116797,116800,116848,116884,116919,116948,116979,117024,117052-117053,117082,117084-117085,117088,117133,117136,117182,117212 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r115886 | tilghman | 2008-05-13 14:38:11 -0400 (Tue, 13 May 2008) | 11 lines
Merged revisions 115884 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r115884 | tilghman | 2008-05-13 13:36:13 -0500 (Tue, 13 May 2008) | 3 lines
If the socket dies (read returns 0=EOF), return immediately.
(Closes issue #12637)
........
................
r115939 | mattf | 2008-05-13 16:11:20 -0400 (Tue, 13 May 2008) | 1 line
Add support for receiving calling party category
................
r115941 | mattf | 2008-05-13 16:18:04 -0400 (Tue, 13 May 2008) | 1 line
Need to clear calling_party_cat variable after we retrieve it
................
r115945 | file | 2008-05-13 16:29:27 -0400 (Tue, 13 May 2008) | 12 lines
Merged revisions 115944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r115944 | file | 2008-05-13 17:28:23 -0300 (Tue, 13 May 2008) | 4 lines
Use the right flag to open the audio in non-blocking.
(closes issue #12616)
Reported by: nicklewisdigiumuser
........
................
r116001 | russell | 2008-05-13 17:07:59 -0400 (Tue, 13 May 2008) | 13 lines
Merged revisions 115990 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r115990 | russell | 2008-05-13 16:05:57 -0500 (Tue, 13 May 2008) | 5 lines
Fix an issue that I noticed in autoservice while mmichelson and I were debugging
a different problem. I noticed that it was theoretically possible for two threads
to attempt to start the autoservice thread at the same time. This change makes the
process of starting the autoservice thread, thread-safe.
........
................
r116039 | russell | 2008-05-13 17:18:55 -0400 (Tue, 13 May 2008) | 32 lines
Merged revisions 116038 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116038 | russell | 2008-05-13 16:17:23 -0500 (Tue, 13 May 2008) | 24 lines
Fix a deadlock involving channel autoservice and chan_local that was debugged
and fixed by mmichelson and me.
We observed a system that had a bunch of threads stuck in ast_autoservice_stop().
The reason these threads were waiting around is because this function waits to
ensure that the channel list in the autoservice thread gets rebuilt before the
stop() function returns. However, the autoservice thread was also locked, so
the autoservice channel list was never getting rebuilt.
The autoservice thread was stuck waiting for the channel lock on a local channel.
However, the local channel was locked by a thread that was stuck in the autoservice
stop function.
It turned out that the issue came down to the local_queue_frame() function in
chan_local. This function assumed that one of the channels passed in as an
argument was locked when called. However, that was not always the case. There
were multiple cases in which this channel was not locked when the function was
called. We fixed up chan_local to indicate to this function whether this channel
was locked or not. The previous assumption had caused local_queue_frame() to
improperly return with the channel locked, where it would then never get unlocked.
(closes issue #12584)
(related to issue #12603)
........
................
r116089 | mmichelson | 2008-05-13 19:54:01 -0400 (Tue, 13 May 2008) | 20 lines
Merged revisions 116088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116088 | mmichelson | 2008-05-13 18:47:49 -0500 (Tue, 13 May 2008) | 12 lines
A change to the way channel locks are handled when DEBUG_CHANNEL_LOCKS is defined.
After debugging a deadlock, it was noticed that when DEBUG_CHANNEL_LOCKS
is enabled in menuselect, the actual origin of channel locks is obscured
by the fact that all channel locks appear to happen in the function
ast_channel_lock(). This code change redefines ast_channel_lock to be a
macro which maps to __ast_channel_lock(), which then relays the proper
file name, line number, and function name information to the core lock
functions so that this information will be displayed in the case that
there is some sort of locking error or core show locks is issued.
........
................
r116138 | mmichelson | 2008-05-13 20:20:05 -0400 (Tue, 13 May 2008) | 6 lines
Undo inadvertent changes to chan_skinny caused by the merging of urgent messaging
support.
Thanks to Damien Wedhorn for pointing out the problem.
................
r116179 | oej | 2008-05-14 04:16:25 -0400 (Wed, 14 May 2008) | 2 lines
Doxygen formatting change only
................
r116222 | oej | 2008-05-14 07:32:05 -0400 (Wed, 14 May 2008) | 2 lines
Adding comments
................
r116223 | oej | 2008-05-14 07:37:21 -0400 (Wed, 14 May 2008) | 2 lines
Reformatting
................
r116224 | oej | 2008-05-14 07:51:09 -0400 (Wed, 14 May 2008) | 2 lines
Formatting changes (coding guidelines) while thinking about something else...
................
r116229 | oej | 2008-05-14 08:32:57 -0400 (Wed, 14 May 2008) | 5 lines
Add support for codec settings in originate via call file and manager.
This is to enable video and text in originated calls. Development sponsored
by Omnitor AB, Sweden. (http://www.omnitor.se)
................
r116234 | oej | 2008-05-14 09:05:15 -0400 (Wed, 14 May 2008) | 11 lines
Merged revisions 116230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116230 | oej | 2008-05-14 14:51:06 +0200 (Ons, 14 Maj 2008) | 3 lines
Accept text messages even with
Content-Type: text/plain;charset=Södermanländska
........
................
r116237 | oej | 2008-05-14 09:37:07 -0400 (Wed, 14 May 2008) | 5 lines
Adding spport for T.140 RED - Simple RTP redundancy to prevent packet loss in text stream
Work sponsored by Omnitor AB, Stockholm, Sweden (http://www.omnitor.se)
................
r116239 | oej | 2008-05-14 10:03:42 -0400 (Wed, 14 May 2008) | 2 lines
Properly declare charset for text messages.
................
r116240 | oej | 2008-05-14 10:16:51 -0400 (Wed, 14 May 2008) | 2 lines
Don't add linefeed on received MESSAGE
................
r116297 | jpeeler | 2008-05-14 12:52:30 -0400 (Wed, 14 May 2008) | 3 lines
Fixed a few problems with multiparking: call not being parked in the correct parking spot, caller not being notified of parking spot position, and improperly hanging up the call during a transfer due to timing out (not providing the extension in which to transfer).
................
r116298 | tilghman | 2008-05-14 12:53:23 -0400 (Wed, 14 May 2008) | 15 lines
Merged revisions 116296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116296 | tilghman | 2008-05-14 11:46:48 -0500 (Wed, 14 May 2008) | 2 lines
Detect another way for a connection to have gone away.
(closes issue #12618)
Reported by: ctooley
Patches:
1.4-externalivr-test_fd.diff uploaded by ctooley (license 136)
trunk-externalivr-test_fd.diff uploaded by ctooley (license 136)
........
................
r116350 | file | 2008-05-14 14:25:54 -0400 (Wed, 14 May 2008) | 4 lines
Make the ldap version setting work without having both version and protocol set.
(closes issue #12613)
Reported by: suretec
................
r116353 | file | 2008-05-14 14:54:16 -0400 (Wed, 14 May 2008) | 12 lines
Merged revisions 116352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116352 | file | 2008-05-14 15:53:39 -0300 (Wed, 14 May 2008) | 4 lines
Add linux-gnueabi in.
(closes issue #12529)
Reported by: tzafrir
........
................
r116407 | qwell | 2008-05-14 16:36:55 -0400 (Wed, 14 May 2008) | 9 lines
Voicemail "* exit" should not require an exitcontext to be specified.
The behavior in 1.4 was that it would use the current context if an exitcontext existed.
(closes issue #12605)
Reported by: kenjreno
Patches:
12605-starexit.diff uploaded by qwell (license 4)
Tested by: file
................
r116410 | qwell | 2008-05-14 16:43:26 -0400 (Wed, 14 May 2008) | 9 lines
Merged revisions 116409 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116409 | qwell | 2008-05-14 15:43:08 -0500 (Wed, 14 May 2008) | 1 line
Document exitcontext in app_voicemail sample config
........
................
r116461 | file | 2008-05-14 17:11:49 -0400 (Wed, 14 May 2008) | 6 lines
Add a missing context unlock.
(closes issue #12649)
Reported by: ys
Patches:
pbx.c.diff uploaded by ys (license 281)
................
r116467 | tilghman | 2008-05-14 17:39:06 -0400 (Wed, 14 May 2008) | 15 lines
Merged revisions 116466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116466 | tilghman | 2008-05-14 16:38:09 -0500 (Wed, 14 May 2008) | 7 lines
Avoid zombies when the channel exits before the AGI.
(closes issue #12648)
Reported by: gkloepfer
Patches:
20080514__bug12648.diff.txt uploaded by Corydon76 (license 14)
Tested by: gkloepfer
........
................
r116469 | russell | 2008-05-14 17:40:43 -0400 (Wed, 14 May 2008) | 12 lines
Merged revisions 116463 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116463 | russell | 2008-05-14 16:32:00 -0500 (Wed, 14 May 2008) | 4 lines
Add ast_assert(), which can be used to handle fatal errors. It is only compiled
in if dev-mode is enabled, and only aborts if DO_CRASH is defined.
(inspired by issue #12650)
........
................
r116471 | file | 2008-05-14 17:54:03 -0400 (Wed, 14 May 2008) | 2 lines
Fix pedanticness.
................
r116522 | mmichelson | 2008-05-14 18:15:12 -0400 (Wed, 14 May 2008) | 8 lines
Adding a new option to Chanspy(). The 'd' option allows for the spy to
press DTMF digits to switch between spying modes. Pressing 4 activates spy mode,
pressing 5 activates whisper mode, and pressing 6 activates barge mode. Use of
this feature overrides the normal operation of DTMF numbers.
This feature is courtesy of Switchvox.
................
r116557 | rizzo | 2008-05-15 06:56:29 -0400 (Thu, 15 May 2008) | 10 lines
Use casts or intermediate variables to remove a number
of platform/compiler-dependent warnings when handing
struct timeval fields, both reading and printing them.
It is a lost battle to handle the different ways struct timeval
is handled on the various platforms and compilers, so try
to be pragmatic and go through int/long which are universally
supported.
................
r116590 | mmichelson | 2008-05-15 11:13:11 -0400 (Thu, 15 May 2008) | 8 lines
Prevent crashes from occurring due to a strcmp of a NULL pointer.
(closes issue #12661)
Reported by: jaroth
Patches:
urgentcompare.patch uploaded by jaroth (license 50)
................
r116592 | mmichelson | 2008-05-15 11:24:29 -0400 (Thu, 15 May 2008) | 9 lines
Modify externnotify to take the number of urgent voicemails as a final argument instead
of the string "Urgent"
(closes issue #12660)
Reported by: jaroth
Patches:
externnotify.patch uploaded by jaroth (license 50)
................
r116594 | mmichelson | 2008-05-15 11:40:29 -0400 (Thu, 15 May 2008) | 12 lines
When counting urgent messages when using IMAP storage, take into account that
the urgent messages are not in their own folder but are actually "flagged" messages
in the INBOX.
(closes issue #12659)
Reported by: jaroth
Patches:
urgentfolder_v2.patch uploaded by jaroth (license 50)
Tested by: jaroth
................
r116631 | tilghman | 2008-05-15 13:58:22 -0400 (Thu, 15 May 2008) | 3 lines
Don't unload config on reload, when config has not changed.
(Closes issue #12652)
................
r116663 | jpeeler | 2008-05-15 17:54:18 -0400 (Thu, 15 May 2008) | 2 lines
Fixes a problem I was having with two SIP phones using Packet2Packet bridging dropping audio nearly immediately. The problem was that the lock on the SIP dialog was not being unlocked while the bridge was still active. (Related to issue #12566)
................
r116694 | tilghman | 2008-05-15 18:05:47 -0400 (Thu, 15 May 2008) | 4 lines
Add an extra check in ast_strlen_zero, and make ast_assert() not print the
file, line, and function name twice.
(Closes issue #12650)
................
r116731 | jdixon | 2008-05-15 20:51:14 -0400 (Thu, 15 May 2008) | 2 lines
Bring all app_rpt and chan_usbradio stuff up to date
................
r116765 | seanbright | 2008-05-16 13:08:59 -0400 (Fri, 16 May 2008) | 1 line
Compile under dev-mode, please.
................
r116797 | mattf | 2008-05-16 16:00:04 -0400 (Fri, 16 May 2008) | 1 line
Try to see if we can make our ringback situation a little better
................
r116800 | file | 2008-05-16 16:30:24 -0400 (Fri, 16 May 2008) | 12 lines
Merged revisions 116799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116799 | file | 2008-05-16 17:28:11 -0300 (Fri, 16 May 2008) | 4 lines
Check to make sure an RTP structure exists before calling ast_rtp_new_source on it.
(closes issue #12669)
Reported by: sbisker
........
................
r116848 | file | 2008-05-16 17:34:45 -0400 (Fri, 16 May 2008) | 2 lines
Try to fix attended transfers.
................
r116884 | file | 2008-05-17 15:39:35 -0400 (Sat, 17 May 2008) | 6 lines
Improve native transfers when a chain of IAX2 connections are in use.
(closes issue #7567)
Reported by: tjd
Patches:
bug_7567_update_v2.diff uploaded by snuffy (license 35)
................
r116919 | russell | 2008-05-18 15:58:10 -0400 (Sun, 18 May 2008) | 3 lines
Remove duplicate colon on Reason header
(closes issue #12678)
................
r116948 | tilghman | 2008-05-18 17:15:58 -0400 (Sun, 18 May 2008) | 4 lines
Add a set of text to the file astcanary uses to communicate back the main
Asterisk process, which explains the purpose for the file being there. This
should assist people who find the file and wonder why it exists.
................
r116979 | russell | 2008-05-18 23:44:28 -0400 (Sun, 18 May 2008) | 12 lines
Merged revisions 116978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r116978 | russell | 2008-05-18 22:44:04 -0500 (Sun, 18 May 2008) | 4 lines
Avoid access of uninitialized memory. This caused a bunch of crashes for me
while doing load testing of development branch where I'm working on some
performance improvements.
........
................
r117024 | rizzo | 2008-05-19 09:33:08 -0400 (Mon, 19 May 2008) | 4 lines
Allow users to specify 'startgui=1' in oss.conf so that the
graphic screen for the video console is activated at startup.
................
r117052 | rizzo | 2008-05-19 10:22:04 -0400 (Mon, 19 May 2008) | 15 lines
Some fixes to the code to support running on an externally
supplied window.
SDL (at least recent 1.2.x versions) has the ability to run the
graphic output into an externally supplied window, whose ID in the
environment variable SDL_WINDOWID. Ideally, applications should
run unchanged irrespective of who creates the window. Unfortunately,
SDL does not subscribe to mouse, key and resize events on externally
supplied windows, so we need to do ask for these events explicitly.
On passing, also add some code to handle SDL_ACTIVEEVENT so if
the X11 window is killed while we are active, we call
"stop now" to terminate the asterisk instance.
................
r117053 | rizzo | 2008-05-19 10:54:34 -0400 (Mon, 19 May 2008) | 2 lines
fix example configuration for video support in chan_oss
................
r117082 | file | 2008-05-19 11:24:44 -0400 (Mon, 19 May 2008) | 14 lines
Merged revisions 117081 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r117081 | file | 2008-05-19 12:22:10 -0300 (Mon, 19 May 2008) | 6 lines
Make chan_h323 work with pwlib 1.12.0
(closes issue #12682)
Reported by: bamby
Patches:
pwlib_nopipe.diff uploaded by bamby (license 430)
........
................
r117084 | rizzo | 2008-05-19 11:47:46 -0400 (Mon, 19 May 2008) | 7 lines
trap potential failures of SDL when SDL_WINDOWID is pointing to a
random window.
This commit is essentially a workaround for some undesirable behaviour of SDL;
we should not be doing this in the application, but in the library.
................
r117085 | file | 2008-05-19 12:03:33 -0400 (Mon, 19 May 2008) | 4 lines
The logger closes the files it is logging to when reloading so we have to read in the logger configuration even if it has not changed so that the logs get opened again.
(closes issue #12665)
Reported by: DennisD
................
r117088 | tilghman | 2008-05-19 12:07:09 -0400 (Mon, 19 May 2008) | 10 lines
Merged revisions 117086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r117086 | tilghman | 2008-05-19 11:05:05 -0500 (Mon, 19 May 2008) | 2 lines
The addition of usleep(2) within ast_assert requires the inclusion of the unistd.h header
........
................
r117133 | file | 2008-05-19 12:22:56 -0400 (Mon, 19 May 2008) | 4 lines
Remove a premature mutex destroy (the destruction callback will end up destroying it) and use a callback to purge remaining classes.
(closes issue #12677)
Reported by: falves11
................
r117136 | file | 2008-05-19 12:53:33 -0400 (Mon, 19 May 2008) | 14 lines
Merged revisions 117135 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r117135 | file | 2008-05-19 13:50:52 -0300 (Mon, 19 May 2008) | 6 lines
Use the right pthread lock and condition when waiting.
(closes issue #12664)
Reported by: tomo1657
Patches:
res_smdi.c.patch uploaded by tomo1657 (license 484)
........
................
r117182 | tilghman | 2008-05-19 16:06:38 -0400 (Mon, 19 May 2008) | 7 lines
Change the default for the pridialplan parameter to the far more common case of
'unknown', and better document the use of each parameter.
(closes issue #12633)
Reported by: tzafrir
Patches:
pridialplan_unknown_2.diff uploaded by tzafrir (license 46)
................
r117212 | russell | 2008-05-19 16:45:25 -0400 (Mon, 19 May 2008) | 3 lines
Minor formatting change to test a mantis change ...
(issue #12674)
................
Modified:
team/seanbright/resolve-shadow-warnings/ (props changed)
team/seanbright/resolve-shadow-warnings/CHANGES
team/seanbright/resolve-shadow-warnings/CREDITS
team/seanbright/resolve-shadow-warnings/UPGRADE.txt
team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c
team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c
team/seanbright/resolve-shadow-warnings/apps/app_rpt.c
team/seanbright/resolve-shadow-warnings/apps/app_voicemail.c
team/seanbright/resolve-shadow-warnings/apps/app_waituntil.c
team/seanbright/resolve-shadow-warnings/cdr/cdr_csv.c
team/seanbright/resolve-shadow-warnings/channels/Makefile
team/seanbright/resolve-shadow-warnings/channels/chan_agent.c
team/seanbright/resolve-shadow-warnings/channels/chan_alsa.c
team/seanbright/resolve-shadow-warnings/channels/chan_iax2.c
team/seanbright/resolve-shadow-warnings/channels/chan_local.c
team/seanbright/resolve-shadow-warnings/channels/chan_sip.c
team/seanbright/resolve-shadow-warnings/channels/chan_skinny.c
team/seanbright/resolve-shadow-warnings/channels/chan_usbradio.c
team/seanbright/resolve-shadow-warnings/channels/chan_zap.c
team/seanbright/resolve-shadow-warnings/channels/console_gui.c
team/seanbright/resolve-shadow-warnings/channels/console_video.c
team/seanbright/resolve-shadow-warnings/channels/h323/ast_h323.cxx
team/seanbright/resolve-shadow-warnings/channels/iax2-parser.h
team/seanbright/resolve-shadow-warnings/channels/xpmr/sinetabx.h
team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.c
team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr.h
team/seanbright/resolve-shadow-warnings/channels/xpmr/xpmr_coef.h
team/seanbright/resolve-shadow-warnings/configs/oss.conf.sample
team/seanbright/resolve-shadow-warnings/configs/voicemail.conf.sample
team/seanbright/resolve-shadow-warnings/configs/zapata.conf.sample
team/seanbright/resolve-shadow-warnings/funcs/func_timeout.c
team/seanbright/resolve-shadow-warnings/include/asterisk/channel.h
team/seanbright/resolve-shadow-warnings/include/asterisk/frame.h
team/seanbright/resolve-shadow-warnings/include/asterisk/lock.h
team/seanbright/resolve-shadow-warnings/include/asterisk/rtp.h
team/seanbright/resolve-shadow-warnings/include/asterisk/strings.h
team/seanbright/resolve-shadow-warnings/include/asterisk/utils.h
team/seanbright/resolve-shadow-warnings/main/Makefile
team/seanbright/resolve-shadow-warnings/main/abstract_jb.c
team/seanbright/resolve-shadow-warnings/main/asterisk.c
team/seanbright/resolve-shadow-warnings/main/autoservice.c
team/seanbright/resolve-shadow-warnings/main/channel.c
team/seanbright/resolve-shadow-warnings/main/features.c
team/seanbright/resolve-shadow-warnings/main/frame.c
team/seanbright/resolve-shadow-warnings/main/logger.c
team/seanbright/resolve-shadow-warnings/main/manager.c
team/seanbright/resolve-shadow-warnings/main/pbx.c
team/seanbright/resolve-shadow-warnings/main/rtp.c
team/seanbright/resolve-shadow-warnings/main/sched.c
team/seanbright/resolve-shadow-warnings/main/taskprocessor.c
team/seanbright/resolve-shadow-warnings/main/udptl.c
team/seanbright/resolve-shadow-warnings/main/utils.c
team/seanbright/resolve-shadow-warnings/pbx/pbx_spool.c
team/seanbright/resolve-shadow-warnings/res/res_agi.c
team/seanbright/resolve-shadow-warnings/res/res_config_ldap.c
team/seanbright/resolve-shadow-warnings/res/res_odbc.c
team/seanbright/resolve-shadow-warnings/res/res_smdi.c
team/seanbright/resolve-shadow-warnings/sample.call
team/seanbright/resolve-shadow-warnings/utils/astcanary.c
Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/seanbright/resolve-shadow-warnings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon May 19 18:08:04 2008
@@ -1,1 +1,1 @@
-/trunk:1-115878
+/trunk:1-117248
Modified: team/seanbright/resolve-shadow-warnings/CHANGES
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/CHANGES?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/CHANGES (original)
+++ team/seanbright/resolve-shadow-warnings/CHANGES Mon May 19 18:08:04 2008
@@ -19,6 +19,7 @@
----------------------------------------
* Channels can now be configured using named sections in zapata.conf, just
like other channel drivers, including the use of templates.
+ * The default for pridialplan has changed from 'national' to 'unknown'.
PBX Changes
-----------
@@ -59,6 +60,11 @@
to be spoken instead of the channel name or number. For more information on the
use of this option, issue the command "core show application ChanSpy" from the
Asterisk CLI.
+ * Chanspy has a new option, 'd', which allows the spy to use DTMF to swap between
+ spy modes. Use of this feature overrides the typical use of numeric DTMF. In other
+ words, if using the 'd' option, it is not possible to enter a number to append to
+ the first argument to Chanspy(). Pressing 4 will change to spy mode, pressing 5 will
+ change to whisper mode, and pressing 6 will change to barge mode.
SIP Changes
-----------
@@ -77,6 +83,8 @@
testing and problem reporting!
* Added ability to specify registration expiry time on a per registration basis in
the register line.
+ * Added support for T140 RED - redundancy in T.140 to prevent text loss due to
+ lost packets.
IAX Changes
-----------
@@ -166,6 +174,7 @@
* Originate now requires the Originate privilege and, if you want to call out
to a subshell, it requires the System privilege, as well. This was done to
enhance manager security.
+ * Originate now accepts codec settings with "Codecs: alaw, ulaw, h264"
* New command: Atxfer. See doc/manager_1_1.txt for more details or
manager show command Atxfer from the CLI
Modified: team/seanbright/resolve-shadow-warnings/CREDITS
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/CREDITS?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/CREDITS (original)
+++ team/seanbright/resolve-shadow-warnings/CREDITS Mon May 19 18:08:04 2008
@@ -19,6 +19,9 @@
John Todd, TalkPlus, Inc. and JR Richardson, Ntegrated Solutions. - for funding
the development of SIP Session Timers support.
+
+Omnitor AB, Gunnar Hellström, for funding work with videocaps, T.140 RED,
+originate with video/text and many more contributions.
=== WISHLIST CONTRIBUTERS ===
Jeremy McNamara - SpeeX support
Modified: team/seanbright/resolve-shadow-warnings/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/UPGRADE.txt?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/UPGRADE.txt (original)
+++ team/seanbright/resolve-shadow-warnings/UPGRADE.txt Mon May 19 18:08:04 2008
@@ -75,7 +75,7 @@
Examples of situations that would require this option are web interfaces to
voicemail or an email client in the case of using IMAP storage.
* The externnotify script should accept an additional (last) parameter
- containing the string "URGENT" if there are new urgent messages in the INBOX.
+ containing the number of urgent messages in the INBOX.
Applications:
Modified: team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_chanspy.c Mon May 19 18:08:04 2008
@@ -64,7 +64,8 @@
" - Dialing a series of digits followed by # builds a channel name to append\n"
" to 'chanprefix'. For example, executing ChanSpy(Agent) and then dialing\n"
" the digits '1234#' while spying will begin spying on the channel\n"
-" 'Agent/1234'.\n"
+" 'Agent/1234'. Note that this feature will be overriden if the 'd' option\n"
+" is used\n"
" Note: The X option supersedes the three features above in that if a valid\n"
" single digit extension exists in the correct context ChanSpy will\n"
" exit to it. This also disables choosing a channel based on 'chanprefix'\n"
@@ -73,6 +74,11 @@
" b - Only spy on channels involved in a bridged call.\n"
" B - Instead of whispering on a single channel barge in on both\n"
" channels involved in the call.\n"
+" d - Override the typical numeric DTMF functionality and instead\n"
+" use DTMF to switch between spy modes.\n"
+" 4 = spy mode\n"
+" 5 = whisper mode\n"
+" 6 = barge mode\n"
" g(grp) - Only spy on channels in which one or more of the groups \n"
" listed in 'grp' matches one or more groups from the\n"
" SPYGROUP variable set on the channel to be spied upon.\n"
@@ -126,6 +132,13 @@
" exit to it.\n"
" Options:\n"
" b - Only spy on channels involved in a bridged call.\n"
+" B - Instead of whispering on a single channel barge in on both\n"
+" channels involved in the call.\n"
+" d - Override the typical numeric DTMF functionality and instead\n"
+" use DTMF to switch between spy modes.\n"
+" 4 = spy mode\n"
+" 5 = whisper mode\n"
+" 6 = barge mode\n"
" g(grp) - Only spy on channels in which one or more of the groups \n"
" listed in 'grp' matches one or more groups from the\n"
" SPYGROUP variable set on the channel to be spied upon.\n"
@@ -162,19 +175,20 @@
;
enum {
- OPTION_QUIET = (1 << 0), /* Quiet, no announcement */
- OPTION_BRIDGED = (1 << 1), /* Only look at bridged calls */
- OPTION_VOLUME = (1 << 2), /* Specify initial volume */
- OPTION_GROUP = (1 << 3), /* Only look at channels in group */
- OPTION_RECORD = (1 << 4),
- OPTION_WHISPER = (1 << 5),
- OPTION_PRIVATE = (1 << 6), /* Private Whisper mode */
- OPTION_READONLY = (1 << 7), /* Don't mix the two channels */
- OPTION_EXIT = (1 << 8), /* Exit to a valid single digit extension */
- OPTION_ENFORCED = (1 << 9), /* Enforced mode */
- OPTION_NOTECH = (1 << 10), /* Skip technology name playback */
- OPTION_BARGE = (1 << 11), /* Barge mode (whisper to both channels) */
- OPTION_NAME = (1 << 12), /* Say the name of the person on whom we will spy */
+ OPTION_QUIET = (1 << 0), /* Quiet, no announcement */
+ OPTION_BRIDGED = (1 << 1), /* Only look at bridged calls */
+ OPTION_VOLUME = (1 << 2), /* Specify initial volume */
+ OPTION_GROUP = (1 << 3), /* Only look at channels in group */
+ OPTION_RECORD = (1 << 4),
+ OPTION_WHISPER = (1 << 5),
+ OPTION_PRIVATE = (1 << 6), /* Private Whisper mode */
+ OPTION_READONLY = (1 << 7), /* Don't mix the two channels */
+ OPTION_EXIT = (1 << 8), /* Exit to a valid single digit extension */
+ OPTION_ENFORCED = (1 << 9), /* Enforced mode */
+ OPTION_NOTECH = (1 << 10), /* Skip technology name playback */
+ OPTION_BARGE = (1 << 11), /* Barge mode (whisper to both channels) */
+ OPTION_NAME = (1 << 12), /* Say the name of the person on whom we will spy */
+ OPTION_DTMF_SWITCH_MODES = (1 << 13), /*Allow numeric DTMF to switch between chanspy modes */
} chanspy_opt_flags;
enum {
@@ -200,6 +214,7 @@
AST_APP_OPTION('X', OPTION_EXIT),
AST_APP_OPTION('s', OPTION_NOTECH),
AST_APP_OPTION_ARG('n', OPTION_NAME, OPT_ARG_NAME),
+ AST_APP_OPTION('d', OPTION_DTMF_SWITCH_MODES),
});
@@ -281,8 +296,22 @@
ast_mutex_t lock;
};
+static void change_spy_mode(const char digit, struct ast_flags *flags)
+{
+ if (digit == '4') {
+ ast_clear_flag(flags, OPTION_WHISPER);
+ ast_clear_flag(flags, OPTION_BARGE);
+ } else if (digit == '5') {
+ ast_clear_flag(flags, OPTION_BARGE);
+ ast_set_flag(flags, OPTION_WHISPER);
+ } else if (digit == '6') {
+ ast_clear_flag(flags, OPTION_WHISPER);
+ ast_set_flag(flags, OPTION_BARGE);
+ }
+}
+
static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chanspy_ds,
- int *volfactor, int fd, const struct ast_flags *flags, char *exitcontext)
+ int *volfactor, int fd, struct ast_flags *flags, char *exitcontext)
{
struct chanspy_translation_helper csth;
int running = 0, res, x = 0;
@@ -327,15 +356,14 @@
return 0;
}
- if (ast_test_flag(flags, OPTION_BARGE)) {
- ast_audiohook_init(&csth.whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "ChanSpy");
- ast_audiohook_init(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "Chanspy");
- start_spying(spyee, spyer_name, &csth.whisper_audiohook); /* Unlocks spyee */
- start_spying(ast_bridged_channel(spyee), spyer_name, &csth.bridge_whisper_audiohook);
- } else if (ast_test_flag(flags, OPTION_WHISPER)) {
- ast_audiohook_init(&csth.whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "ChanSpy");
- start_spying(spyee, spyer_name, &csth.whisper_audiohook); /* Unlocks spyee */
- }
+ ast_channel_lock(chan);
+ ast_set_flag(chan, AST_FLAG_END_DTMF_ONLY);
+ ast_channel_unlock(chan);
+
+ ast_audiohook_init(&csth.whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "ChanSpy");
+ ast_audiohook_init(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "Chanspy");
+ start_spying(spyee, spyer_name, &csth.whisper_audiohook); /* Unlocks spyee */
+ start_spying(ast_bridged_channel(spyee), spyer_name, &csth.bridge_whisper_audiohook);
ast_channel_unlock(spyee);
spyee = NULL;
@@ -417,7 +445,11 @@
ast_debug(2, "Exit by single digit did not work in chanspy. Extension %s does not exist in context %s\n", tmp, exitcontext);
}
} else if (res >= '0' && res <= '9') {
- inp[x++] = res;
+ if (ast_test_flag(flags, OPTION_DTMF_SWITCH_MODES)) {
+ change_spy_mode(res, flags);
+ } else {
+ inp[x++] = res;
+ }
}
if (res == '*') {
@@ -445,21 +477,18 @@
else
ast_deactivate_generator(chan);
- if (ast_test_flag(flags, OPTION_BARGE)) {
- ast_audiohook_lock(&csth.whisper_audiohook);
- ast_audiohook_detach(&csth.whisper_audiohook);
- ast_audiohook_unlock(&csth.whisper_audiohook);
- ast_audiohook_destroy(&csth.whisper_audiohook);
- ast_audiohook_lock(&csth.bridge_whisper_audiohook);
- ast_audiohook_detach(&csth.bridge_whisper_audiohook);
- ast_audiohook_unlock(&csth.bridge_whisper_audiohook);
- ast_audiohook_destroy(&csth.bridge_whisper_audiohook);
- } else if (ast_test_flag(flags, OPTION_WHISPER)) {
- ast_audiohook_lock(&csth.whisper_audiohook);
- ast_audiohook_detach(&csth.whisper_audiohook);
- ast_audiohook_unlock(&csth.whisper_audiohook);
- ast_audiohook_destroy(&csth.whisper_audiohook);
- }
+ ast_channel_lock(chan);
+ ast_clear_flag(chan, AST_FLAG_END_DTMF_ONLY);
+ ast_channel_unlock(chan);
+
+ ast_audiohook_lock(&csth.whisper_audiohook);
+ ast_audiohook_detach(&csth.whisper_audiohook);
+ ast_audiohook_unlock(&csth.whisper_audiohook);
+ ast_audiohook_destroy(&csth.whisper_audiohook);
+ ast_audiohook_lock(&csth.bridge_whisper_audiohook);
+ ast_audiohook_detach(&csth.bridge_whisper_audiohook);
+ ast_audiohook_unlock(&csth.bridge_whisper_audiohook);
+ ast_audiohook_destroy(&csth.bridge_whisper_audiohook);
ast_audiohook_lock(&csth.spy_audiohook);
ast_audiohook_detach(&csth.spy_audiohook);
@@ -580,7 +609,7 @@
return setup_chanspy_ds(next, chanspy_ds);
}
-static int common_exec(struct ast_channel *chan, const struct ast_flags *flags,
+static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
int volfactor, const int fd, const char *mygroup, const char *myenforced,
const char *spec, const char *exten, const char *context, const char *mailbox,
const char *name_context)
Modified: team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_externalivr.c Mon May 19 18:08:04 2008
@@ -481,6 +481,7 @@
struct ast_channel *rchan;
char *command;
int res = -1;
+ int test_available_fd = -1;
FILE *eivr_commands = NULL;
FILE *eivr_errors = NULL;
@@ -500,6 +501,8 @@
goto exit;
}
}
+
+ test_available_fd = open("/dev/null", O_RDONLY);
setvbuf(eivr_events, NULL, _IONBF, 0);
setvbuf(eivr_commands, NULL, _IONBF, 0);
@@ -574,7 +577,7 @@
} else if (ready_fd == eivr_commands_fd) {
char input[1024];
- if (exception || feof(eivr_commands)) {
+ if (exception || (dup2(eivr_commands_fd, test_available_fd) == -1) || feof(eivr_commands)) {
ast_chan_log(LOG_WARNING, chan, "Child process went away\n");
res = -1;
break;
@@ -685,6 +688,10 @@
exit:
+ if (test_available_fd > -1) {
+ close(test_available_fd);
+ }
+
if (eivr_events)
fclose(eivr_events);
Modified: team/seanbright/resolve-shadow-warnings/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/resolve-shadow-warnings/apps/app_rpt.c?view=diff&rev=117254&r1=117253&r2=117254
==============================================================================
--- team/seanbright/resolve-shadow-warnings/apps/app_rpt.c (original)
+++ team/seanbright/resolve-shadow-warnings/apps/app_rpt.c Mon May 19 18:08:04 2008
@@ -1,7 +1,9 @@
+#define NEW_ASTERISK
+/* #define OLD_ASTERISK */
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 2002-2005, Jim Dixon, WB6NIL
+ * Copyright (C) 2002-2008, Jim Dixon, WB6NIL
*
* Jim Dixon, WB6NIL <jim at lambdatel.com>
* Serious contributions by Steve RoDgers, WA6ZFT <hwstar at rodgers.sdcoxmail.com>
@@ -16,16 +18,16 @@
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree.
*/
-
/*! \file
*
* \brief Radio Repeater / Remote Base program
- * version 0.48 06/13/06
+ * version 0.115 5/12/08 2055 EDT
*
* \author Jim Dixon, WB6NIL <jim at lambdatel.com>
*
* \note Serious contributions by Steve RoDgers, WA6ZFT <hwstar at rodgers.sdcoxmail.com>
- *
+ * \note Steven Henke, W9SH, <w9sh at arrl.net> added a few features here and there.
+ *
* See http://www.zapatatelephony.org/app_rpt.html
*
*
@@ -51,18 +53,43 @@
*
* status cmds:
*
- * 1 - Force ID
- * 2 - Give Time of Day
- * 3 - Give software Version
+ * 1 - Force ID (global)
+ * 2 - Give Time of Day (global)
+ * 3 - Give software Version (global)
+ * 11 - Force ID (local only)
+ * 12 - Give Time of Day (local only)
*
* cop (control operator) cmds:
*
* 1 - System warm boot
* 2 - System enable
* 3 - System disable
- * 4 - Test Tone On
+ * 4 - Test Tone On/Off
* 5 - Dump System Variables on Console (debug)
* 6 - PTT (phone mode only)
+ * 7 - Time out timer enable
+ * 8 - Time out timer disable
+ * 9 - Autopatch enable
+ * 10 - Autopatch disable
+ * 11 - Link enable
+ * 12 - Link disable
+ * 13 - Query System State
+ * 14 - Change System State
+ * 15 - Scheduler Enable
+ * 16 - Scheduler Disable
+ * 17 - User functions (time, id, etc) enable
+ * 18 - User functions (time, id, etc) disable
+ * 19 - Select alternate hang timer
+ * 20 - Select standard hang timer
+ * 21 - Enable Parrot Mode
+ * 22 - Disable Parrot Mode
+ * 23 - Birdbath (Current Parrot Cleanup/Flush)
+ * 24 - Flush all telemetry
+ * 25 - Query last node un-keyed
+ * 26 - Query all nodes keyed/unkeyed
+ * 30 - Recall Memory Setting in Attached Xcvr
+ * 31 - Channel Selector for Parallel Programmed Xcvr
+ * 32 - Touchtone pad test: command + Digit string + # to playback all digits pressed
*
* ilink cmds:
*
@@ -72,6 +99,12 @@
* 4 - Enter command mode on specified link
* 5 - System status
* 6 - Disconnect all links
+ * 11 - Disconnect a previously permanently connected link
+ * 12 - Permanently connect specified link -- monitor only
+ * 13 - Permanently connect specified link -- tranceive
[... 32808 lines stripped ...]
More information about the asterisk-commits
mailing list