[svn-commits] dvossel: branch dvossel/celt_codec_ftw r325017 - in /team/dvossel/celt_codec_...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Mon Jun 27 12:54:35 CDT 2011 

Author: dvossel
Date: Mon Jun 27 12:54:15 2011
New Revision: 325017

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=325017
Log:
svn merge update

Added:
    team/dvossel/celt_codec_ftw/apps/confbridge/
      - copied from r324961, trunk/apps/confbridge/
    team/dvossel/celt_codec_ftw/apps/confbridge/conf_config_parser.c
      - copied unchanged from r324961, trunk/apps/confbridge/conf_config_parser.c
    team/dvossel/celt_codec_ftw/apps/confbridge/include/
      - copied from r324961, trunk/apps/confbridge/include/
    team/dvossel/celt_codec_ftw/apps/confbridge/include/confbridge.h
      - copied unchanged from r324961, trunk/apps/confbridge/include/confbridge.h
    team/dvossel/celt_codec_ftw/configs/confbridge.conf.sample
      - copied unchanged from r324961, trunk/configs/confbridge.conf.sample
    team/dvossel/celt_codec_ftw/contrib/scripts/import-cdr-csv-mysql.pl
      - copied unchanged from r324961, trunk/contrib/scripts/import-cdr-csv-mysql.pl
    team/dvossel/celt_codec_ftw/funcs/func_jitterbuffer.c
      - copied unchanged from r324961, trunk/funcs/func_jitterbuffer.c
    team/dvossel/celt_codec_ftw/include/asterisk/message.h
      - copied unchanged from r324961, trunk/include/asterisk/message.h
    team/dvossel/celt_codec_ftw/main/message.c
      - copied unchanged from r324961, trunk/main/message.c
    team/dvossel/celt_codec_ftw/tests/test_db.c
      - copied unchanged from r324961, trunk/tests/test_db.c
    team/dvossel/celt_codec_ftw/tests/test_netsock2.c
      - copied unchanged from r324961, trunk/tests/test_netsock2.c
Removed:
    team/dvossel/celt_codec_ftw/res/res_features.exports.in
