[asterisk-commits] russell: branch group/sip-tcptls r95879 - in /team/group/sip-tcptls: ./ apps/...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Jan 2 10:36:57 CST 2008


Author: russell
Date: Wed Jan  2 10:36:53 2008
New Revision: 95879

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95879
Log:
resolve conflicts, sync with trunk

Added:
    team/group/sip-tcptls/apps/app_pickupchan.c
      - copied unchanged from r95864, trunk/apps/app_pickupchan.c
    team/group/sip-tcptls/apps/app_waituntil.c
      - copied unchanged from r95864, trunk/apps/app_waituntil.c
    team/group/sip-tcptls/channels/chan_console.c
      - copied unchanged from r95864, trunk/channels/chan_console.c
    team/group/sip-tcptls/channels/console_gui.c
      - copied unchanged from r95864, trunk/channels/console_gui.c
    team/group/sip-tcptls/channels/console_video.c
      - copied unchanged from r95864, trunk/channels/console_video.c
    team/group/sip-tcptls/channels/console_video.h
      - copied unchanged from r95864, trunk/channels/console_video.h
    team/group/sip-tcptls/channels/vcodecs.c
      - copied unchanged from r95864, trunk/channels/vcodecs.c
    team/group/sip-tcptls/channels/vgrabbers.c
      - copied unchanged from r95864, trunk/channels/vgrabbers.c
    team/group/sip-tcptls/codecs/codec_resample.c
      - copied unchanged from r95864, trunk/codecs/codec_resample.c
    team/group/sip-tcptls/codecs/slin_resample_ex.h
      - copied unchanged from r95864, trunk/codecs/slin_resample_ex.h
    team/group/sip-tcptls/configs/console.conf.sample
      - copied unchanged from r95864, trunk/configs/console.conf.sample
    team/group/sip-tcptls/configs/queuerules.conf.sample
      - copied unchanged from r95864, trunk/configs/queuerules.conf.sample
    team/group/sip-tcptls/funcs/func_dialplan.c
      - copied unchanged from r95864, trunk/funcs/func_dialplan.c
    team/group/sip-tcptls/images/kpad2.jpg
      - copied unchanged from r95864, trunk/images/kpad2.jpg
    team/group/sip-tcptls/main/libresample/   (props changed)
      - copied from r95864, trunk/main/libresample/
    team/group/sip-tcptls/main/libresample/LICENSE.txt
      - copied unchanged from r95864, trunk/main/libresample/LICENSE.txt
    team/group/sip-tcptls/main/libresample/Makefile.asterisk
      - copied unchanged from r95864, trunk/main/libresample/Makefile.asterisk
    team/group/sip-tcptls/main/libresample/Makefile.in
      - copied unchanged from r95864, trunk/main/libresample/Makefile.in
    team/group/sip-tcptls/main/libresample/README.txt
      - copied unchanged from r95864, trunk/main/libresample/README.txt
    team/group/sip-tcptls/main/libresample/config.guess
      - copied unchanged from r95864, trunk/main/libresample/config.guess
    team/group/sip-tcptls/main/libresample/config.sub
      - copied unchanged from r95864, trunk/main/libresample/config.sub
    team/group/sip-tcptls/main/libresample/configure
      - copied unchanged from r95864, trunk/main/libresample/configure
    team/group/sip-tcptls/main/libresample/configure.in
      - copied unchanged from r95864, trunk/main/libresample/configure.in
    team/group/sip-tcptls/main/libresample/include/
      - copied from r95864, trunk/main/libresample/include/
    team/group/sip-tcptls/main/libresample/include/libresample.h
      - copied unchanged from r95864, trunk/main/libresample/include/libresample.h
    team/group/sip-tcptls/main/libresample/install-sh
      - copied unchanged from r95864, trunk/main/libresample/install-sh
    team/group/sip-tcptls/main/libresample/src/
      - copied from r95864, trunk/main/libresample/src/
    team/group/sip-tcptls/main/libresample/src/configtemplate.h
      - copied unchanged from r95864, trunk/main/libresample/src/configtemplate.h
    team/group/sip-tcptls/main/libresample/src/filterkit.c
      - copied unchanged from r95864, trunk/main/libresample/src/filterkit.c
    team/group/sip-tcptls/main/libresample/src/filterkit.h
      - copied unchanged from r95864, trunk/main/libresample/src/filterkit.h
    team/group/sip-tcptls/main/libresample/src/resample.c
      - copied unchanged from r95864, trunk/main/libresample/src/resample.c
    team/group/sip-tcptls/main/libresample/src/resample_defs.h
      - copied unchanged from r95864, trunk/main/libresample/src/resample_defs.h
    team/group/sip-tcptls/main/libresample/src/resamplesubs.c
      - copied unchanged from r95864, trunk/main/libresample/src/resamplesubs.c
    team/group/sip-tcptls/main/libresample/tests/
      - copied from r95864, trunk/main/libresample/tests/
    team/group/sip-tcptls/main/libresample/tests/compareresample.c
      - copied unchanged from r95864, trunk/main/libresample/tests/compareresample.c
    team/group/sip-tcptls/main/libresample/tests/resample-sndfile.c
      - copied unchanged from r95864, trunk/main/libresample/tests/resample-sndfile.c
    team/group/sip-tcptls/main/libresample/tests/testresample.c
      - copied unchanged from r95864, trunk/main/libresample/tests/testresample.c
    team/group/sip-tcptls/main/libresample/win/
      - copied from r95864, trunk/main/libresample/win/
    team/group/sip-tcptls/main/libresample/win/libresample.dsp
      - copied unchanged from r95864, trunk/main/libresample/win/libresample.dsp
    team/group/sip-tcptls/main/libresample/win/libresample.vcproj
      - copied unchanged from r95864, trunk/main/libresample/win/libresample.vcproj
    team/group/sip-tcptls/utils/astcanary.c
      - copied unchanged from r95864, trunk/utils/astcanary.c
