[svn-commits] bbryant: branch bbryant/rotation r128726 - in /team/bbryant/rotation: ./ apps...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jul 7 14:59:15 CDT 2008
Author: bbryant
Date: Mon Jul 7 14:59:13 2008
New Revision: 128726
URL: http://svn.digium.com/view/asterisk?view=rev&rev=128726
Log:
resolve conflict on branch properties
Added:
team/bbryant/rotation/apps/app_dahdibarge.c
- copied unchanged from r128690, trunk/apps/app_dahdibarge.c
team/bbryant/rotation/apps/app_dahdiras.c
- copied unchanged from r128690, trunk/apps/app_dahdiras.c
team/bbryant/rotation/apps/app_dahdiscan.c
- copied unchanged from r128690, trunk/apps/app_dahdiscan.c
team/bbryant/rotation/apps/app_fax.c
- copied unchanged from r128690, trunk/apps/app_fax.c
team/bbryant/rotation/channels/chan_dahdi.c
- copied unchanged from r128690, trunk/channels/chan_dahdi.c
team/bbryant/rotation/channels/chan_phone.h
- copied unchanged from r128690, trunk/channels/chan_phone.h
team/bbryant/rotation/codecs/codec_dahdi.c
- copied unchanged from r128690, trunk/codecs/codec_dahdi.c
team/bbryant/rotation/configs/ais.conf.sample
- copied unchanged from r128690, trunk/configs/ais.conf.sample
team/bbryant/rotation/configs/chan_dahdi.conf.sample
- copied unchanged from r128690, trunk/configs/chan_dahdi.conf.sample
team/bbryant/rotation/doc/distributed_devstate.txt
- copied unchanged from r128690, trunk/doc/distributed_devstate.txt
team/bbryant/rotation/doc/lang/
- copied from r128690, trunk/doc/lang/
team/bbryant/rotation/doc/lang/hebrew.ods
- copied unchanged from r128690, trunk/doc/lang/hebrew.ods
team/bbryant/rotation/doc/realtimetext.txt
- copied unchanged from r128690, trunk/doc/realtimetext.txt
team/bbryant/rotation/doc/video_console.txt
- copied unchanged from r128690, trunk/doc/video_console.txt
team/bbryant/rotation/include/asterisk/timing.h
- copied unchanged from r128690, trunk/include/asterisk/timing.h
team/bbryant/rotation/main/timing.c
- copied unchanged from r128690, trunk/main/timing.c
team/bbryant/rotation/res/ais/
- copied from r128690, trunk/res/ais/
team/bbryant/rotation/res/ais/ais.h
- copied unchanged from r128690, trunk/res/ais/ais.h
team/bbryant/rotation/res/ais/amf.c
- copied unchanged from r128690, trunk/res/ais/amf.c
team/bbryant/rotation/res/ais/ckpt.c
- copied unchanged from r128690, trunk/res/ais/ckpt.c
team/bbryant/rotation/res/ais/clm.c
- copied unchanged from r128690, trunk/res/ais/clm.c
team/bbryant/rotation/res/ais/evt.c
- copied unchanged from r128690, trunk/res/ais/evt.c
team/bbryant/rotation/res/ais/lck.c
- copied unchanged from r128690, trunk/res/ais/lck.c
team/bbryant/rotation/res/res_ais.c
- copied unchanged from r128690, trunk/res/res_ais.c
team/bbryant/rotation/res/res_curl.c
- copied unchanged from r128690, trunk/res/res_curl.c
team/bbryant/rotation/res/res_timing_dahdi.c
- copied unchanged from r128690, trunk/res/res_timing_dahdi.c
team/bbryant/rotation/res/res_timing_pthread.c
- copied unchanged from r128690, trunk/res/res_timing_pthread.c
Removed:
team/bbryant/rotation/apps/app_zapbarge.c
team/bbryant/rotation/apps/app_zapras.c
team/bbryant/rotation/apps/app_zapscan.c
team/bbryant/rotation/channels/DialTone.h
team/bbryant/rotation/channels/chan_zap.c
team/bbryant/rotation/codecs/codec_zap.c
team/bbryant/rotation/configs/pbx_realtime.conf
team/bbryant/rotation/configs/zapata.conf.sample
team/bbryant/rotation/include/asterisk/zapata.h
Modified:
team/bbryant/rotation/CHANGES
team/bbryant/rotation/Makefile
team/bbryant/rotation/README
team/bbryant/rotation/UPGRADE.txt
team/bbryant/rotation/acinclude.m4
team/bbryant/rotation/apps/Makefile
team/bbryant/rotation/apps/app_chanisavail.c
team/bbryant/rotation/apps/app_channelredirect.c
team/bbryant/rotation/apps/app_chanspy.c
team/bbryant/rotation/apps/app_dial.c
team/bbryant/rotation/apps/app_directory.c
team/bbryant/rotation/apps/app_disa.c
team/bbryant/rotation/apps/app_exec.c
team/bbryant/rotation/apps/app_externalivr.c
team/bbryant/rotation/apps/app_flash.c
team/bbryant/rotation/apps/app_forkcdr.c
team/bbryant/rotation/apps/app_getcpeid.c
team/bbryant/rotation/apps/app_meetme.c
team/bbryant/rotation/apps/app_milliwatt.c
team/bbryant/rotation/apps/app_minivm.c
team/bbryant/rotation/apps/app_page.c
team/bbryant/rotation/apps/app_parkandannounce.c
team/bbryant/rotation/apps/app_privacy.c
team/bbryant/rotation/apps/app_queue.c
team/bbryant/rotation/apps/app_rpt.c
team/bbryant/rotation/apps/app_stack.c
team/bbryant/rotation/apps/app_talkdetect.c
team/bbryant/rotation/apps/app_voicemail.c
team/bbryant/rotation/build_tools/cflags.xml
team/bbryant/rotation/build_tools/menuselect-deps.in
team/bbryant/rotation/build_tools/strip_nonapi
team/bbryant/rotation/cdr/cdr_csv.c
team/bbryant/rotation/cdr/cdr_pgsql.c
team/bbryant/rotation/cdr/cdr_tds.c
team/bbryant/rotation/channels/chan_agent.c
team/bbryant/rotation/channels/chan_alsa.c
team/bbryant/rotation/channels/chan_console.c
team/bbryant/rotation/channels/chan_features.c
team/bbryant/rotation/channels/chan_gtalk.c
team/bbryant/rotation/channels/chan_h323.c
team/bbryant/rotation/channels/chan_iax2.c
team/bbryant/rotation/channels/chan_jingle.c
team/bbryant/rotation/channels/chan_local.c
team/bbryant/rotation/channels/chan_mgcp.c
team/bbryant/rotation/channels/chan_oss.c
team/bbryant/rotation/channels/chan_phone.c
team/bbryant/rotation/channels/chan_sip.c
team/bbryant/rotation/channels/chan_skinny.c
team/bbryant/rotation/channels/chan_unistim.c
team/bbryant/rotation/channels/console_board.c
team/bbryant/rotation/channels/console_gui.c
team/bbryant/rotation/channels/console_video.c
team/bbryant/rotation/channels/console_video.h
team/bbryant/rotation/channels/misdn/isdn_lib.c
team/bbryant/rotation/channels/misdn/isdn_lib.h
team/bbryant/rotation/channels/vcodecs.c
team/bbryant/rotation/channels/vgrabbers.c
team/bbryant/rotation/codecs/codec_a_mu.c
team/bbryant/rotation/codecs/codec_adpcm.c
team/bbryant/rotation/codecs/codec_alaw.c
team/bbryant/rotation/codecs/codec_g722.c
team/bbryant/rotation/codecs/codec_g726.c
team/bbryant/rotation/codecs/codec_gsm.c
team/bbryant/rotation/codecs/codec_ilbc.c
team/bbryant/rotation/codecs/codec_lpc10.c
team/bbryant/rotation/codecs/codec_resample.c
team/bbryant/rotation/codecs/codec_speex.c
team/bbryant/rotation/codecs/codec_ulaw.c
team/bbryant/rotation/configs/agents.conf.sample
team/bbryant/rotation/configs/dundi.conf.sample
team/bbryant/rotation/configs/extensions.ael.sample
team/bbryant/rotation/configs/extensions.conf.sample
team/bbryant/rotation/configs/extensions.lua.sample
team/bbryant/rotation/configs/http.conf.sample
team/bbryant/rotation/configs/meetme.conf.sample
team/bbryant/rotation/configs/modules.conf.sample
team/bbryant/rotation/configs/muted.conf.sample
team/bbryant/rotation/configs/queues.conf.sample
team/bbryant/rotation/configs/res_pgsql.conf.sample
team/bbryant/rotation/configs/rpt.conf.sample
team/bbryant/rotation/configs/sip.conf.sample
team/bbryant/rotation/configs/sla.conf.sample
team/bbryant/rotation/configs/smdi.conf.sample
team/bbryant/rotation/configs/users.conf.sample
team/bbryant/rotation/configs/vpb.conf.sample
team/bbryant/rotation/configure
team/bbryant/rotation/configure.ac
team/bbryant/rotation/contrib/init.d/rc.debian.asterisk
team/bbryant/rotation/contrib/init.d/rc.gentoo.asterisk
team/bbryant/rotation/contrib/init.d/rc.mandrake.asterisk
team/bbryant/rotation/contrib/init.d/rc.mandrake.zaptel
team/bbryant/rotation/contrib/init.d/rc.redhat.asterisk
team/bbryant/rotation/contrib/init.d/rc.slackware.asterisk
team/bbryant/rotation/contrib/init.d/rc.suse.asterisk
team/bbryant/rotation/contrib/scripts/astcli
team/bbryant/rotation/contrib/scripts/asterisk.ldap-schema
team/bbryant/rotation/contrib/scripts/asterisk.ldif
team/bbryant/rotation/contrib/scripts/autosupport
team/bbryant/rotation/contrib/scripts/dbsep.cgi
team/bbryant/rotation/contrib/scripts/get_ilbc_source.sh
team/bbryant/rotation/contrib/scripts/loadtest.tcl
team/bbryant/rotation/contrib/scripts/realtime_pgsql.sql
team/bbryant/rotation/contrib/scripts/safe_asterisk
team/bbryant/rotation/contrib/utils/zones2indications.c
team/bbryant/rotation/doc/CODING-GUIDELINES
team/bbryant/rotation/doc/asterisk-mib.txt
team/bbryant/rotation/doc/asterisk.8
team/bbryant/rotation/doc/asterisk.sgml
team/bbryant/rotation/doc/backtrace.txt
team/bbryant/rotation/doc/digium-mib.txt
team/bbryant/rotation/doc/janitor-projects.txt
team/bbryant/rotation/doc/manager_1_1.txt
team/bbryant/rotation/doc/osp.txt
team/bbryant/rotation/doc/siptls.txt
team/bbryant/rotation/doc/sms.txt
team/bbryant/rotation/doc/ss7.txt
team/bbryant/rotation/doc/tex/ael.tex
team/bbryant/rotation/doc/tex/app-sms.tex
team/bbryant/rotation/doc/tex/asterisk-conf.tex
team/bbryant/rotation/doc/tex/backtrace.tex
team/bbryant/rotation/doc/tex/channelvariables.tex
team/bbryant/rotation/doc/tex/configuration.tex
team/bbryant/rotation/doc/tex/enum.tex
team/bbryant/rotation/doc/tex/extensions.tex
team/bbryant/rotation/doc/tex/freetds.tex
team/bbryant/rotation/doc/tex/hardware.tex
team/bbryant/rotation/doc/tex/localchannel.tex
team/bbryant/rotation/doc/tex/manager.tex
team/bbryant/rotation/doc/tex/privacy.tex
team/bbryant/rotation/doc/tex/queuelog.tex
team/bbryant/rotation/doc/tex/queues-with-callback-members.tex
team/bbryant/rotation/doc/tex/security.tex
team/bbryant/rotation/doc/tex/sla.tex
team/bbryant/rotation/doc/video.txt
team/bbryant/rotation/funcs/func_cdr.c
team/bbryant/rotation/funcs/func_channel.c
team/bbryant/rotation/funcs/func_curl.c
team/bbryant/rotation/funcs/func_devstate.c
team/bbryant/rotation/funcs/func_realtime.c
team/bbryant/rotation/images/kpad2.jpg
team/bbryant/rotation/include/asterisk/_private.h
team/bbryant/rotation/include/asterisk/agi.h
team/bbryant/rotation/include/asterisk/app.h
team/bbryant/rotation/include/asterisk/astobj2.h
team/bbryant/rotation/include/asterisk/autoconfig.h.in
team/bbryant/rotation/include/asterisk/callerid.h
team/bbryant/rotation/include/asterisk/cdr.h
team/bbryant/rotation/include/asterisk/channel.h
team/bbryant/rotation/include/asterisk/compiler.h
team/bbryant/rotation/include/asterisk/config.h
team/bbryant/rotation/include/asterisk/devicestate.h
team/bbryant/rotation/include/asterisk/dnsmgr.h
team/bbryant/rotation/include/asterisk/doxyref.h
team/bbryant/rotation/include/asterisk/dsp.h
team/bbryant/rotation/include/asterisk/dundi.h
team/bbryant/rotation/include/asterisk/event.h
team/bbryant/rotation/include/asterisk/event_defs.h
team/bbryant/rotation/include/asterisk/frame.h
team/bbryant/rotation/include/asterisk/http.h
team/bbryant/rotation/include/asterisk/jabber.h
team/bbryant/rotation/include/asterisk/lock.h
team/bbryant/rotation/include/asterisk/logger.h
team/bbryant/rotation/include/asterisk/network.h
team/bbryant/rotation/include/asterisk/options.h
team/bbryant/rotation/include/asterisk/pbx.h
team/bbryant/rotation/include/asterisk/res_odbc.h
team/bbryant/rotation/include/asterisk/rtp.h
team/bbryant/rotation/include/asterisk/sched.h
team/bbryant/rotation/include/asterisk/slinfactory.h
team/bbryant/rotation/include/asterisk/strings.h
team/bbryant/rotation/include/asterisk/tcptls.h
team/bbryant/rotation/include/asterisk/threadstorage.h
team/bbryant/rotation/include/asterisk/time.h
team/bbryant/rotation/include/asterisk/translate.h
team/bbryant/rotation/include/asterisk/utils.h
team/bbryant/rotation/main/Makefile
team/bbryant/rotation/main/abstract_jb.c
team/bbryant/rotation/main/acl.c
team/bbryant/rotation/main/app.c
team/bbryant/rotation/main/ast_expr2.fl
team/bbryant/rotation/main/ast_expr2f.c
team/bbryant/rotation/main/asterisk.c
team/bbryant/rotation/main/astobj2.c
team/bbryant/rotation/main/autoservice.c
team/bbryant/rotation/main/callerid.c
team/bbryant/rotation/main/cdr.c
team/bbryant/rotation/main/channel.c
team/bbryant/rotation/main/cli.c
team/bbryant/rotation/main/config.c
team/bbryant/rotation/main/devicestate.c
team/bbryant/rotation/main/dial.c
team/bbryant/rotation/main/dsp.c
team/bbryant/rotation/main/editline/np/vis.c
team/bbryant/rotation/main/event.c
team/bbryant/rotation/main/features.c
team/bbryant/rotation/main/file.c
team/bbryant/rotation/main/http.c
team/bbryant/rotation/main/libresample/include/libresample.h
team/bbryant/rotation/main/loader.c
team/bbryant/rotation/main/logger.c
team/bbryant/rotation/main/manager.c
team/bbryant/rotation/main/netsock.c
team/bbryant/rotation/main/pbx.c
team/bbryant/rotation/main/rtp.c
team/bbryant/rotation/main/say.c
team/bbryant/rotation/main/sched.c
team/bbryant/rotation/main/taskprocessor.c
team/bbryant/rotation/main/tcptls.c
team/bbryant/rotation/main/translate.c
team/bbryant/rotation/main/utils.c
team/bbryant/rotation/makeopts.in
team/bbryant/rotation/pbx/Makefile
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-ntest10
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test1
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test15
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test18
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test3
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test5
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-test8
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-vtest13
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-vtest17
team/bbryant/rotation/pbx/ael/ael-test/ref.ael-vtest21
team/bbryant/rotation/pbx/dundi-parser.c
team/bbryant/rotation/pbx/dundi-parser.h
team/bbryant/rotation/pbx/pbx_config.c
team/bbryant/rotation/pbx/pbx_dundi.c
team/bbryant/rotation/pbx/pbx_gtkconsole.c
team/bbryant/rotation/pbx/pbx_loopback.c
team/bbryant/rotation/pbx/pbx_lua.c
team/bbryant/rotation/pbx/pbx_realtime.c
team/bbryant/rotation/pbx/pbx_spool.c
team/bbryant/rotation/res/Makefile
team/bbryant/rotation/res/ael/pval.c
team/bbryant/rotation/res/res_agi.c
team/bbryant/rotation/res/res_config_curl.c
team/bbryant/rotation/res/res_config_ldap.c
team/bbryant/rotation/res/res_config_odbc.c
team/bbryant/rotation/res/res_config_pgsql.c
team/bbryant/rotation/res/res_jabber.c
team/bbryant/rotation/res/res_musiconhold.c
team/bbryant/rotation/res/res_odbc.c
team/bbryant/rotation/res/res_realtime.c
team/bbryant/rotation/utils/Makefile
team/bbryant/rotation/utils/ael_main.c
team/bbryant/rotation/utils/check_expr.c
team/bbryant/rotation/utils/conf2ael.c
team/bbryant/rotation/utils/extconf.c
Modified: team/bbryant/rotation/CHANGES
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/CHANGES?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/CHANGES (original)
+++ team/bbryant/rotation/CHANGES Mon Jul 7 14:59:13 2008
@@ -1,6 +1,17 @@
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1 -------------
------------------------------------------------------------------------------
+
+Device State Handling
+---------------------
+ * The event infrastructure in Asterisk got another big update to help support
+ distributed events. It currently supports distributed device state and
+ distributed Voicemail MWI (Message Waiting Indication). A new module has
+ been merged, res_ais, which facilitates communicating events between servers.
+ It uses the SAForum AIS (Service Availability Forum Application Interface
+ Specification) CLM (Cluster Management) and EVT (Event) services to maintain
+ a cluster of Asterisk servers, and to share events between them. For more
+ information on setting this up, see doc/distributed_devstate.txt.
Dialplan Functions
------------------
@@ -17,10 +28,12 @@
* TIMEOUT() has been modified to be accurate down to the millisecond.
* ENUM*() functions now include the following new options:
- 'u' returns the full URI and does not strip off the URI-scheme.
- - 's' triggers ISN specific rewriting
- - 'i' looks for branches into an Infrastructure ENUM tree
- - 'd' for a direct DNS lookup without any flipping of digits.
+ - 's' triggers ISN specific rewriting
+ - 'i' looks for branches into an Infrastructure ENUM tree
+ - 'd' for a direct DNS lookup without any flipping of digits.
* TXCIDNAME() has a new zone-suffix parameter (which defaults to 'e164.arpa')
+ * CHANNEL() now has options for the maximum, minimum, and standard or normal
+ deviation of jitter, rtt, and loss for a call using chan_sip.
Zaptel channel driver (chan_zap) Changes
----------------------------------------
@@ -77,6 +90,18 @@
complete documentation.
* ChanIsAvail has a new option, 'a', which will return all available channels instead
of just the first one if you give the function more then one channel to check.
+ * PrivacyManager now takes an option where you can specify a context where the
+ given number will be matched. This way you have more control over who is allowed
+ and it stops the people who blindly enter 10 digits.
+ * ForkCDR has new options: 'a' updates the answer time on the new CDR; 'A' locks
+ answer times, disposition, on orig CDR against updates; 'D' Copies the disposition
+ from the orig CDR to the new CDR after reset; 'e' sets the 'end' time on the
+ original CDR; 'R' prevents the new CDR from being reset; 's(var=val)' adds/changes
+ the 'var' variable on the original CDR; 'T' forces ast_cdr_end(), ast_cdr_answer(),
+ obey the LOCKED flag on cdr's in the chain, and also the ast_cdr_setvar() func.
+ * The Dial() application no longer copies the language used by the caller to the callee's
+ channel. If you desire for the caller's channel's language to be used for file playback
+ to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .
SIP Changes
-----------
@@ -98,6 +123,10 @@
* Added support for T140 RED - redundancy in T.140 to prevent text loss due to
lost packets.
* Added t38pt_usertpsource option. See sip.conf.sample for details.
+ * Added SIPnotify AMI command, for sending arbitrary SIP notify commands.
+ * 'sip show peers' and 'sip show users' display their entries sorted in
+ alphabetical order, as opposed to the order they were in, in the config
+ file or database.
IAX Changes
-----------
@@ -110,9 +139,9 @@
which shows which configuration files are in use.
* New CLI commands, "pri show version" and "ss7 show version" that will
display which version of libpri and libss7 are being used, respectively.
- A new API call was added so trunk will now have to be compiled against
- a versions of libpri and libss7 that have them or it will not know that
- these libraries exist.
+ A new API call was added so trunk will now have to be compiled against
+ a versions of libpri and libss7 that have them or it will not know that
+ these libraries exist.
DNS manager changes
-------------------
@@ -129,6 +158,14 @@
* res_odbc no longer has a limit of 1023 total possible unshared connections,
as some people were running into this limit. This limit has been increased
to 4.2 billion.
+
+Queue changes
+-------------
+ * The TRANSFER queue log entry now includes the the caller's original
+ position in the transferred-from queue.
+ * A new configuration option, "timeoutpriority" has been added. Please see the section labeled
+ "QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation of the option
+ as well as an explanation about timeout options in general
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0 -------------
@@ -345,6 +382,13 @@
that is behind it when queried. This is useful for transfer scenarios as the
actual channel will be transferred, not the Local channel.
+Agent channel changes
+----------------------
+ * The ackcall and endcall options are now supplemented with options acceptdtmf
+ and enddtmf. These allow for the DTMF keypress to be configurable. The options
+ default to their old hard-coded values ('#' and '*' respectively) so this should
+ not break any existing agent installations.
+
Zaptel channel driver (chan_zap) Changes
----------------------------------------
* SS7 support in chan_zap (via libss7 library)
@@ -437,10 +481,10 @@
a web interface of some kind).
* Added the support for marking messages as "urgent." There are two methods to accomplish
this. One is to pass the 'U' option to VoiceMail(). Another way to mark a message as urgent
- is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
- the message as urgent after he has recorded a voicemail by following the voice instructions.
- When listening to voicemails using VoiceMailMain urgent messages will be presented before other
- messages
+ is to specify "review=yes" in voicemail.conf. Doing this will cause allow the user to mark
+ the message as urgent after he has recorded a voicemail by following the voice instructions.
+ When listening to voicemails using VoiceMailMain urgent messages will be presented before other
+ messages
Queue changes
-------------
@@ -474,13 +518,18 @@
device state reported.
* New configuration option: randomperiodicannounce. If a list of periodic announcements is
specified by the periodic-announce option, then one will be chosen randomly when it is time
- to play a periodic announcment
+ to play a periodic announcment
* New configuration options: announce-position now takes two more values in addition to "yes" and
"no." Two new options, "limit" and "more," are allowed. These are tied to another option,
- announce-position-limit. By setting announce-position to "limit" callers will only have their
- position announced if their position is less than what is specified by announce-position-limit.
- If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
- will be told that their are more than announce-position-limit callers waiting.
+ announce-position-limit. By setting announce-position to "limit" callers will only have their
+ position announced if their position is less than what is specified by announce-position-limit.
+ If announce-position is set to "more" then callers beyond the position specified by announce-position-limit
+ will be told that their are more than announce-position-limit callers waiting.
+ * Two new queue log events have been added. An ADDMEMBER event will be logged
+ when a realtime queue member is added and a REMOVEMEMBER event will be logged
+ when a realtime queue member is removed. Since there is no calling channel associated
+ with these events, the string "REALTIME" is placed where the channel's unique id
+ is typically placed.
MeetMe Changes
--------------
@@ -623,6 +672,9 @@
-----------
* Added SPEECH commands for speech recognition. A complete listing can be found
using agi show.
+ * If app_stack is loaded, GOSUB is a native AGI command that may be used to
+ invoke subroutines in the dialplan. Note that calling EXEC with Gosub
+ does not behave as expected; the native command needs to be used, instead.
Logger changes
--------------
@@ -747,7 +799,9 @@
* iLBC source code no longer included (see UPGRADE.txt for details)
* If compiled with DETECT_DEADLOCKS enabled and if you have glibc, then if
deadlock is detected, a backtrace of the stack which led to the lock calls
- will be output to the CLI.
+ will be output to the CLI.
* If compiled with DEBUG_THREADS enabled and if you have glibc, then issuing
the "core show locks" CLI command will give lock information output as well
- as a backtrace of the stack which led to the lock calls.
+ as a backtrace of the stack which led to the lock calls.
+ * users.conf now sports an optional alternateexts property, which permits
+ allocation of additional extensions which will reach the specified user.
Modified: team/bbryant/rotation/Makefile
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/Makefile?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/Makefile (original)
+++ team/bbryant/rotation/Makefile Mon Jul 7 14:59:13 2008
@@ -73,12 +73,12 @@
export NOISY_BUILD # Used in Makefile.rules
export MENUSELECT_CFLAGS # Options selected in menuselect.
export AST_DEVMODE # Set to "yes" for additional compiler
- # and runtime checks
+ # and runtime checks
export SOLINK # linker flags for shared objects
export STATIC_BUILD # Additional cflags, set to -static
- # for static builds. Probably
- # should go directly to ASTLDFLAGS
+ # for static builds. Probably
+ # should go directly to ASTLDFLAGS
#--- paths to various commands
export CC
@@ -304,7 +304,7 @@
endif
ifeq ($(OSARCH),SunOS)
- SOLINK=-shared -fpic -L/usr/local/ssl/lib
+ SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
# comment to print directories during submakes
@@ -680,6 +680,7 @@
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
+ echo "dahdichanname = yes ; Set channel name as DAHDI" ; \
echo "" ; \
echo "; Changing the following lines may compromise your security." ; \
echo ";[files]" ; \
@@ -687,6 +688,11 @@
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
echo ";astctl = asterisk.ctl" ; \
+ echo "" ; \
+ echo "[compat]" ; \
+ echo "pbx_realtime=1.6" ; \
+ echo "res_agi=1.6" ; \
+ echo "app_set=1.6" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
@@ -820,8 +826,18 @@
nmenuconfig: nmenuselect
-menuselect: menuselect/menuselect menuselect-tree
- - at menuselect/menuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+menuselect: menuselect/cmenuselect menuselect/nmenuselect menuselect/gmenuselect
+ @if [ -x menuselect/nmenuselect ]; then \
+ $(MAKE) nmenuselect; \
+ elif [ -x menuselect/cmenuselect ]; then \
+ $(MAKE) cmenuselect; \
+ elif [ -x menuselect/gmenuselect ]; then \
+ $(MAKE) gmenuselect; \
+ else \
+ echo "No menuselect user interface found. Install ncurses,"; \
+ echo "newt or GTK libraries to build one and re-rerun"; \
+ echo "'make menuselect'."; \
+ fi
cmenuselect: menuselect/cmenuselect menuselect-tree
- at menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
@@ -836,7 +852,7 @@
MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
menuselect/menuselect: menuselect/makeopts
- $(MAKE_MENUSELECT)
+ $(MAKE_MENUSELECT) menuselect
menuselect/cmenuselect: menuselect/makeopts
$(MAKE_MENUSELECT) cmenuselect
@@ -856,8 +872,8 @@
@echo >> $@
@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+ @cat build_tools/cflags.xml >> $@
@for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
- @cat build_tools/cflags.xml >> $@
@if [ "${AST_DEVMODE}" = "yes" ]; then \
cat build_tools/cflags-devmode.xml >> $@; \
fi
Modified: team/bbryant/rotation/README
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/README?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/README (original)
+++ team/bbryant/rotation/README Mon Jul 7 14:59:13 2008
@@ -175,7 +175,7 @@
understand, and do not affect how it is actually parsed.
Entries of the form 'variable=value' set the value of some parameter in
-asterisk. For example, in zapata.conf, one might specify:
+asterisk. For example, in dahdi.conf, one might specify:
switchtype=national
Modified: team/bbryant/rotation/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/UPGRADE.txt?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/UPGRADE.txt (original)
+++ team/bbryant/rotation/UPGRADE.txt Mon Jul 7 14:59:13 2008
@@ -47,7 +47,14 @@
remove the obscene level of backslashing that was necessary for the dialplan
to work correctly in 1.4 and previous versions. This should make writing
dialplans less painful in the future, albeit with the pain of a one-time
- conversion.
+ conversion. If you would like to avoid this conversion immediately, set
+ pbx_realtime=1.4 in the [compat] section of asterisk.conf. After
+ transitioning, set pbx_realtime=1.6 in the same section.
+
+* For the same purpose as above, you may set res_agi=1.4 in the [compat]
+ section of asterisk.conf to continue to use the '|' delimiter in the EXEC
+ arguments of AGI applications. After converting to use the ',' delimiter,
+ change this option to res_agi=1.6.
* The logger.conf option 'rotatetimestamp' has been deprecated in favor of
'rotatestrategy'. This new option supports a 'rotate' strategy that more
@@ -120,6 +127,13 @@
correctly set up, it now is dependent on app_voicemail being compiled as well.
* The arguments in ExecIf changed a bit, to be more like other applications.
The syntax is now ExecIf(<cond>?appiftrue(args):appiffalse(args)).
+* The behavior of the Set application now depends upon a compatibility option,
+ set in asterisk.conf. To use the old 1.4 behavior, which allowed Set to take
+ multiple key/value pairs, set app_set=1.4 in [compat] in asterisk.conf. To
+ use the new behavior, which permits variables to be set with embedded commas,
+ set app_set=1.6 in [compat] in asterisk.conf. Note that you can have both
+ behaviors at the same time, if you switch to using MSet if you want the old
+ behavior.
Dialplan Functions:
@@ -135,6 +149,14 @@
* The cdr_odbc module now uses res_odbc to manage its connections. The
username and password parameters in cdr_odbc.conf, therefore, are no
longer used. The dsn parameter now points to an entry in res_odbc.conf.
+
+* The uniqueid field in the core Asterisk structure has been changed from a
+ maximum 31 character field to a 149 character field, to account for all
+ possible values the systemname prefix could be. In the past, if the
+ systemname was too long, the uniqueid would have been truncated.
+
+* The cdr_tds module now supports all versions of FreeTDS that contain
+ the db-lib frontend.
Formats:
@@ -162,6 +184,9 @@
sip:defaultuser at defaultip
The "username" setting still work, but is deprecated and will not work in
the next version of Asterisk.
+* SIP: All of the functionality in SIPCHANINFO() has been implemented in CHANNEL(),
+ and you should start using that function instead for retrieving information about
+ the channel in a technology-agnostic way.
* chan_local.c: the comma delimiter inside the channel name has been changed to a
semicolon, in order to make the Local channel driver compatible with the comma
@@ -198,12 +223,18 @@
output of the SIPpeers command.
* cdr_manager now reports at the "cdr" level, not at "call" You may need to
- change your manager.conf to add the level to existing AMI users, if they
- want to see the CDR events generated.
+ change your manager.conf to add the level to existing AMI users, if they
+ want to see the CDR events generated.
* The Originate command now requires the Originate write permission. For
- Originate with the Application parameter, you need the additional System
- privilege if you want to do anything that calls out to a subshell.
+ Originate with the Application parameter, you need the additional System
+ privilege if you want to do anything that calls out to a subshell.
+
+Queues:
+
+* New queue log events ADDMEMBER and REMOVEMEMBER have been added. Also, a
+ new value has been added to the TRANSFER event that indicates the caller's
+ original position in the queue they are being transfered from.
iLBC Codec:
Modified: team/bbryant/rotation/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/acinclude.m4?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/acinclude.m4 (original)
+++ team/bbryant/rotation/acinclude.m4 Mon Jul 7 14:59:13 2008
@@ -192,7 +192,7 @@
$1_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE} $6"
+ CPPFLAGS="${CPPFLAGS} ${$1_INCLUDE}"
AC_CHECK_HEADER([$4], [$1_HEADER_FOUND=1], [$1_HEADER_FOUND=0])
CPPFLAGS="${saved_cppflags}"
fi
Modified: team/bbryant/rotation/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/apps/Makefile?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/apps/Makefile (original)
+++ team/bbryant/rotation/apps/Makefile Mon Jul 7 14:59:13 2008
@@ -25,11 +25,6 @@
MENUSELECT_DEPENDS_app_directory+=$(MENUSELECT_DEPENDS_IMAP_STORAGE)
endif
-ifeq (SunOS,$(shell uname))
- MENUSELECT_DEPENDS_app_chanspy+=RT
- RT_LIB=-lrt
-endif
-
all: _all
include $(ASTTOPDIR)/Makefile.moddir_rules
Modified: team/bbryant/rotation/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/apps/app_chanisavail.c?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/apps/app_chanisavail.c (original)
+++ team/bbryant/rotation/apps/app_chanisavail.c Mon Jul 7 14:59:13 2008
@@ -75,7 +75,7 @@
);
if (ast_strlen_zero(data)) {
- ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n");
+ ast_log(LOG_WARNING, "ChanIsAvail requires an argument (DAHDI/1&DAHDI/2)\n");
return -1;
}
@@ -165,7 +165,8 @@
static int load_module(void)
{
- return ast_register_application(app, chanavail_exec, synopsis, descrip);
+ return ast_register_application(app, chanavail_exec, synopsis, descrip) ?
+ AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Check channel availability");
Modified: team/bbryant/rotation/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/apps/app_channelredirect.c?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/apps/app_channelredirect.c (original)
+++ team/bbryant/rotation/apps/app_channelredirect.c Mon Jul 7 14:59:13 2008
@@ -89,7 +89,8 @@
static int load_module(void)
{
- return ast_register_application(app, asyncgoto_exec, synopsis, descrip);
+ return ast_register_application(app, asyncgoto_exec, synopsis, descrip) ?
+ AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Redirects a given channel to a dialplan target");
Modified: team/bbryant/rotation/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/apps/app_chanspy.c?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/apps/app_chanspy.c (original)
+++ team/bbryant/rotation/apps/app_chanspy.c Mon Jul 7 14:59:13 2008
@@ -47,6 +47,7 @@
#include "asterisk/translate.h"
#include "asterisk/module.h"
#include "asterisk/lock.h"
+#include "asterisk/options.h"
#define AST_NAME_STRLEN 256
#define NUM_SPYGROUPS 128
@@ -321,7 +322,7 @@
char *name;
struct ast_frame *f;
struct ast_silence_generator *silgen = NULL;
- struct ast_channel *spyee = NULL;
+ struct ast_channel *spyee = NULL, *spyee_bridge = NULL;
const char *spyer_name;
ast_channel_lock(chan);
@@ -358,17 +359,24 @@
return 0;
}
+ ast_audiohook_init(&csth.whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "ChanSpy");
+ ast_audiohook_init(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "Chanspy");
+ if (start_spying(spyee, spyer_name, &csth.whisper_audiohook)) {
+ ast_log(LOG_WARNING, "Unable to attach whisper audiohook to spyee %s. Whisper mode disabled!\n", spyee->name);
+ }
+ if ((spyee_bridge = ast_bridged_channel(spyee))) {
+ ast_channel_lock(spyee_bridge);
+ if (start_spying(spyee_bridge, spyer_name, &csth.bridge_whisper_audiohook)) {
+ ast_log(LOG_WARNING, "Unable to attach barge audiohook on spyee %s. Barge mode disabled!\n", spyee->name);
+ }
+ ast_channel_unlock(spyee_bridge);
+ }
+ ast_channel_unlock(spyee);
+ spyee = NULL;
+
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;
csth.volfactor = *volfactor;
@@ -587,6 +595,7 @@
const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
{
struct ast_channel *next;
+ char channel_name[AST_CHANNEL_NAME];
redo:
if (!ast_strlen_zero(spec))
@@ -599,7 +608,8 @@
if (!next)
return NULL;
- if (!strncmp(next->name, "Zap/pseudo", 10)) {
+ snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name);
+ if (!strncmp(next->name, channel_name, 10)) {
ast_channel_unlock(next);
goto redo;
} else if (next == chan) {
Modified: team/bbryant/rotation/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/rotation/apps/app_dial.c?view=diff&rev=128726&r1=128725&r2=128726
==============================================================================
--- team/bbryant/rotation/apps/app_dial.c (original)
+++ team/bbryant/rotation/apps/app_dial.c Mon Jul 7 14:59:13 2008
@@ -171,8 +171,8 @@
" o - Specify that the CallerID that was present on the *calling* channel\n"
" be set as the CallerID on the *called* channel. This was the\n"
" behavior of Asterisk 1.0 and earlier.\n"
[... 36961 lines stripped ...]
More information about the svn-commits
mailing list