Modified:
    team/dvossel/celt_codec_ftw/   (props changed)
    team/dvossel/celt_codec_ftw/CHANGES
    team/dvossel/celt_codec_ftw/Makefile
    team/dvossel/celt_codec_ftw/UPGRADE-1.8.txt
    team/dvossel/celt_codec_ftw/UPGRADE.txt
    team/dvossel/celt_codec_ftw/addons/app_mysql.c
    team/dvossel/celt_codec_ftw/addons/cdr_mysql.c
    team/dvossel/celt_codec_ftw/addons/chan_mobile.c
    team/dvossel/celt_codec_ftw/addons/chan_ooh323.c
    team/dvossel/celt_codec_ftw/addons/ooh323c/src/oochannels.c
    team/dvossel/celt_codec_ftw/addons/ooh323c/src/ooh245.c
    team/dvossel/celt_codec_ftw/addons/res_config_mysql.c
    team/dvossel/celt_codec_ftw/apps/Makefile
    team/dvossel/celt_codec_ftw/apps/app_amd.c
    team/dvossel/celt_codec_ftw/apps/app_chanspy.c
    team/dvossel/celt_codec_ftw/apps/app_confbridge.c
    team/dvossel/celt_codec_ftw/apps/app_dial.c
    team/dvossel/celt_codec_ftw/apps/app_directed_pickup.c
    team/dvossel/celt_codec_ftw/apps/app_fax.c
    team/dvossel/celt_codec_ftw/apps/app_festival.c
    team/dvossel/celt_codec_ftw/apps/app_followme.c
    team/dvossel/celt_codec_ftw/apps/app_ices.c
    team/dvossel/celt_codec_ftw/apps/app_meetme.c
    team/dvossel/celt_codec_ftw/apps/app_minivm.c
    team/dvossel/celt_codec_ftw/apps/app_originate.c
    team/dvossel/celt_codec_ftw/apps/app_privacy.c
    team/dvossel/celt_codec_ftw/apps/app_queue.c
    team/dvossel/celt_codec_ftw/apps/app_rpt.c
    team/dvossel/celt_codec_ftw/apps/app_userevent.c
    team/dvossel/celt_codec_ftw/apps/app_voicemail.c
    team/dvossel/celt_codec_ftw/autoconf/ast_check_pwlib.m4
    team/dvossel/celt_codec_ftw/bridges/bridge_builtin_features.c
    team/dvossel/celt_codec_ftw/bridges/bridge_softmix.c
    team/dvossel/celt_codec_ftw/cdr/cdr_radius.c
    team/dvossel/celt_codec_ftw/cdr/cdr_syslog.c
    team/dvossel/celt_codec_ftw/cel/cel_odbc.c
    team/dvossel/celt_codec_ftw/cel/cel_pgsql.c
    team/dvossel/celt_codec_ftw/cel/cel_radius.c
    team/dvossel/celt_codec_ftw/channels/chan_agent.c
    team/dvossel/celt_codec_ftw/channels/chan_alsa.c
    team/dvossel/celt_codec_ftw/channels/chan_console.c
    team/dvossel/celt_codec_ftw/channels/chan_dahdi.c
    team/dvossel/celt_codec_ftw/channels/chan_h323.c
    team/dvossel/celt_codec_ftw/channels/chan_iax2.c
    team/dvossel/celt_codec_ftw/channels/chan_jingle.c
    team/dvossel/celt_codec_ftw/channels/chan_local.c
    team/dvossel/celt_codec_ftw/channels/chan_mgcp.c
    team/dvossel/celt_codec_ftw/channels/chan_oss.c
    team/dvossel/celt_codec_ftw/channels/chan_phone.c
    team/dvossel/celt_codec_ftw/channels/chan_sip.c
    team/dvossel/celt_codec_ftw/channels/chan_skinny.c
    team/dvossel/celt_codec_ftw/channels/chan_unistim.c
    team/dvossel/celt_codec_ftw/channels/chan_usbradio.c
    team/dvossel/celt_codec_ftw/channels/iax2-provision.c
    team/dvossel/celt_codec_ftw/channels/misdn/isdn_lib.c
    team/dvossel/celt_codec_ftw/channels/misdn_config.c
    team/dvossel/celt_codec_ftw/channels/sig_analog.c
    team/dvossel/celt_codec_ftw/channels/sig_pri.c
    team/dvossel/celt_codec_ftw/channels/sig_pri.h
    team/dvossel/celt_codec_ftw/channels/sig_ss7.c
    team/dvossel/celt_codec_ftw/channels/sip/include/sip.h
    team/dvossel/celt_codec_ftw/channels/sip/reqresp_parser.c
    team/dvossel/celt_codec_ftw/channels/sip/sdp_crypto.c
    team/dvossel/celt_codec_ftw/codecs/codec_dahdi.c
    team/dvossel/celt_codec_ftw/codecs/codec_resample.c
    team/dvossel/celt_codec_ftw/codecs/lpc10/dyptrk.c
    team/dvossel/celt_codec_ftw/configs/cel.conf.sample
    team/dvossel/celt_codec_ftw/configs/cel_pgsql.conf.sample
    team/dvossel/celt_codec_ftw/configs/chan_dahdi.conf.sample
    team/dvossel/celt_codec_ftw/configs/extensions.lua.sample
    team/dvossel/celt_codec_ftw/configs/features.conf.sample
    team/dvossel/celt_codec_ftw/configs/http.conf.sample
    team/dvossel/celt_codec_ftw/configs/jabber.conf.sample
    team/dvossel/celt_codec_ftw/configs/queuerules.conf.sample
    team/dvossel/celt_codec_ftw/configs/queues.conf.sample
    team/dvossel/celt_codec_ftw/configs/sip.conf.sample
    team/dvossel/celt_codec_ftw/configs/sip_notify.conf.sample
    team/dvossel/celt_codec_ftw/configs/skinny.conf.sample
    team/dvossel/celt_codec_ftw/configure
    team/dvossel/celt_codec_ftw/configure.ac
    team/dvossel/celt_codec_ftw/contrib/init.d/rc.debian.asterisk
    team/dvossel/celt_codec_ftw/contrib/realtime/mysql/meetme.sql
    team/dvossel/celt_codec_ftw/contrib/realtime/mysql/queue_log.sql
    team/dvossel/celt_codec_ftw/contrib/realtime/mysql/sipfriends.sql
    team/dvossel/celt_codec_ftw/contrib/scripts/safe_asterisk
    team/dvossel/celt_codec_ftw/formats/format_wav.c
    team/dvossel/celt_codec_ftw/funcs/func_channel.c
    team/dvossel/celt_codec_ftw/funcs/func_curl.c
    team/dvossel/celt_codec_ftw/funcs/func_enum.c
    team/dvossel/celt_codec_ftw/funcs/func_strings.c
    team/dvossel/celt_codec_ftw/include/asterisk/_private.h
    team/dvossel/celt_codec_ftw/include/asterisk/abstract_jb.h
    team/dvossel/celt_codec_ftw/include/asterisk/acl.h
    team/dvossel/celt_codec_ftw/include/asterisk/astdb.h
    team/dvossel/celt_codec_ftw/include/asterisk/autoconfig.h.in
    team/dvossel/celt_codec_ftw/include/asterisk/bridging.h
    team/dvossel/celt_codec_ftw/include/asterisk/bridging_features.h
    team/dvossel/celt_codec_ftw/include/asterisk/bridging_technology.h
    team/dvossel/celt_codec_ftw/include/asterisk/channel.h
    team/dvossel/celt_codec_ftw/include/asterisk/dnsmgr.h
    team/dvossel/celt_codec_ftw/include/asterisk/dsp.h
    team/dvossel/celt_codec_ftw/include/asterisk/event.h
    team/dvossel/celt_codec_ftw/include/asterisk/features.h
    team/dvossel/celt_codec_ftw/include/asterisk/frame.h
    team/dvossel/celt_codec_ftw/include/asterisk/jabber.h
    team/dvossel/celt_codec_ftw/include/asterisk/linkedlists.h
    team/dvossel/celt_codec_ftw/include/asterisk/logger.h
    team/dvossel/celt_codec_ftw/include/asterisk/netsock2.h
    team/dvossel/celt_codec_ftw/include/asterisk/pbx.h
    team/dvossel/celt_codec_ftw/include/asterisk/rtp_engine.h
    team/dvossel/celt_codec_ftw/include/asterisk/select.h
    team/dvossel/celt_codec_ftw/include/asterisk/stringfields.h
    team/dvossel/celt_codec_ftw/include/asterisk/utils.h
    team/dvossel/celt_codec_ftw/main/abstract_jb.c
    team/dvossel/celt_codec_ftw/main/app.c
    team/dvossel/celt_codec_ftw/main/asterisk.c
    team/dvossel/celt_codec_ftw/main/audiohook.c
    team/dvossel/celt_codec_ftw/main/bridging.c
    team/dvossel/celt_codec_ftw/main/ccss.c
    team/dvossel/celt_codec_ftw/main/cdr.c
    team/dvossel/celt_codec_ftw/main/channel.c
    team/dvossel/celt_codec_ftw/main/config.c
    team/dvossel/celt_codec_ftw/main/db.c
    team/dvossel/celt_codec_ftw/main/dnsmgr.c
    team/dvossel/celt_codec_ftw/main/dsp.c
    team/dvossel/celt_codec_ftw/main/event.c
    team/dvossel/celt_codec_ftw/main/features.c
    team/dvossel/celt_codec_ftw/main/file.c
    team/dvossel/celt_codec_ftw/main/format_cap.c
    team/dvossel/celt_codec_ftw/main/fskmodem_float.c
    team/dvossel/celt_codec_ftw/main/http.c
    team/dvossel/celt_codec_ftw/main/manager.c
    team/dvossel/celt_codec_ftw/main/netsock2.c
    team/dvossel/celt_codec_ftw/main/pbx.c
    team/dvossel/celt_codec_ftw/main/plc.c
    team/dvossel/celt_codec_ftw/main/rtp_engine.c
    team/dvossel/celt_codec_ftw/main/srv.c
    team/dvossel/celt_codec_ftw/main/tcptls.c
    team/dvossel/celt_codec_ftw/main/udptl.c
    team/dvossel/celt_codec_ftw/main/utils.c
    team/dvossel/celt_codec_ftw/pbx/pbx_config.c
    team/dvossel/celt_codec_ftw/pbx/pbx_dundi.c
    team/dvossel/celt_codec_ftw/pbx/pbx_lua.c
    team/dvossel/celt_codec_ftw/res/Makefile
    team/dvossel/celt_codec_ftw/res/res_agi.c
    team/dvossel/celt_codec_ftw/res/res_calendar.c
    team/dvossel/celt_codec_ftw/res/res_config_curl.c
    team/dvossel/celt_codec_ftw/res/res_config_odbc.c
    team/dvossel/celt_codec_ftw/res/res_config_pgsql.c
    team/dvossel/celt_codec_ftw/res/res_config_sqlite.c
    team/dvossel/celt_codec_ftw/res/res_crypto.c
    team/dvossel/celt_codec_ftw/res/res_fax.c
    team/dvossel/celt_codec_ftw/res/res_fax_spandsp.c
    team/dvossel/celt_codec_ftw/res/res_http_post.c
    team/dvossel/celt_codec_ftw/res/res_jabber.c
    team/dvossel/celt_codec_ftw/res/res_musiconhold.c
    team/dvossel/celt_codec_ftw/res/res_odbc.c
    team/dvossel/celt_codec_ftw/res/res_rtp_asterisk.c
    team/dvossel/celt_codec_ftw/res/res_srtp.c
    team/dvossel/celt_codec_ftw/sounds/Makefile
    team/dvossel/celt_codec_ftw/sounds/sounds.xml
    team/dvossel/celt_codec_ftw/tests/test_astobj2.c
    team/dvossel/celt_codec_ftw/tests/test_event.c