Removed:
    team/group/sip-tcptls/build_tools/prep_moduledeps
Modified:
    team/group/sip-tcptls/   (props changed)
    team/group/sip-tcptls/CHANGES
    team/group/sip-tcptls/CREDITS
    team/group/sip-tcptls/Makefile
    team/group/sip-tcptls/Makefile.moddir_rules
    team/group/sip-tcptls/UPGRADE.txt
    team/group/sip-tcptls/acinclude.m4
    team/group/sip-tcptls/apps/   (props changed)
    team/group/sip-tcptls/apps/Makefile
    team/group/sip-tcptls/apps/app_adsiprog.c
    team/group/sip-tcptls/apps/app_alarmreceiver.c
    team/group/sip-tcptls/apps/app_amd.c
    team/group/sip-tcptls/apps/app_authenticate.c
    team/group/sip-tcptls/apps/app_cdr.c
    team/group/sip-tcptls/apps/app_dictate.c
    team/group/sip-tcptls/apps/app_exec.c
    team/group/sip-tcptls/apps/app_ices.c
    team/group/sip-tcptls/apps/app_meetme.c
    team/group/sip-tcptls/apps/app_mp3.c
    team/group/sip-tcptls/apps/app_osplookup.c
    team/group/sip-tcptls/apps/app_queue.c
    team/group/sip-tcptls/apps/app_voicemail.c
    team/group/sip-tcptls/apps/app_zapateller.c
    team/group/sip-tcptls/apps/app_zapbarge.c
    team/group/sip-tcptls/apps/app_zapras.c
    team/group/sip-tcptls/apps/app_zapscan.c
    team/group/sip-tcptls/build_tools/cflags.xml
    team/group/sip-tcptls/build_tools/embed_modules.xml
    team/group/sip-tcptls/build_tools/make_buildopts_h
    team/group/sip-tcptls/build_tools/make_defaults_h
    team/group/sip-tcptls/build_tools/make_version
    team/group/sip-tcptls/build_tools/menuselect-deps.in
    team/group/sip-tcptls/build_tools/prep_tarball
    team/group/sip-tcptls/build_tools/strip_nonapi
    team/group/sip-tcptls/cdr/   (props changed)
    team/group/sip-tcptls/cdr/Makefile
    team/group/sip-tcptls/cdr/cdr_csv.c
    team/group/sip-tcptls/channels/   (props changed)
    team/group/sip-tcptls/channels/Makefile
    team/group/sip-tcptls/channels/chan_h323.c
    team/group/sip-tcptls/channels/chan_iax2.c
    team/group/sip-tcptls/channels/chan_mgcp.c
    team/group/sip-tcptls/channels/chan_oss.c
    team/group/sip-tcptls/channels/chan_sip.c
    team/group/sip-tcptls/channels/chan_skinny.c
    team/group/sip-tcptls/channels/chan_unistim.c
    team/group/sip-tcptls/channels/chan_usbradio.c
    team/group/sip-tcptls/channels/chan_zap.c
    team/group/sip-tcptls/channels/iax2-provision.c
    team/group/sip-tcptls/codecs/   (props changed)
    team/group/sip-tcptls/codecs/Makefile
    team/group/sip-tcptls/codecs/codec_adpcm.c
    team/group/sip-tcptls/codecs/codec_alaw.c
    team/group/sip-tcptls/codecs/codec_g722.c
    team/group/sip-tcptls/codecs/codec_g726.c
    team/group/sip-tcptls/codecs/codec_gsm.c
    team/group/sip-tcptls/codecs/codec_lpc10.c
    team/group/sip-tcptls/codecs/codec_speex.c
    team/group/sip-tcptls/codecs/codec_ulaw.c
    team/group/sip-tcptls/codecs/codec_zap.c
    team/group/sip-tcptls/configs/dundi.conf.sample
    team/group/sip-tcptls/configs/extconfig.conf.sample
    team/group/sip-tcptls/configs/h323.conf.sample
    team/group/sip-tcptls/configs/iax.conf.sample
    team/group/sip-tcptls/configs/iaxprov.conf.sample
    team/group/sip-tcptls/configs/mgcp.conf.sample
    team/group/sip-tcptls/configs/modules.conf.sample
    team/group/sip-tcptls/configs/oss.conf.sample
    team/group/sip-tcptls/configs/queues.conf.sample
    team/group/sip-tcptls/configs/sip.conf.sample
    team/group/sip-tcptls/configs/skinny.conf.sample
    team/group/sip-tcptls/configs/unistim.conf.sample
    team/group/sip-tcptls/configs/zapata.conf.sample
    team/group/sip-tcptls/configure
    team/group/sip-tcptls/configure.ac
    team/group/sip-tcptls/doc/CODING-GUIDELINES
    team/group/sip-tcptls/doc/asterisk.8
    team/group/sip-tcptls/doc/asterisk.sgml
    team/group/sip-tcptls/doc/manager_1_1.txt
    team/group/sip-tcptls/doc/tex/channelvariables.tex
    team/group/sip-tcptls/doc/tex/qos.tex
    team/group/sip-tcptls/formats/   (props changed)
    team/group/sip-tcptls/formats/Makefile
    team/group/sip-tcptls/funcs/   (props changed)
    team/group/sip-tcptls/funcs/Makefile
    team/group/sip-tcptls/funcs/func_env.c
    team/group/sip-tcptls/funcs/func_iconv.c
    team/group/sip-tcptls/include/asterisk/autoconfig.h.in
    team/group/sip-tcptls/include/asterisk/channel.h
    team/group/sip-tcptls/include/asterisk/config.h
    team/group/sip-tcptls/include/asterisk/file.h
    team/group/sip-tcptls/include/asterisk/module.h
    team/group/sip-tcptls/include/asterisk/netsock.h
    team/group/sip-tcptls/include/asterisk/paths.h
    team/group/sip-tcptls/include/asterisk/rtp.h
    team/group/sip-tcptls/include/asterisk/strings.h
    team/group/sip-tcptls/include/asterisk/threadstorage.h
    team/group/sip-tcptls/include/asterisk/time.h
    team/group/sip-tcptls/include/asterisk/translate.h
    team/group/sip-tcptls/main/Makefile
    team/group/sip-tcptls/main/asterisk.c
    team/group/sip-tcptls/main/astmm.c
    team/group/sip-tcptls/main/autoservice.c
    team/group/sip-tcptls/main/channel.c
    team/group/sip-tcptls/main/config.c
    team/group/sip-tcptls/main/db.c
    team/group/sip-tcptls/main/dial.c
    team/group/sip-tcptls/main/io.c
    team/group/sip-tcptls/main/loader.c
    team/group/sip-tcptls/main/logger.c
    team/group/sip-tcptls/main/manager.c
    team/group/sip-tcptls/main/netsock.c
    team/group/sip-tcptls/main/pbx.c
    team/group/sip-tcptls/main/rtp.c
    team/group/sip-tcptls/main/say.c
    team/group/sip-tcptls/main/translate.c
    team/group/sip-tcptls/main/udptl.c
    team/group/sip-tcptls/main/utils.c
    team/group/sip-tcptls/makeopts.in
    team/group/sip-tcptls/pbx/   (props changed)
    team/group/sip-tcptls/pbx/Makefile
    team/group/sip-tcptls/pbx/pbx_config.c
    team/group/sip-tcptls/pbx/pbx_dundi.c
    team/group/sip-tcptls/pbx/pbx_gtkconsole.c
    team/group/sip-tcptls/pbx/pbx_loopback.c
    team/group/sip-tcptls/pbx/pbx_realtime.c
    team/group/sip-tcptls/pbx/pbx_spool.c
    team/group/sip-tcptls/res/   (props changed)
    team/group/sip-tcptls/res/Makefile
    team/group/sip-tcptls/res/res_agi.c
    team/group/sip-tcptls/res/res_config_sqlite.c
    team/group/sip-tcptls/res/res_crypto.c
    team/group/sip-tcptls/res/res_features.c
    team/group/sip-tcptls/res/res_jabber.c
    team/group/sip-tcptls/res/res_monitor.c
    team/group/sip-tcptls/res/snmp/agent.c
    team/group/sip-tcptls/utils/   (props changed)
    team/group/sip-tcptls/utils/Makefile
    team/group/sip-tcptls/utils/ael_main.c
    team/group/sip-tcptls/utils/conf2ael.c
    team/group/sip-tcptls/utils/extconf.c

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan  2 10:36:53 2008
@@ -1,1 +1,1 @@
-/trunk:1-93122
+/trunk:1-95872

