[asterisk-commits] simon.perreault: branch group/v6 r96837 - in /team/group/v6/trunk: ./ apps/ b...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Jan 7 09:12:46 CST 2008
Author: simon.perreault
Date: Mon Jan 7 09:12:44 2008
New Revision: 96837
URL: http://svn.digium.com/view/asterisk?view=rev&rev=96837
Log:
The svnmerge log got lost, so here goes...
Merge of stuff happening in trunk from 2007-12-10 to now.
P.S. I pledge 10$ toward svn:externals support in Git.
Added:
team/group/v6/trunk/apps/app_pickupchan.c
- copied unchanged from r96776, trunk/apps/app_pickupchan.c
team/group/v6/trunk/apps/app_waituntil.c
- copied unchanged from r96776, trunk/apps/app_waituntil.c
team/group/v6/trunk/build_tools/make_version_c
- copied unchanged from r96776, trunk/build_tools/make_version_c
team/group/v6/trunk/channels/chan_console.c
- copied unchanged from r96776, trunk/channels/chan_console.c
team/group/v6/trunk/channels/console_gui.c
- copied unchanged from r96776, trunk/channels/console_gui.c
team/group/v6/trunk/channels/console_video.c
- copied unchanged from r96776, trunk/channels/console_video.c
team/group/v6/trunk/channels/console_video.h
- copied unchanged from r96776, trunk/channels/console_video.h
team/group/v6/trunk/channels/vcodecs.c
- copied unchanged from r96776, trunk/channels/vcodecs.c
team/group/v6/trunk/channels/vgrabbers.c
- copied unchanged from r96776, trunk/channels/vgrabbers.c
team/group/v6/trunk/codecs/codec_resample.c
- copied unchanged from r96776, trunk/codecs/codec_resample.c
team/group/v6/trunk/codecs/slin_resample_ex.h
- copied unchanged from r96776, trunk/codecs/slin_resample_ex.h
team/group/v6/trunk/configs/console.conf.sample
- copied unchanged from r96776, trunk/configs/console.conf.sample
team/group/v6/trunk/configs/queuerules.conf.sample
- copied unchanged from r96776, trunk/configs/queuerules.conf.sample
team/group/v6/trunk/funcs/func_dialplan.c
- copied unchanged from r96776, trunk/funcs/func_dialplan.c
team/group/v6/trunk/images/kpad2.jpg
- copied unchanged from r96776, trunk/images/kpad2.jpg
team/group/v6/trunk/include/asterisk/libresample.h
- copied unchanged from r96776, trunk/include/asterisk/libresample.h
team/group/v6/trunk/include/asterisk/version.h
- copied unchanged from r96776, trunk/include/asterisk/version.h
team/group/v6/trunk/main/libresample/ (props changed)
- copied from r96776, trunk/main/libresample/
team/group/v6/trunk/main/libresample/LICENSE.txt
- copied unchanged from r96776, trunk/main/libresample/LICENSE.txt
team/group/v6/trunk/main/libresample/Makefile.asterisk
- copied unchanged from r96776, trunk/main/libresample/Makefile.asterisk
team/group/v6/trunk/main/libresample/Makefile.in
- copied unchanged from r96776, trunk/main/libresample/Makefile.in
team/group/v6/trunk/main/libresample/README.txt
- copied unchanged from r96776, trunk/main/libresample/README.txt
team/group/v6/trunk/main/libresample/config.guess
- copied unchanged from r96776, trunk/main/libresample/config.guess
team/group/v6/trunk/main/libresample/config.sub
- copied unchanged from r96776, trunk/main/libresample/config.sub
team/group/v6/trunk/main/libresample/configure
- copied unchanged from r96776, trunk/main/libresample/configure
team/group/v6/trunk/main/libresample/configure.in
- copied unchanged from r96776, trunk/main/libresample/configure.in
team/group/v6/trunk/main/libresample/include/
- copied from r96776, trunk/main/libresample/include/
team/group/v6/trunk/main/libresample/include/libresample.h
- copied unchanged from r96776, trunk/main/libresample/include/libresample.h
team/group/v6/trunk/main/libresample/install-sh
- copied unchanged from r96776, trunk/main/libresample/install-sh
team/group/v6/trunk/main/libresample/src/
- copied from r96776, trunk/main/libresample/src/
team/group/v6/trunk/main/libresample/src/configtemplate.h
- copied unchanged from r96776, trunk/main/libresample/src/configtemplate.h
team/group/v6/trunk/main/libresample/src/filterkit.c
- copied unchanged from r96776, trunk/main/libresample/src/filterkit.c
team/group/v6/trunk/main/libresample/src/filterkit.h
- copied unchanged from r96776, trunk/main/libresample/src/filterkit.h
team/group/v6/trunk/main/libresample/src/resample.c
- copied unchanged from r96776, trunk/main/libresample/src/resample.c
team/group/v6/trunk/main/libresample/src/resample_defs.h
- copied unchanged from r96776, trunk/main/libresample/src/resample_defs.h
team/group/v6/trunk/main/libresample/src/resamplesubs.c
- copied unchanged from r96776, trunk/main/libresample/src/resamplesubs.c
team/group/v6/trunk/main/libresample/tests/
- copied from r96776, trunk/main/libresample/tests/
team/group/v6/trunk/main/libresample/tests/compareresample.c
- copied unchanged from r96776, trunk/main/libresample/tests/compareresample.c
team/group/v6/trunk/main/libresample/tests/resample-sndfile.c
- copied unchanged from r96776, trunk/main/libresample/tests/resample-sndfile.c
team/group/v6/trunk/main/libresample/tests/testresample.c
- copied unchanged from r96776, trunk/main/libresample/tests/testresample.c
team/group/v6/trunk/main/libresample/win/
- copied from r96776, trunk/main/libresample/win/
team/group/v6/trunk/main/libresample/win/libresample.dsp
- copied unchanged from r96776, trunk/main/libresample/win/libresample.dsp
team/group/v6/trunk/main/libresample/win/libresample.vcproj
- copied unchanged from r96776, trunk/main/libresample/win/libresample.vcproj
team/group/v6/trunk/tests/ (props changed)
- copied from r96776, trunk/tests/
team/group/v6/trunk/tests/Makefile
- copied unchanged from r96776, trunk/tests/Makefile
team/group/v6/trunk/tests/test_skel.c
- copied unchanged from r96776, trunk/tests/test_skel.c
team/group/v6/trunk/utils/astcanary.c
- copied unchanged from r96776, trunk/utils/astcanary.c
Removed:
team/group/v6/trunk/build_tools/make_version_h
team/group/v6/trunk/build_tools/prep_moduledeps
team/group/v6/trunk/channels/answer.h
team/group/v6/trunk/channels/busy.h
team/group/v6/trunk/channels/gentone.c
team/group/v6/trunk/channels/ring10.h
team/group/v6/trunk/channels/ringtone.h
team/group/v6/trunk/configs/privacy.conf.sample
Modified:
team/group/v6/trunk/ (props changed)
team/group/v6/trunk/CHANGES
team/group/v6/trunk/CREDITS
team/group/v6/trunk/Makefile
team/group/v6/trunk/Makefile.moddir_rules
team/group/v6/trunk/UPGRADE.txt
team/group/v6/trunk/acinclude.m4
team/group/v6/trunk/apps/ (props changed)
team/group/v6/trunk/apps/Makefile
team/group/v6/trunk/apps/app_adsiprog.c
team/group/v6/trunk/apps/app_alarmreceiver.c
team/group/v6/trunk/apps/app_amd.c
team/group/v6/trunk/apps/app_authenticate.c
team/group/v6/trunk/apps/app_cdr.c
team/group/v6/trunk/apps/app_chanspy.c
team/group/v6/trunk/apps/app_controlplayback.c
team/group/v6/trunk/apps/app_dial.c
team/group/v6/trunk/apps/app_dictate.c
team/group/v6/trunk/apps/app_exec.c
team/group/v6/trunk/apps/app_ices.c
team/group/v6/trunk/apps/app_meetme.c
team/group/v6/trunk/apps/app_minivm.c
team/group/v6/trunk/apps/app_mixmonitor.c
team/group/v6/trunk/apps/app_osplookup.c
team/group/v6/trunk/apps/app_privacy.c
team/group/v6/trunk/apps/app_queue.c
team/group/v6/trunk/apps/app_rpt.c
team/group/v6/trunk/apps/app_voicemail.c
team/group/v6/trunk/apps/app_zapateller.c
team/group/v6/trunk/apps/app_zapbarge.c
team/group/v6/trunk/apps/app_zapras.c
team/group/v6/trunk/apps/app_zapscan.c
team/group/v6/trunk/build_tools/cflags.xml
team/group/v6/trunk/build_tools/embed_modules.xml
team/group/v6/trunk/build_tools/make_buildopts_h
team/group/v6/trunk/build_tools/make_defaults_h
team/group/v6/trunk/build_tools/make_version
team/group/v6/trunk/build_tools/menuselect-deps.in
team/group/v6/trunk/build_tools/prep_tarball
team/group/v6/trunk/build_tools/strip_nonapi
team/group/v6/trunk/cdr/ (props changed)
team/group/v6/trunk/cdr/Makefile
team/group/v6/trunk/cdr/cdr_adaptive_odbc.c
team/group/v6/trunk/cdr/cdr_csv.c
team/group/v6/trunk/channels/ (props changed)
team/group/v6/trunk/channels/DialTone.h
team/group/v6/trunk/channels/Makefile
team/group/v6/trunk/channels/chan_agent.c
team/group/v6/trunk/channels/chan_alsa.c
team/group/v6/trunk/channels/chan_h323.c
team/group/v6/trunk/channels/chan_iax2.c
team/group/v6/trunk/channels/chan_mgcp.c
team/group/v6/trunk/channels/chan_misdn.c
team/group/v6/trunk/channels/chan_oss.c
team/group/v6/trunk/channels/chan_sip.c
team/group/v6/trunk/channels/chan_skinny.c
team/group/v6/trunk/channels/chan_unistim.c
team/group/v6/trunk/channels/chan_zap.c
team/group/v6/trunk/channels/iax2-provision.c
team/group/v6/trunk/channels/iax2.h
team/group/v6/trunk/channels/misdn/chan_misdn_config.h
team/group/v6/trunk/channels/misdn/ie.c
team/group/v6/trunk/channels/misdn/isdn_lib.c
team/group/v6/trunk/channels/misdn/isdn_lib.h
team/group/v6/trunk/channels/misdn/isdn_msg_parser.c
team/group/v6/trunk/channels/misdn/portinfo.c
team/group/v6/trunk/codecs/ (props changed)
team/group/v6/trunk/codecs/Makefile
team/group/v6/trunk/codecs/codec_adpcm.c
team/group/v6/trunk/codecs/codec_alaw.c
team/group/v6/trunk/codecs/codec_g722.c
team/group/v6/trunk/codecs/codec_g726.c
team/group/v6/trunk/codecs/codec_gsm.c
team/group/v6/trunk/codecs/codec_lpc10.c
team/group/v6/trunk/codecs/codec_speex.c
team/group/v6/trunk/codecs/codec_ulaw.c
team/group/v6/trunk/codecs/codec_zap.c
team/group/v6/trunk/codecs/ilbc/iLBC_define.h
team/group/v6/trunk/configs/dundi.conf.sample
team/group/v6/trunk/configs/extconfig.conf.sample
team/group/v6/trunk/configs/h323.conf.sample
team/group/v6/trunk/configs/iax.conf.sample
team/group/v6/trunk/configs/iaxprov.conf.sample
team/group/v6/trunk/configs/mgcp.conf.sample
team/group/v6/trunk/configs/modules.conf.sample
team/group/v6/trunk/configs/oss.conf.sample
team/group/v6/trunk/configs/queues.conf.sample
team/group/v6/trunk/configs/sip.conf.sample
team/group/v6/trunk/configs/skinny.conf.sample
team/group/v6/trunk/configs/unistim.conf.sample
team/group/v6/trunk/configs/zapata.conf.sample
team/group/v6/trunk/configure
team/group/v6/trunk/configure.ac
team/group/v6/trunk/doc/CODING-GUIDELINES
team/group/v6/trunk/doc/asterisk.8
team/group/v6/trunk/doc/asterisk.sgml
team/group/v6/trunk/doc/manager_1_1.txt
team/group/v6/trunk/doc/tex/channelvariables.tex
team/group/v6/trunk/doc/tex/qos.tex
team/group/v6/trunk/formats/ (props changed)
team/group/v6/trunk/formats/Makefile
team/group/v6/trunk/funcs/ (props changed)
team/group/v6/trunk/funcs/Makefile
team/group/v6/trunk/funcs/func_env.c
team/group/v6/trunk/funcs/func_iconv.c
team/group/v6/trunk/funcs/func_odbc.c
team/group/v6/trunk/funcs/func_strings.c
team/group/v6/trunk/funcs/func_timeout.c
team/group/v6/trunk/funcs/func_version.c
team/group/v6/trunk/include/asterisk/ (props changed)
team/group/v6/trunk/include/asterisk/_private.h
team/group/v6/trunk/include/asterisk/adsi.h
team/group/v6/trunk/include/asterisk/ael_structs.h
team/group/v6/trunk/include/asterisk/aes.h
team/group/v6/trunk/include/asterisk/agi.h
team/group/v6/trunk/include/asterisk/alaw.h
team/group/v6/trunk/include/asterisk/app.h
team/group/v6/trunk/include/asterisk/ast_expr.h
team/group/v6/trunk/include/asterisk/astdb.h
team/group/v6/trunk/include/asterisk/astobj2.h
team/group/v6/trunk/include/asterisk/autoconfig.h.in
team/group/v6/trunk/include/asterisk/callerid.h
team/group/v6/trunk/include/asterisk/causes.h
team/group/v6/trunk/include/asterisk/cdr.h
team/group/v6/trunk/include/asterisk/channel.h
team/group/v6/trunk/include/asterisk/config.h
team/group/v6/trunk/include/asterisk/devicestate.h
team/group/v6/trunk/include/asterisk/doxyref.h
team/group/v6/trunk/include/asterisk/dsp.h
team/group/v6/trunk/include/asterisk/event.h
team/group/v6/trunk/include/asterisk/extconf.h
team/group/v6/trunk/include/asterisk/file.h
team/group/v6/trunk/include/asterisk/frame.h
team/group/v6/trunk/include/asterisk/hashtab.h
team/group/v6/trunk/include/asterisk/io.h
team/group/v6/trunk/include/asterisk/localtime.h
team/group/v6/trunk/include/asterisk/lock.h
team/group/v6/trunk/include/asterisk/logger.h
team/group/v6/trunk/include/asterisk/manager.h
team/group/v6/trunk/include/asterisk/mod_format.h
team/group/v6/trunk/include/asterisk/module.h
team/group/v6/trunk/include/asterisk/netsock.h
team/group/v6/trunk/include/asterisk/paths.h
team/group/v6/trunk/include/asterisk/rtp.h
team/group/v6/trunk/include/asterisk/strings.h
team/group/v6/trunk/include/asterisk/term.h
team/group/v6/trunk/include/asterisk/threadstorage.h
team/group/v6/trunk/include/asterisk/time.h
team/group/v6/trunk/include/asterisk/transcap.h
team/group/v6/trunk/include/asterisk/translate.h
team/group/v6/trunk/include/asterisk/udptl.h
team/group/v6/trunk/include/asterisk/ulaw.h
team/group/v6/trunk/include/asterisk/unaligned.h
team/group/v6/trunk/include/asterisk/zapata.h
team/group/v6/trunk/include/jitterbuf.h
team/group/v6/trunk/main/ (props changed)
team/group/v6/trunk/main/Makefile
team/group/v6/trunk/main/asterisk.c
team/group/v6/trunk/main/astmm.c
team/group/v6/trunk/main/autoservice.c
team/group/v6/trunk/main/channel.c
team/group/v6/trunk/main/config.c
team/group/v6/trunk/main/cygload.c
team/group/v6/trunk/main/db.c
team/group/v6/trunk/main/devicestate.c
team/group/v6/trunk/main/dial.c
team/group/v6/trunk/main/editline/sys.h
team/group/v6/trunk/main/event.c
team/group/v6/trunk/main/global_datastores.c
team/group/v6/trunk/main/http.c
team/group/v6/trunk/main/io.c
team/group/v6/trunk/main/loader.c
team/group/v6/trunk/main/logger.c
team/group/v6/trunk/main/manager.c
team/group/v6/trunk/main/netsock.c
team/group/v6/trunk/main/pbx.c
team/group/v6/trunk/main/rtp.c
team/group/v6/trunk/main/say.c
team/group/v6/trunk/main/srv.c
team/group/v6/trunk/main/translate.c
team/group/v6/trunk/main/udptl.c
team/group/v6/trunk/main/utils.c
team/group/v6/trunk/makeopts.in
team/group/v6/trunk/pbx/ (props changed)
team/group/v6/trunk/pbx/Makefile
team/group/v6/trunk/pbx/pbx_config.c
team/group/v6/trunk/pbx/pbx_dundi.c
team/group/v6/trunk/pbx/pbx_gtkconsole.c
team/group/v6/trunk/pbx/pbx_loopback.c
team/group/v6/trunk/pbx/pbx_realtime.c
team/group/v6/trunk/pbx/pbx_spool.c
team/group/v6/trunk/res/ (props changed)
team/group/v6/trunk/res/Makefile
team/group/v6/trunk/res/res_agi.c
team/group/v6/trunk/res/res_config_pgsql.c
team/group/v6/trunk/res/res_config_sqlite.c
team/group/v6/trunk/res/res_crypto.c
team/group/v6/trunk/res/res_features.c
team/group/v6/trunk/res/res_jabber.c
team/group/v6/trunk/res/res_monitor.c
team/group/v6/trunk/res/res_musiconhold.c
team/group/v6/trunk/res/snmp/agent.c
team/group/v6/trunk/utils/ (props changed)
team/group/v6/trunk/utils/Makefile
team/group/v6/trunk/utils/ael_main.c
team/group/v6/trunk/utils/check_expr.c
team/group/v6/trunk/utils/conf2ael.c
team/group/v6/trunk/utils/extconf.c
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 7 09:12:44 2008
@@ -1,1 +1,1 @@
-/trunk:1-92140
+/trunk:1-96796
Modified: team/group/v6/trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/CHANGES?view=diff&rev=96837&r1=96836&r2=96837
==============================================================================
--- team/group/v6/trunk/CHANGES (original)
+++ team/group/v6/trunk/CHANGES Mon Jan 7 09:12:44 2008
@@ -4,6 +4,9 @@
AMI - The manager (TCP/TLS/HTTP)
--------------------------------
+ * Manager has undergone a lot of changes, all of them documented
+ in doc/manager_1_1.txt
+ * Manager version has changed to 1.1
* Added a new action 'CoreShowChannels' to list currently defined channels
and some information about them.
* Added a new action 'SIPshowregistry' to list SIP registrations.
@@ -11,7 +14,7 @@
* Added the URI redirect option for the built-in HTTP server
* The output of CallerID in Manager events is now more consistent.
CallerIDNum is used for number and CallerIDName for name.
- * enable https support for builtin web server.
+ * Enable https support for builtin web server.
See configs/http.conf.sample for details.
* Added a new action, GetConfigJSON, which can return the contents of an
Asterisk configuration file in JSON format. This is intended to help
@@ -27,6 +30,11 @@
* Added 'DBDel' and 'DBDelTree' manager commands.
* cdr_manager now reports events via the "cdr" level, separating it from
the very verbose "call" level.
+ * Manager users are now stored in memory. If you change the manager account
+ list (delete or add accounts) you need to reload manager.
+ * Added Masquerade manager event for when a masquerade happens between
+ two channels.
+ * Added "manager reload" command for the CLI
Dialplan functions
------------------
@@ -50,6 +58,8 @@
* Added EXTENSION_STATE() dialplan function which allows retrieving the state
of any extension.
* Added SYSINFO() dialplan function which allows retrieval of system information
+ * Added a new dialplan function, DIALPLAN_EXISTS(), which allows you to check for
+ the existence of a dialplan target.
CLI Changes
-----------
@@ -101,6 +111,11 @@
* A new option called "callcounter" (global/peer/user level) enables call counters needed
for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
used to enable this functionality).
+ * New settings for timer T1 and timer B on a global level or per device. This makes it
+ possible to force timeout faster on non-responsive SIP servers. These settings are
+ considered advanced, so don't use them unless you have a problem.
+ * Added a dial string option to be able to set the To: header in an INVITE to any
+ SIP uri.
IAX2 changes
------------
@@ -109,11 +124,73 @@
* Added support for OSP. The token is set and retrieved through the CHANNEL()
dialplan function.
+XMPP Google Talk/Jingle changes
+-------------------------------
+ * Added the bindaddr option to gtalk.conf.
+
Skinny changes
-------------
* Added skinny show device, skinny show line, and skinny show settings CLI commands.
* Proper codec support in chan_skinny.
-
+ * Added settings for IP and Ethernet QoS requests
+
+MGCP changes
+------------
+ * Added separate settings for media QoS in mgcp.conf
+
+Console Channel Driver changes
+-------------------
+ * Added experimental support for video send & receive to chan_oss.
+ This requires SDL and ffmpeg/avcodec, plus Video4Linux or X11 to act as
+ a video source.
+ * Added a new channel driver, chan_console, which uses portaudio as a cross
+ platform audio interface. It was written as a channel driver that would
+ work with Mac CoreAudio, but portaudio supports a number of other audio
+ interfaces, as well. Note that this channel driver requires v19 or higher
+ of portaudio; older versions have a different API.
+
+Phone channel changes (chan_phone)
+----------------------------------
+ * Added G729 passthrough support to chan_phone for Sigma Designs boards.
+
+H.323 channel Changes
+---------------------
+ * H323 remote hold notification support added (by NOTIFY message
+ and/or H.450 supplementary service)
+
+Local channel changes
+---------------------
+ * The device state functionality in the Local channel driver has been updated
+ to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
+ to just UNKNOWN if the extension exists.
+ * Added jitterbuffer support for chan_local. This allows you to use the
+ generic jitterbuffer on incoming calls going to Asterisk applications.
+ For example, this would allow you to use a jitterbuffer for an incoming
+ SIP call to Voicemail by putting a Local channel in the middle. This
+ feature is enabled by using the 'j' option in the Dial string to the Local
+ channel in conjunction with the existing 'n' option for local channels.
+
+Zaptel channel driver (chan_zap) Changes
+----------------------------------------
+ * SS7 support in chan_zap (via libss7 library)
+ * In India, some carriers transmit CID via dtmf. Some code has been added
+ that will handle some situations. The cidstart=polarity_IN choice has been added for
+ those carriers that transmit CID via dtmf after a polarity change.
+ * CID matching information is now shown when doing 'dialplan show'.
+ * Added zap show version CLI command to chan_zap.
+ * Added setvar support to zapata.conf channel entries.
+ * Added two new options: mwimonitor and mwimonitornotify. These options allow
+ you to enable MWI monitoring on FXO lines. When the MWI state changes,
+ the script specified in the mwimonitornotify option is executed. An internal
+ event indicating the new state of the mailbox is also generated, so that
+ the normal MWI facilities in Asterisk work as usual.
+
+A new channel driver: Unistim
+-----------------------------
+ * Added a new channel driver, chan_unistim. See doc/unistim.txt and
+ configs/unistim.conf.sample for details. This new channel driver allows
+ you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+
DUNDi changes
-------------
* Added the ability to specify arguments to the Dial application when using
@@ -185,6 +262,9 @@
* Added ability for non-realtime queues to have realtime members
* Added the "linear" strategy to queues.
* Added the "wrandom" strategy to queues.
+ * Added new channel variable QUEUE_MIN_PENALTY
+ * QUEUE_MAX_PENALTY and QUEUE_MIN_PENALTY may be adjusted in mid-call by defining
+ rules in queuerules.conf. See configs/queuerules.conf.sample for details
MeetMe Changes
--------------
@@ -237,6 +317,10 @@
READSTATUS to ERROR, which you can catch and handle separately.
* Added 'm' option to Directory, which lists out names, 8 at a time, instead
of asking for verification of each name, one at a time.
+ * Privacy() no longer uses privacy.conf, as all options are specifyable as
+ direct options to the app.
+ * AMD() has a new "maximum word length" option. "show application AMD" from the CLI
+ for more details
Music On Hold Changes
---------------------
@@ -247,7 +331,7 @@
* Support for realtime music on hold has been added.
* In conjunction with the realtime music on hold, a general section has
been added to musiconhold.conf, its sole variable is cachertclasses. If this
- is set, then music on hold classes found in realtime will be cached in memory.
+ is set, then music on hold classes found in realtime will be cached in memory.
AEL Changes
-----------
@@ -275,26 +359,6 @@
* aelparse will now read extensions.conf to see if a referenced
macro or context is there before issueing a warning.
-Zaptel channel driver (chan_zap) Changes
-----------------------------------------
- * SS7 support in chan_zap (via libss7 library)
- * In India, some carriers transmit CID via dtmf. Some code has been added
- that will handle some situations. The cidstart=polarity_IN choice has been added for
- those carriers that transmit CID via dtmf after a polarity change.
- * CID matching information is now shown when doing 'dialplan show'.
- * Added zap show version CLI command to chan_zap.
- * Added setvar support to zapata.conf channel entries.
- * Added two new options: mwimonitor and mwimonitornotify. These options allow
- you to enable MWI monitoring on FXO lines. When the MWI state changes,
- the script specified in the mwimonitornotify option is executed. An internal
- event indicating the new state of the mailbox is also generated, so that
- the normal MWI facilities in Asterisk work as usual.
-
-H.323 Changes
--------------
- * H323 remote hold notification support added (by NOTIFY message
- and/or H.450 supplementary service)
-
Call Features (res_features) Changes
------------------------------------
* Added the parkedcalltransfers option to features.conf
@@ -321,12 +385,8 @@
* Added SPEECH commands for speech recognition. A complete listing can be found
using agi show.
-Miscellaneous
--------------
- * Added the bindaddr option to gtalk.conf.
- * Ability to use libcap to set high ToS bits when non-root
- on Linux. If configure is unable to find libcap then you
- can use --with-cap to specify the path.
+Logger changes
+--------------
* Added rotatestrategy option to logger.conf, along with two new options:
"timestamp" which will use the time to name the logger files instead of
sequence number; and "rotate", which rotates the names of the logfiles,
@@ -335,12 +395,16 @@
command to be run after rotation. This is primarily useful with
rotatestrategry=rotate, to allow a limit on the number of logfiles kept
and to ensure that the oldest log file gets deleted.
- * Added Masquerade manager event for when a masquerade happens between
- two channels.
+ * Added realtime support for the queue log
+
+Miscellaneous
+-------------
+ * Ability to use libcap to set high ToS bits when non-root
+ on Linux. If configure is unable to find libcap then you
+ can use --with-cap to specify the path.
* Added maxfiles option to options section of asterisk.conf which allows you to specify
what Asterisk should set as the maximum number of open files when it loads.
* Added the jittertargetextra configuration option.
- * Added G729 passthrough support to chan_phone for Sigma Designs boards.
* Added a new CDR module, cdr_sqlite3_custom.
* The cdr_manager module has a [mappings] feature, like cdr_custom,
to add fields to the manager event from the CDR variables.
@@ -349,24 +413,12 @@
configuration files for the IP channel drivers. The new option is "cos".
This information is also documented in doc/qos.tex, or the IP Quality of Service
section of asterisk.pdf.
- * The device state functionality in the Local channel driver has been updated
- to indicate INUSE or NOT_INUSE when a Local channel is being used as opposed
- to just UNKNOWN if the extension exists.
* When originating a call using AMI or pbx_spool that fails the reason for failure
will now be available in the failed extension using the REASON dialplan variable.
- * Added jitterbuffer support for chan_local. This allows you to use the
- generic jitterbuffer on incoming calls going to Asterisk applications.
- For example, this would allow you to use a jitterbuffer for an incoming
- SIP call to Voicemail by putting a Local channel in the middle. This
- feature is enabled by using the 'j' option in the Dial string to the Local
- channel in conjunction with the existing 'n' option for local channels.
* Added support for reading the TOUCH_MONITOR_PREFIX channel variable.
It allows you to configure a prefix for auto-monitor recordings.
* Added support for writing and running your dialplan in lua. See
configs/extensions.lua.sample for examples of how to do this.
- * Added a new channel driver, chan_unistim. See doc/unistim.txt and
- configs/unistim.conf.sample for details. This new channel driver allows
- you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
* A new extension pattern matching algorithm, based on a trie, is introduced
here, that could noticeably speed up mid-sized to large dialplans.
It is NOT used by default, as duplicating the behaviour of the old pattern
@@ -375,4 +427,9 @@
set to false; setting that to true will force the use of the new algorithm.
Also, the cli commands "dialplan set extenpatternmatchingnew true/false" can
be used to switch the algorithms at run time.
-
+ * A new option when starting a remote asterisk (rasterisk, asterisk -r) for
+ specifying which socket to use to connect to the running Asterisk daemon
+ (-s)
+ * Added a new codec translation module, codec_resample, which re-samples
+ signed linear audio between 8 kHz and 16 kHz to help support wideband
+ codecs.
Modified: team/group/v6/trunk/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/CREDITS?view=diff&rev=96837&r1=96836&r2=96837
==============================================================================
--- team/group/v6/trunk/CREDITS (original)
+++ team/group/v6/trunk/CREDITS Mon Jan 7 09:12:44 2008
@@ -166,6 +166,12 @@
Cedric Hans - Development of chan_unistim
cedric.hans(AT)mlkj.net
+Sergio Fadda - console_video: video support for chan_oss and chan_alsa
+
+Marta Carbone - console_video and the astobj2 framework
+
+Luigi Rizzo - astobj2, console_video, windows build, chan_oss cleanup,
+ and a bunch of infrastructure work (loader, new_cli, ...)
=== OTHER CONTRIBUTIONS ===
John Todd - Monkey sounds and associated teletorture prompt
Modified: team/group/v6/trunk/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/Makefile?view=diff&rev=96837&r1=96836&r2=96837
==============================================================================
--- team/group/v6/trunk/Makefile (original)
+++ team/group/v6/trunk/Makefile Mon Jan 7 09:12:44 2008
@@ -20,11 +20,20 @@
# SOLINK - linker flags used only for creating shared objects (.so files),
# used for all .so links
#
-# Default values for ASTCFLAGS and ASTLDFLAGS can be specified in the
+# Initial values for ASTCFLAGS and ASTLDFLAGS can be specified in the
# environment when running make, as follows:
#
-# $ ASTCFLAGS="-Werror" make
-
+# $ ASTCFLAGS="-Werror" make ...
+#
+# note that this is different from
+#
+# $ make ASTCFLAGS="-Werror" ...
+#
+# If you need to pass compiler/linker flags as 'make' variables, please use
+#
+# $ make COPTS="..." LDOPTS="..." ...
+#
+#
# You can add the path of local module subdirs from the command line with
# make LOCAL_MOD_SUBDIRS= ....
@@ -79,6 +88,7 @@
export INSTALL
export STRIP
export DOWNLOAD
+export AWK
export GREP
export ID
@@ -247,13 +257,13 @@
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
-endif
-
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+ ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
+endif
+
+ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
else
RPMVERSION=unknown
@@ -269,7 +279,7 @@
# #ifdef BUSYDETECT in main/dsp.c
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res $(LOCAL_MOD_SUBDIRS)
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs tests main res $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -279,6 +289,7 @@
MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
ASTCFLAGS+=-D__Darwin__
@@ -295,6 +306,16 @@
SOLINK=-shared -fpic -L/usr/local/ssl/lib
endif
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE:=$(MAKE) --quiet
+else
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+endif
+
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
HAVEDOT=yes
@@ -311,9 +332,6 @@
mK=" make"
endif
-# comment to print directories during submakes
-PRINT_DIR?= --no-print-directory
-
all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@@ -335,13 +353,17 @@
menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- @echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ @echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- @echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ @echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- @echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ @echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_MENUSELECT_TREE):
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
+ @$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) makeopts
makeopts.embed_rules: menuselect.makeopts
@echo "Generating embedded module rules ..."
@@ -350,7 +372,7 @@
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
# Non-windows:
@@ -378,30 +400,22 @@
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/version.h:
- @build_tools/make_version_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+main/version.c:
+ @build_tools/make_version_c > $@.tmp
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/buildopts.h: menuselect.makeopts
@build_tools/make_buildopts_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
include/asterisk/build.h:
@build_tools/make_build_h > $@.tmp
- @if cmp -s $@.tmp $@ ; then : ; else \
- mv $@.tmp $@ ; \
- fi
+ @cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
$(SUBDIRS_CLEAN):
@@ -413,7 +427,7 @@
clean: $(SUBDIRS_CLEAN)
rm -f defaults.h
rm -f include/asterisk/build.h
- rm -f include/asterisk/version.h
+ rm -f main/version.c
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -681,7 +695,7 @@
rpm: __rpm
-__rpm: include/asterisk/version.h include/asterisk/buildopts.h spec
+__rpm: main/version.c include/asterisk/buildopts.h spec
rm -rf /tmp/asterisk ; \
mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
$(MAKE) DESTDIR=/tmp/asterisk install ; \
@@ -778,22 +792,32 @@
gmenuselect: menuselect/gmenuselect menuselect-tree
- at menuselect/gmenuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+# options for make in menuselect/
+MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+
menuselect/menuselect: menuselect/makeopts
- echo "doing menuselect with $(HOST_CC)"
- @CC="$(HOST_CC)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT)
menuselect/gmenuselect: menuselect/makeopts
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect gmenuselect CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT) gmenuselect
menuselect/makeopts:
- @CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect makeopts CONFIGURE_SILENT="--silent"
+ $(MAKE_MENUSELECT) makeopts
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml configure
@echo "Generating input for menuselect ..."
- @build_tools/prep_moduledeps > $@
+ @echo "<?xml version=\"1.0\"?>" > $@
+ @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
+ @for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ @cat build_tools/cflags.xml >> $@
+ @cat build_tools/embed_modules.xml >> $@
+ @cat sounds/sounds.xml >> $@
+ @echo "</menu>" >> $@
pdf: asterisk.pdf
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
-.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) menuselect.makeopts
+.PHONY: menuselect main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) main/version.c
Modified: team/group/v6/trunk/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/Makefile.moddir_rules?view=diff&rev=96837&r1=96836&r2=96837
==============================================================================
--- team/group/v6/trunk/Makefile.moddir_rules (original)
+++ team/group/v6/trunk/Makefile.moddir_rules Mon Jan 7 09:12:44 2008
@@ -37,37 +37,27 @@
# If MODULE_PREFIX is defined, use it to run the standard functions to set
# C_MODS, CC_MODS, LOADABLE_MODS and EMBEDDED_MODS.
# Each word of MODULE_PREFIX is a prefix for filenames that we consider
-# valid C or CC modules (eg. app_, func_ ...).
+# valid C or CC modules (eg. app, func ...). Note that the underscore
+# is added here, and does not need to be in MODULE_PREFIX
+#
[... 21553 lines stripped ...]
More information about the asterisk-commits
mailing list