Propchange: team/dvossel/celt_codec_ftw/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Mon Jun 27 12:54:15 2011
@@ -1,1 +1,1 @@
-/branches/1.8:299531,313436
+/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730

Propchange: team/dvossel/celt_codec_ftw/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/dvossel/celt_codec_ftw/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 27 12:54:15 2011
@@ -1,1 +1,1 @@
-/trunk:1-314361
+/trunk:1-325016

Modified: team/dvossel/celt_codec_ftw/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/CHANGES?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/CHANGES (original)
+++ team/dvossel/celt_codec_ftw/CHANGES Mon Jun 27 12:54:15 2011
@@ -12,9 +12,23 @@
 --- Functionality changes from Asterisk 1.8 to Asterisk 1.10 -----------------
 ------------------------------------------------------------------------------
 
+Text Messaging
+--------------
+ * Asterisk now has protocol independent support for processing text messages
+   outside of a call.  Messages are routed through the Asterisk dialplan.
+   SIP MESSAGE and XMPP are currently supported.  There are options in
+   jabber.conf and sip.conf to allow enabling these features.
+     -> jabber.conf: see the "sendtodialplan" and "context" options.
+     -> sip.conf: see the "accept_outofcall_message", "auth_message_requests"
+        and "outofcall_message_context" options.
+   The MESSAGE() dialplan function and MessageSend() application have been
+   added to go along with this functionality.  More detailed usage information
+   can be found on the Asterisk wiki (http://wiki.asterisk.org/).
+
 Parking
 -------
  * parkedmusicclass can now be set for non-default parking lots.
+ * ParkedCall application can now specify a specific parkinglot.
 
 Asterisk Manager Interface
 --------------------------
@@ -26,6 +40,7 @@
  * DAHDIShowChannels, SIPshowpeer, SIPpeers, and IAXpeers now contains a
    Description field that is set by 'description' in the channel configuration
    file.
+ * Added Uniqueid header to UserEvent.
 
 Asterisk HTTP Server
 --------------------------
@@ -58,6 +73,16 @@
  * Ability to define custom SILK formats in codecs.conf.
  * Addition of speex32 audio format with translation.
 
+ConfBridge
+--------------------------
+ * New highly optimized and customizable ConfBridge application capable of
+   mixing audio at sample rates ranging from 8khz-96khz.
+ * CONFBRIDGE dialplan function capable of creating dynamic ConfBridge user
+   and bridge profiles on a channel.
+ * CONFBRIDGE_INFO dialplan function capable of retreiving information 
+   about a conference such as locked status and number of parties, admins,
+   and marked users.
+
 Dialplan Variables
 ------------------
  * Added ASTETCDIR, ASTMODDIR, ASTVARLIBDIR, ASTDBDIR, ASTKEYDIR, ASTDATADIR,
@@ -66,8 +91,16 @@
 
 Dialplan Functions
 ------------------
+ * Addition of the JITTERBUFFER dialplan function. This function allows
+   for jitterbuffering to occur on the read side of a channel.  By using
+   this function conference applications such as ConfBridge and MeetMe can
+   have the rx streams jitterbuffered before conference mixing occurs.
  * Added DB_KEYS, which lists the next set of keys in the Asterisk database
    hierarchy.
+ * Added STRREPLACE function.  This function let's the user search a variable
+   for a given string to replace with another string as many times as the
+   user specifies or just throughout the whole string.
+ * Added option to CHANNEL(pickupgroup) allow reading and setting the pickupgroup of channel.
 
 libpri channel driver (chan_dahdi) DAHDI changes
 --------------------------
@@ -82,6 +115,8 @@
 --------------------------
  * Added setvar option to calendar.conf to allow setting channel variables on
    notification channels.
+ * Added "calendar show types" CLI command to list registered calendar
+   connectors.
 
 MixMonitor
 --------------------------
@@ -95,6 +130,24 @@
  * Added a new option, l, which will disable local call optimization for
    channels involved with the FollowMe thread.  Use this option to improve
    compatability for a FollowMe call with certain dialplan apps, options, and
+   functions.
+
+CEL
+--------------------------
+ * cel_pgsql now supports the 'extra' column for data added using the
+   CELGenUserEvent() application.
+
+pbx_lua
+--------------------------
+ * Support for defining hints has been added to pbx_lua.  See the 'hints' table
+   in the sample extensions.lua file for syntax details.
+ * Applications that perform jumps in the dialplan such as Goto will now
+   execute properly.  When pbx_lua detects that the context, extension, or
+   priority we are executing on has changed it will immediatly return control
+   to the asterisk PBX engine.  Currently the engine cannot detect a Goto to
+   the priority after the currently executing priority.
+ * An autoservice is now started by default for pbx_lua channels.  It can be
+   stopped and restarted using the autoservice_stop() and autoservice_start()
    functions.
 
 ------------------------------------------------------------------------------
@@ -166,6 +219,7 @@
    res_stun_monitor module support in chan_sip.
  * Addition of the 'auth_options_requests' option for turning on and off
    authentication for OPTIONS requests in chan_sip.
+ * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
 
 
 IAX2 Changes
@@ -272,6 +326,8 @@
  * Added 'D' command to ExternalIVR full details in doc/externalivr.txt
  * Added 'v' option to MeetMe to play voicemail greetings when a user joins/leaves
    a MeetMe conference
+ * Added ability to include '@parkinglot' to ParkedCall extension in order to specify
+   a specific parkinglot on which to search the extension.
 
 Dialplan Functions
 ------------------
@@ -527,6 +583,8 @@
  * Added a new eventfilter option per user to allow whitelisting and blacklisting
    of events.
  * Added optional parkinglot variable for park command.
+ * Added ConnectedLineNum and ConnectedLineName headers to AMI events/responses
+   if CallerIDNum and CallerIDName headers are also present.
 
 Channel Event Logging
 ---------------------

Modified: team/dvossel/celt_codec_ftw/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/Makefile?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/Makefile (original)
+++ team/dvossel/celt_codec_ftw/Makefile Mon Jun 27 12:54:15 2011
@@ -545,7 +545,6 @@
 	$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)"
 	$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv"
 	$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom"