Modified: team/group/sip-tcptls/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/CHANGES?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/CHANGES (original)
+++ team/group/sip-tcptls/CHANGES Wed Jan  2 10:36:53 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
 --------------
@@ -239,6 +319,8 @@
      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
 ---------------------
@@ -249,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
 -----------
@@ -277,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
@@ -323,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,
@@ -337,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.
@@ -351,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
@@ -377,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/sip-tcptls/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/CREDITS?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/CREDITS (original)
+++ team/group/sip-tcptls/CREDITS Wed Jan  2 10:36:53 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/sip-tcptls/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/Makefile?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/Makefile (original)
+++ team/group/sip-tcptls/Makefile Wed Jan  2 10:36:53 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
 
@@ -250,10 +260,10 @@
   ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
 endif
 
-ASTERISKVERSION:=$(shell build_tools/make_version .)
+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
@@ -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,15 @@
   SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
 
+# comment to print directories during submakes
+#PRINT_DIR=yes
+
+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 +331,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 +352,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+="`$(SUBMAKE) -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+="`$(SUBMAKE) -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+="`$(SUBMAKE) -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 ..."
@@ -378,30 +399,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
+	@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):
@@ -778,22 +791,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) include/asterisk/version.h

Modified: team/group/sip-tcptls/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/Makefile.moddir_rules?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/Makefile.moddir_rules (original)
+++ team/group/sip-tcptls/Makefile.moddir_rules Wed Jan  2 10:36:53 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
+#
 # Use MODULE_EXCLUDE to specify additional modules to exclude.
 
 ifneq ($(MODULE_PREFIX),)