-	$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-csv"
 	$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)"
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation"
@@ -558,6 +557,7 @@
 	$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
 	$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
 	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
+	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
 	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
@@ -925,7 +925,7 @@
 menuselect/makeopts: makeopts
 	+$(MAKE_MENUSELECT) makeopts
 
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
 	@echo "Generating input for menuselect ..."
 	@echo "<?xml version=\"1.0\"?>" > $@
 	@echo >> $@

Modified: team/dvossel/celt_codec_ftw/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/UPGRADE-1.8.txt?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/UPGRADE-1.8.txt (original)
+++ team/dvossel/celt_codec_ftw/UPGRADE-1.8.txt Mon Jun 27 12:54:15 2011
@@ -132,6 +132,14 @@
 
 * The default value for the pedantic option in sip.conf has been changed
   from "no" to "yes".
+
+* The ConnectedLineNum and ConnectedLineName headers were added to many AMI
+  events/responses if the CallerIDNum/CallerIDName headers were also present.
+  The addition of connected line support changes the behavior of the channel
+  caller ID somewhat.  The channel caller ID value no longer time shares with
+  the connected line ID on outgoing call legs.  The timing of some AMI
+  events/responses output the connected line ID as caller ID.  These party ID's
+  are now separate.
 
 From 1.6.1 to 1.6.2:
 