-    # Compute the lowercase and uppercase directory name. The former
-    # is used as a key in MENUSELECT_EMBED, the latter is part of
-    # the name of the MENUSELECT_* variable containing the exclude list
-    # generated by menuselect.
-    A:=$(notdir $(CURDIR))
-    B:=$(shell echo $A | tr "[a-z]" "[A-Z]")
-    # MENUSELECT_$(L) contains the list of modules excluded by menuselect.
-    # MODULE_EXCLUDE contains the locally generated exclude list
-    L:=$(MENUSELECT_$(B)) $(MODULE_EXCLUDE)
-    # construct the list of C and CC modules from the content of the directory
-    C_MODS:=
-    CC_MODS:=
-    C_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.c,%,$(wildcard $(pre)*.c))))
-    CC_MODS+=$(foreach pre,$(MODULE_PREFIX),$(filter-out $(L),$(patsubst %.cc,%,$(wildcard $(pre)*.cc))))
+    ALL_C_MODS:=
+    ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
+    ALL_CC_MODS:=
+    ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+ 
+    C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+    CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
 
     # and store in the list of embedded or loadable modules
-    ifneq ($(findstring $(A),$(MENUSELECT_EMBED)),)
+    ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
 	EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
     else
 	LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
     endif
 endif
-# debugging
-# x:=$(shell echo 'in $(B)' >&2)
-# x:=$(shell echo 'filtered out $(L)' >&2)
-# x:=$(shell echo 'C_MODS= $(C_MODS)' >&2)
-# x:=$(shell sleep 2)
 
 # Both C++ and C++ sources need their module name in AST_MODULE
 # We also pass whatever _INCLUDE list is generated by menuselect