Modified: team/dvossel/celt_codec_ftw/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/UPGRADE.txt?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/UPGRADE.txt (original)
+++ team/dvossel/celt_codec_ftw/UPGRADE.txt Mon Jun 27 12:54:15 2011
@@ -21,6 +21,14 @@
 
 From 1.8 to 1.10:
 
+cel_pgsql:
+ - This module now expects an 'extra' column in the database for data added
+   using the CELGenUserEvent() application.
+
+ConfBridge
+ - ConfBridge's dialplan arguments have changed and are not
+   backwards compatible.
+
 HTTP:
  - A bindaddr must be specified in order for the HTTP server
    to run. Previous versions would default to 0.0.0.0 if no
@@ -34,5 +42,13 @@
  - The mohinterpret=passthrough setting is deprecated in favor of
    moh_signaling=notify.
 
+pbx_lua:
+ - Execution no longer continues after applications that do dialplan jumps
+   (such as app.goto).  Now when an application such as app.goto() is called,
+   control is returned back to the pbx engine and the current extension
+   function stops executing.
+ - the autoservice now defaults to being on by default
+ - autoservice_start() and autoservice_start() no longer return a value.
+
 ===========================================================
 ===========================================================

Modified: team/dvossel/celt_codec_ftw/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/app_mysql.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/app_mysql.c (original)
+++ team/dvossel/celt_codec_ftw/addons/app_mysql.c Mon Jun 27 12:54:15 2011
@@ -546,7 +546,10 @@
 	result = 0;
 
 	if (autoclear) {
-		struct ast_datastore *mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
+		struct ast_datastore *mysql_store = NULL;
+
+		ast_channel_lock(chan);
+		mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
 		if (!mysql_store) {
 			if (!(mysql_store = ast_datastore_alloc(&mysql_ds_info, NULL))) {
 				ast_log(LOG_WARNING, "Unable to allocate new datastore.\n");
@@ -555,6 +558,7 @@
 				ast_channel_datastore_add(chan, mysql_store);
 			}
 		}
+		ast_channel_unlock(chan);
 	}
 	ast_mutex_lock(&_mysql_mutex);
 

Modified: team/dvossel/celt_codec_ftw/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/cdr_mysql.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/cdr_mysql.c (original)
+++ team/dvossel/celt_codec_ftw/addons/cdr_mysql.c Mon Jun 27 12:54:15 2011
@@ -325,7 +325,7 @@
 				ast_str_make_space(&escape, (valsz = strlen(value)) * 2 + 1);
 				mysql_real_escape_string(&mysql, ast_str_buffer(escape), value, valsz);
 
-				ast_str_append(&sql1, 0, "%s", entry->name);
+				ast_str_append(&sql1, 0, "`%s`", entry->name);
 				ast_str_append(&sql2, 0, "'%s'", ast_str_buffer(escape));
 			}
 		}

Modified: team/dvossel/celt_codec_ftw/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/chan_mobile.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/chan_mobile.c (original)
+++ team/dvossel/celt_codec_ftw/addons/chan_mobile.c Mon Jun 27 12:54:15 2011
@@ -1185,7 +1185,7 @@
 	int res = AST_DEVICE_INVALID;
 	struct mbl_pvt *pvt;
 
-	device = ast_strdupa(S_OR(data, ""));
+	device = ast_strdupa(S_OR((char *) data, ""));
 
 	ast_debug(1, "Checking device state for device %s\n", device);
 

Modified: team/dvossel/celt_codec_ftw/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/chan_ooh323.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/chan_ooh323.c (original)
+++ team/dvossel/celt_codec_ftw/addons/chan_ooh323.c Mon Jun 27 12:54:15 2011
@@ -1044,6 +1044,7 @@
 static int ooh323_answer(struct ast_channel *ast)
 {
 	struct ooh323_pvt *p = ast->tech_pvt;
+	char *callToken = (char *)NULL;
 
 	if (gH323Debug)
 		ast_verbose("--- ooh323_answer\n");
@@ -1051,8 +1052,18 @@
 	if (p) {
 
 		ast_mutex_lock(&p->lock);
+		callToken = (p->callToken ? strdup(p->callToken) : NULL);
 		if (ast->_state != AST_STATE_UP) {
 			ast_channel_lock(ast);
+			if (!p->alertsent) {
+	    			if (gH323Debug) {
+					ast_debug(1, "Sending forced ringback for %s, res = %d\n", 
+						callToken, ooManualRingback(callToken));
+				} else {
+	    				ooManualRingback(callToken);
+				}
+				p->alertsent = 1;
+			}
 			ast_setstate(ast, AST_STATE_UP);
       			if (option_debug)
 				ast_debug(1, "ooh323_answer(%s)\n", ast->name);
@@ -1220,6 +1231,7 @@
 				}
 				p->alertsent = 1;
 			}
+			p->alertsent = 1;
 		}
 	 break;
 	case AST_CONTROL_SRCUPDATE:

Modified: team/dvossel/celt_codec_ftw/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/ooh323c/src/oochannels.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/ooh323c/src/oochannels.c (original)
+++ team/dvossel/celt_codec_ftw/addons/ooh323c/src/oochannels.c Mon Jun 27 12:54:15 2011
@@ -682,10 +682,11 @@
 
     if (0 != call->pH245Channel && 0 != call->pH245Channel->sock)
     {
-     if(call->pH245Channel->outQueue.count>0)
-     {                           
-      if(ooPDWrite(pfds, nfds, call->pH245Channel->sock))
-       ooSendMsg(call, OOH245MSG);
+     if(ooPDWrite(pfds, nfds, call->pH245Channel->sock)) {
+      while (call->pH245Channel->outQueue.count>0) {
+       if (ooSendMsg(call, OOH245MSG) != OO_OK)
+	break;
+      }
      }
     }
     else if(call->h245listener)
@@ -702,20 +703,23 @@
     {
      if(ooPDWrite(pfds, nfds, call->pH225Channel->sock))
      {
-      if(call->pH225Channel->outQueue.count>0)
+      while (call->pH225Channel->outQueue.count>0)
       {
        OOTRACEDBGC3("Sending H225 message (%s, %s)\n", 
                         call->callType, call->callToken);
-       ooSendMsg(call, OOQ931MSG);
+       if (ooSendMsg(call, OOQ931MSG) != OO_OK)
+	break;
       }
       if(call->pH245Channel && 
          call->pH245Channel->outQueue.count>0 && 
-        OO_TESTFLAG (call->flags, OO_M_TUNNELING))
-      {
+        OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+       while (call->pH245Channel->outQueue.count>0) {
         OOTRACEDBGC3("H245 message needs to be tunneled. "
                           "(%s, %s)\n", call->callType, 
                                call->callToken);
-        ooSendMsg(call, OOH245MSG);
+        if (ooSendMsg(call, OOH245MSG) != OO_OK)
+	 break;
+       }
       }
      }                                
     }
@@ -1330,7 +1334,7 @@
    {
       OOTRACEDBGA3("Warning:Call marked for cleanup. Can not send message."
                    "(%s, %s)\n", call->callType, call->callToken);
-      return OO_OK;
+      return OO_FAILED;
    }
 
    if(type == OOQ931MSG)

Modified: team/dvossel/celt_codec_ftw/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/ooh323c/src/ooh245.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/ooh323c/src/ooh245.c (original)
+++ team/dvossel/celt_codec_ftw/addons/ooh323c/src/ooh245.c Mon Jun 27 12:54:15 2011
@@ -2126,6 +2126,8 @@
                ooClearAllLogicalChannels(call);
             }
             ooSendEndSessionCommand(call);
+	    if (call->callState < OO_CALL_CLEAR)
+	        call->callState = OO_CALL_CLEAR;
          }
             
             

Modified: team/dvossel/celt_codec_ftw/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/addons/res_config_mysql.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/addons/res_config_mysql.c (original)
+++ team/dvossel/celt_codec_ftw/addons/res_config_mysql.c Mon Jun 27 12:54:15 2011
@@ -398,7 +398,7 @@
 				} else if (ast_strlen_zero(row[i])) {
 					row[i] = " ";
 				}