@@ -92,7 +82,7 @@
 
 modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
 
-.PHONY: clean uninstall _all
+.PHONY: clean uninstall _all moduleinfo makeopts
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
@@ -137,6 +127,40 @@
 
 uninstall::
 
+dist-clean::
+	rm -f .*.moduleinfo .moduleinfo
+	rm -f .*.makeopts .makeopts
+
+.%.moduleinfo: %.c
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.%.moduleinfo: %.cc
+	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.oo $(SUBDIR)/$*.so\">" > $@
+	$(AWK) -f $(ASTTOPDIR)/build_tools/get_moduleinfo $< >> $@
+	echo "</member>" >> $@
+
+.moduleinfo:: $(addsuffix .moduleinfo,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@echo "<category name=\"MENUSELECT_$(MENUSELECT_CATEGORY)\" displayname=\"$(MENUSELECT_DESCRIPTION)\" remove_on_change=\"$(SUBDIR)/modules.link\">" > $@
+	@cat $^ >> $@
+	@echo "</category>" >> $@
+
+moduleinfo: .moduleinfo
+	@cat $<
+
+.%.makeopts: %.c
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.%.makeopts: %.cc
+	@$(AWK) -f $(ASTTOPDIR)/build_tools/get_makeopts $< > $@
+
+.makeopts:: $(addsuffix .makeopts,$(addprefix .,$(ALL_C_MODS) $(ALL_CC_MODS)))
+	@cat $^ > $@
+
+makeopts: .makeopts
+	@cat $<
+
 ifneq ($(wildcard .*.d),)
    include .*.d
 endif

Modified: team/group/sip-tcptls/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/UPGRADE.txt?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/UPGRADE.txt (original)
+++ team/group/sip-tcptls/UPGRADE.txt Wed Jan  2 10:36:53 2008
@@ -132,6 +132,9 @@
 * 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
   delimiter change in applications.
+* H323: The "tos" setting has changed name to "tos_audio" and "cos" to "cos_audio"
+  to be compatible with settings in sip.conf. The "tos" and "cos" configuration
+  is deprecated and will stop working in the next release of Asterisk.
 
 Configuration:
 

Modified: team/group/sip-tcptls/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/acinclude.m4?view=diff&rev=95879&r1=95878&r2=95879
==============================================================================
--- team/group/sip-tcptls/acinclude.m4 (original)
+++ team/group/sip-tcptls/acinclude.m4 Wed Jan  2 10:36:53 2008
@@ -173,16 +173,19 @@
 
 # Check for a package using $2-config. Similar to AST_EXT_LIB_CHECK,
 # but use $2-config to determine cflags and libraries to use.
-
-# AST_EXT_TOOL_CHECK([package], [tool name], [symbol], [version])
+# $3 and $4 can be used to replace --cflags and --libs in the request 
+
+# AST_EXT_TOOL_CHECK([package], [tool name], [--cflags], [--libs])
 AC_DEFUN([AST_EXT_TOOL_CHECK],
 [
     if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
 	PBX_$1=0
 	AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
 	if test ! "x${CONFIG_$1}" = xNo; then
-	    $1_INCLUDE=$(${CONFIG_$1} --cflags $3)
-	    $1_LIB=$(${CONFIG_$1} --libs $3)
+	    if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi
+	    $1_INCLUDE=$(${CONFIG_$1} $A)
+	    if test x"$4" = x ; then A=--libs ; else A="$4" ; fi
+	    $1_LIB=$(${CONFIG_$1} $A)
 	    PBX_$1=1
 	    AC_DEFINE([HAVE_$1], 1, [Define if your system has the $1 libraries.])
 	fi

[... 29233 lines stripped ...]



More information about the asterisk-commits mailing list