-				for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+				for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
 					if (prev) {
 						if ((prev->next = ast_variable_new(fields[i].name, decode_chunk(chunk), ""))) {
 							prev = prev->next;
@@ -524,7 +524,7 @@
 			for (i = 0; i < numFields; i++) {
 				if (ast_strlen_zero(row[i]))
 					continue;
-				for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+				for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
 					if (chunk && !ast_strlen_zero(decode_chunk(ast_strip(chunk)))) {
 						if (initfield && !strcmp(initfield, fields[i].name)) {
 							ast_category_rename(cat, chunk);
@@ -608,7 +608,7 @@
 	   If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
 
 	ESCAPE_STRING(buf, newval);
-	ast_str_set(&sql, 0, "UPDATE %s SET %s = '%s'", tablename, newparam, ast_str_buffer(buf));
+	ast_str_set(&sql, 0, "UPDATE %s SET `%s` = '%s'", tablename, newparam, ast_str_buffer(buf));
 
 	/* If the column length isn't long enough, give a chance to lengthen it. */
 	if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -625,7 +625,7 @@
 		}
 
 		ESCAPE_STRING(buf, newval);
-		ast_str_append(&sql, 0, ", %s = '%s'", newparam, ast_str_buffer(buf));
+		ast_str_append(&sql, 0, ", `%s` = '%s'", newparam, ast_str_buffer(buf));
 
 		/* If the column length isn't long enough, give a chance to lengthen it. */
 		if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -635,7 +635,7 @@
 	va_end(ap);
 
 	ESCAPE_STRING(buf, lookup);
-	ast_str_append(&sql, 0, " WHERE %s = '%s'", keyfield, ast_str_buffer(buf));
+	ast_str_append(&sql, 0, " WHERE `%s` = '%s'", keyfield, ast_str_buffer(buf));
 
 	ast_debug(1, "MySQL RealTime: Update SQL: %s\n", ast_str_buffer(sql));
 
@@ -719,7 +719,7 @@
 			return -1;
 		}
 		ESCAPE_STRING(buf, newval);
-		ast_str_append(&where, 0, "%s %s='%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
+		ast_str_append(&where, 0, "%s `%s` = '%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
 		first = 0;
 
 		/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -744,7 +744,7 @@
 		}
 
 		ESCAPE_STRING(buf, newval);
-		ast_str_append(&sql, 0, "%s %s = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
+		ast_str_append(&sql, 0, "%s `%s` = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
 		first = 0;
 
 		/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -816,7 +816,7 @@
 	/* Create the first part of the query using the first parameter/value pairs we just extracted
 		If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
 	ESCAPE_STRING(buf, newval);
-	ast_str_set(&sql, 0, "INSERT INTO %s (%s", table, newparam);
+	ast_str_set(&sql, 0, "INSERT INTO %s (`%s`", table, newparam);
 	ast_str_set(&sql2, 0, ") VALUES ('%s'", ast_str_buffer(buf));
 
 	internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
@@ -828,7 +828,7 @@
 			ast_str_reset(buf);
 		}
 		if (internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL) == 0) {
-			ast_str_append(&sql, 0, ", %s", newparam);
+			ast_str_append(&sql, 0, ", `%s`", newparam);
 			ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf));
 		}
 	}
@@ -894,11 +894,11 @@
 	/* Create the first part of the query using the first parameter/value pairs we just extracted
 	   If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
 	ESCAPE_STRING(buf, lookup);
-	ast_str_set(&sql, 0, "DELETE FROM %s WHERE %s = '%s'", table, keyfield, ast_str_buffer(buf));
+	ast_str_set(&sql, 0, "DELETE FROM %s WHERE `%s` = '%s'", table, keyfield, ast_str_buffer(buf));
 	while ((newparam = va_arg(ap, const char *))) {
 		newval = va_arg(ap, const char *);
 		ESCAPE_STRING(buf, newval);
-		ast_str_append(&sql, 0, " AND %s = '%s'", newparam, ast_str_buffer(buf));
+		ast_str_append(&sql, 0, " AND `%s` = '%s'", newparam, ast_str_buffer(buf));
 	}
 	va_end(ap);
 
@@ -1074,7 +1074,7 @@
 			res = -1;
 			break;
 		}
-		ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY %s %s", tablename, column->name, ast_str_buffer(typestr));
+		ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY `%s` %s", tablename, column->name, ast_str_buffer(typestr));
 		if (!column->null) {
 			ast_str_append(&sql, 0, " NOT NULL");
 		}

Modified: team/dvossel/celt_codec_ftw/apps/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/apps/Makefile?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/apps/Makefile (original)
+++ team/dvossel/celt_codec_ftw/apps/Makefile Mon Jun 27 12:54:15 2011
@@ -27,6 +27,12 @@
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
+clean::
+	rm -f confbridge/*.o confbridge/*.i
+
+$(if $(filter app_confbridge,$(EMBEDDED_MODS)),modules.link,app_confbridge.so): $(subst .c,.o,$(wildcard confbridge/*.c))
+$(subst .c,.o,$(wildcard confbridge/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,app_confbridge)
+
 ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
   LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
   LIBS+= -lres_smdi.so

Modified: team/dvossel/celt_codec_ftw/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/apps/app_amd.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/apps/app_amd.c (original)
+++ team/dvossel/celt_codec_ftw/apps/app_amd.c Mon Jun 27 12:54:15 2011
@@ -157,7 +157,6 @@
 	int iTotalTime = 0;
 	int iWordsCount = 0;
 	int currentState = STATE_IN_WORD;
-	int previousState = STATE_IN_SILENCE;
 	int consecutiveVoiceDuration = 0;
 	char amdCause[256] = "", amdStatus[256] = "";
 	char *parse = ast_strdupa(data);
@@ -303,7 +302,6 @@
 				
 				if (silenceDuration >= betweenWordsSilence) {
 					if (currentState != STATE_IN_SILENCE ) {
-						previousState = currentState;
 						ast_verb(3, "AMD: Channel [%s]. Changed state to STATE_IN_SILENCE\n", chan->name);
 					}
 					/* Find words less than word duration */
@@ -343,7 +341,6 @@
 				if (consecutiveVoiceDuration >= minimumWordLength && currentState == STATE_IN_SILENCE) {
 					iWordsCount++;
 					ast_verb(3, "AMD: Channel [%s]. Word detected. iWordsCount:%d\n", chan->name, iWordsCount);
-					previousState = currentState;
 					currentState = STATE_IN_WORD;
 				}
 				if (consecutiveVoiceDuration >= maximumWordLength){

Modified: team/dvossel/celt_codec_ftw/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/apps/app_chanspy.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/apps/app_chanspy.c (original)
+++ team/dvossel/celt_codec_ftw/apps/app_chanspy.c Mon Jun 27 12:54:15 2011
@@ -404,6 +404,7 @@
 	struct ast_audiohook bridge_whisper_audiohook;
 	int fd;
 	int volfactor;
+	struct ast_flags flags;
 };
 
 struct spy_dtmf_options {
@@ -438,7 +439,7 @@
 		return -1;
 	}
 
-	if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) {
+	if (ast_test_flag(&csth->flags, OPTION_READONLY)) {
 		/* Option 'o' was set, so don't mix channel audio */
 		f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, &format_slin);
 	} else {
@@ -539,7 +540,7 @@
 			spyer_name, name);
 
 	memset(&csth, 0, sizeof(csth));
-	ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL);
+	ast_copy_flags(&csth.flags, flags, AST_FLAGS_ALL);
 
 	ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy", 0);
 

Modified: team/dvossel/celt_codec_ftw/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/celt_codec_ftw/apps/app_confbridge.c?view=diff&rev=325017&r1=325016&r2=325017
==============================================================================
--- team/dvossel/celt_codec_ftw/apps/app_confbridge.c (original)
+++ team/dvossel/celt_codec_ftw/apps/app_confbridge.c Mon Jun 27 12:54:15 2011
@@ -4,6 +4,7 @@
  * Copyright (C) 2007-2008, Digium, Inc.
  *
  * Joshua Colp <jcolp at digium.com>
+ * David Vossel <dvossel at digium.com>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -21,6 +22,7 @@
  * \brief Conference Bridge application
  *
  * \author\verbatim Joshua Colp <jcolp at digium.com> \endverbatim
+ * \author\verbatim David Vossel <dvossel at digium.com> \endverbatim
  *
  * This is a conference bridge application utilizing the bridging core.
  * \ingroup applications
@@ -38,69 +40,199 @@
 
 #include "asterisk/cli.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
+#include "asterisk/pbx.h"
 #include "asterisk/pbx.h"
 #include "asterisk/module.h"
 #include "asterisk/lock.h"
-#include "asterisk/app.h"
 #include "asterisk/bridging.h"
 #include "asterisk/musiconhold.h"
 #include "asterisk/say.h"
 #include "asterisk/audiohook.h"
 #include "asterisk/astobj2.h"
+#include "confbridge/include/confbridge.h"
+#include "asterisk/paths.h"
+#include "asterisk/manager.h"
 
 /*** DOCUMENTATION
-        <application name="ConfBridge" language="en_US">
-                <synopsis>
-                        Conference bridge application.
-                </synopsis>
-                <syntax>
-                        <parameter name="confno">
-                                <para>The conference number</para>
-                        </parameter>
-                        <parameter name="options">
-                                <optionlist>
-                                        <option name="a">
-                                                <para>Set admin mode.</para>
-                                        </option>
-                                        <option name="A">
-                                                <para>Set marked mode.</para>
-                                        </option>
-                                        <option name="c">
-                                                <para>Announce user(s) count on joining a conference.</para>
-                                        </option>
-                                        <option name="m">
-                                                <para>Set initially muted.</para>
-                                        </option>
-                                        <option name="M" hasparams="optional">
-                                                <para>Enable music on hold when the conference has a single caller. Optionally,
-                                                specify a musiconhold class to use. If one is not provided, it will use the
-                                                channel's currently set music class, or <literal>default</literal>.</para>
-                                                <argument name="class" required="true" />
-                                        </option>
-                                        <option name="1">
-                                                <para>Do not play message when first person enters</para>
-                                        </option>
-                                        <option name="s">

[... 25375 lines stripped ...]

More information about the svn-commits mailing list