[svn-commits] jpeeler: branch may/chan_ooh323_rework r224843 - in /team/may/chan_ooh323_rew...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Oct 20 15:08:35 CDT 2009 

Author: jpeeler
Date: Tue Oct 20 15:08:22 2009
New Revision: 224843

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=224843
Log:
sync with trunk

Added:
    team/may/chan_ooh323_rework/apps/app_voicemail.exports
      - copied unchanged from r224738, trunk/apps/app_voicemail.exports
    team/may/chan_ooh323_rework/autoconf/libcurl.m4
      - copied unchanged from r224738, trunk/autoconf/libcurl.m4
    team/may/chan_ooh323_rework/doc/IAX2-security.pdf
      - copied unchanged from r224738, trunk/doc/IAX2-security.pdf
    team/may/chan_ooh323_rework/doc/IAX2-security.txt
      - copied unchanged from r224738, trunk/doc/IAX2-security.txt
    team/may/chan_ooh323_rework/doc/lang/language-criteria.txt
      - copied unchanged from r224738, trunk/doc/lang/language-criteria.txt
    team/may/chan_ooh323_rework/include/asterisk/doxygen/mantisworkflow.h
      - copied unchanged from r224738, trunk/include/asterisk/doxygen/mantisworkflow.h
    team/may/chan_ooh323_rework/res/res_mutestream.c
      - copied unchanged from r224738, trunk/res/res_mutestream.c
Removed:
    team/may/chan_ooh323_rework/contrib/firmware/iax/iaxy.bin
Modified:
    team/may/chan_ooh323_rework/   (props changed)
    team/may/chan_ooh323_rework/CHANGES
    team/may/chan_ooh323_rework/CREDITS
    team/may/chan_ooh323_rework/Makefile
    team/may/chan_ooh323_rework/Makefile.rules
    team/may/chan_ooh323_rework/UPGRADE-1.4.txt
    team/may/chan_ooh323_rework/UPGRADE-1.6.txt
    team/may/chan_ooh323_rework/UPGRADE.txt
    team/may/chan_ooh323_rework/addons/Makefile
    team/may/chan_ooh323_rework/addons/app_mysql.c
    team/may/chan_ooh323_rework/addons/app_saycountpl.c
    team/may/chan_ooh323_rework/addons/cdr_mysql.c
    team/may/chan_ooh323_rework/addons/chan_ooh323.c
    team/may/chan_ooh323_rework/addons/format_mp3.c
    team/may/chan_ooh323_rework/addons/res_config_mysql.c
    team/may/chan_ooh323_rework/agi/eagi-sphinx-test.c
    team/may/chan_ooh323_rework/agi/eagi-test.c
    team/may/chan_ooh323_rework/apps/app_adsiprog.c
    team/may/chan_ooh323_rework/apps/app_alarmreceiver.c
    team/may/chan_ooh323_rework/apps/app_chanspy.c
    team/may/chan_ooh323_rework/apps/app_confbridge.c
    team/may/chan_ooh323_rework/apps/app_dahdibarge.c
    team/may/chan_ooh323_rework/apps/app_dial.c
    team/may/chan_ooh323_rework/apps/app_directed_pickup.c
    team/may/chan_ooh323_rework/apps/app_directory.c
    team/may/chan_ooh323_rework/apps/app_disa.c
    team/may/chan_ooh323_rework/apps/app_fax.c
    team/may/chan_ooh323_rework/apps/app_followme.c
    team/may/chan_ooh323_rework/apps/app_macro.c
    team/may/chan_ooh323_rework/apps/app_meetme.c
    team/may/chan_ooh323_rework/apps/app_minivm.c
    team/may/chan_ooh323_rework/apps/app_mixmonitor.c
    team/may/chan_ooh323_rework/apps/app_morsecode.c
    team/may/chan_ooh323_rework/apps/app_originate.c
    team/may/chan_ooh323_rework/apps/app_osplookup.c
    team/may/chan_ooh323_rework/apps/app_playback.c
    team/may/chan_ooh323_rework/apps/app_privacy.c
    team/may/chan_ooh323_rework/apps/app_queue.c
    team/may/chan_ooh323_rework/apps/app_readfile.c
    team/may/chan_ooh323_rework/apps/app_record.c
    team/may/chan_ooh323_rework/apps/app_rpt.c
    team/may/chan_ooh323_rework/apps/app_setcallerid.c
    team/may/chan_ooh323_rework/apps/app_sms.c
    team/may/chan_ooh323_rework/apps/app_softhangup.c
    team/may/chan_ooh323_rework/apps/app_stack.c
    team/may/chan_ooh323_rework/apps/app_talkdetect.c
    team/may/chan_ooh323_rework/apps/app_verbose.c
    team/may/chan_ooh323_rework/apps/app_voicemail.c
    team/may/chan_ooh323_rework/apps/app_waitforring.c
    team/may/chan_ooh323_rework/apps/app_waitforsilence.c
    team/may/chan_ooh323_rework/apps/app_waituntil.c
    team/may/chan_ooh323_rework/autoconf/ast_ext_lib.m4
    team/may/chan_ooh323_rework/build_tools/mkpkgconfig
    team/may/chan_ooh323_rework/build_tools/prep_tarball
    team/may/chan_ooh323_rework/cdr/cdr_adaptive_odbc.c
    team/may/chan_ooh323_rework/cdr/cdr_pgsql.c
    team/may/chan_ooh323_rework/cdr/cdr_sqlite3_custom.c
    team/may/chan_ooh323_rework/cel/cel_adaptive_odbc.c
    team/may/chan_ooh323_rework/cel/cel_pgsql.c
    team/may/chan_ooh323_rework/channels/chan_agent.c
    team/may/chan_ooh323_rework/channels/chan_console.c
    team/may/chan_ooh323_rework/channels/chan_dahdi.c
    team/may/chan_ooh323_rework/channels/chan_gtalk.c
    team/may/chan_ooh323_rework/channels/chan_h323.c
    team/may/chan_ooh323_rework/channels/chan_iax2.c
    team/may/chan_ooh323_rework/channels/chan_jingle.c
    team/may/chan_ooh323_rework/channels/chan_local.c
    team/may/chan_ooh323_rework/channels/chan_mgcp.c
    team/may/chan_ooh323_rework/channels/chan_misdn.c
    team/may/chan_ooh323_rework/channels/chan_oss.c
    team/may/chan_ooh323_rework/channels/chan_phone.c
    team/may/chan_ooh323_rework/channels/chan_sip.c
    team/may/chan_ooh323_rework/channels/chan_skinny.c
    team/may/chan_ooh323_rework/channels/chan_unistim.c
    team/may/chan_ooh323_rework/channels/chan_usbradio.c
    team/may/chan_ooh323_rework/channels/iax2-parser.c
    team/may/chan_ooh323_rework/channels/iax2-parser.h
    team/may/chan_ooh323_rework/channels/iax2-provision.c
    team/may/chan_ooh323_rework/channels/iax2.h
    team/may/chan_ooh323_rework/channels/misdn/isdn_lib.c
    team/may/chan_ooh323_rework/channels/misdn/isdn_lib_intern.h
    team/may/chan_ooh323_rework/channels/misdn_config.c
    team/may/chan_ooh323_rework/channels/sig_analog.c
    team/may/chan_ooh323_rework/channels/sig_analog.h
    team/may/chan_ooh323_rework/channels/sig_pri.c
    team/may/chan_ooh323_rework/channels/sig_pri.h
    team/may/chan_ooh323_rework/channels/xpmr/xpmr.c
    team/may/chan_ooh323_rework/codecs/codec_speex.c
    team/may/chan_ooh323_rework/configs/cdr_custom.conf.sample
    team/may/chan_ooh323_rework/configs/cdr_pgsql.conf.sample
    team/may/chan_ooh323_rework/configs/chan_dahdi.conf.sample
    team/may/chan_ooh323_rework/configs/extconfig.conf.sample
    team/may/chan_ooh323_rework/configs/extensions.conf.sample
    team/may/chan_ooh323_rework/configs/func_odbc.conf.sample
    team/may/chan_ooh323_rework/configs/iax.conf.sample
    team/may/chan_ooh323_rework/configs/jabber.conf.sample
    team/may/chan_ooh323_rework/configs/mgcp.conf.sample
    team/may/chan_ooh323_rework/configs/queues.conf.sample
    team/may/chan_ooh323_rework/configs/res_ldap.conf.sample
    team/may/chan_ooh323_rework/configs/res_odbc.conf.sample
    team/may/chan_ooh323_rework/configs/sip.conf.sample
    team/may/chan_ooh323_rework/configs/sip_notify.conf.sample
    team/may/chan_ooh323_rework/configs/udptl.conf.sample
    team/may/chan_ooh323_rework/configs/voicemail.conf.sample
    team/may/chan_ooh323_rework/configure
    team/may/chan_ooh323_rework/configure.ac
    team/may/chan_ooh323_rework/contrib/scripts/asterisk.ldap-schema
    team/may/chan_ooh323_rework/contrib/scripts/asterisk.ldif
    team/may/chan_ooh323_rework/contrib/scripts/iax-friends.sql
    team/may/chan_ooh323_rework/contrib/scripts/live_ast
    team/may/chan_ooh323_rework/doc/CODING-GUIDELINES
    team/may/chan_ooh323_rework/doc/jabber.txt
    team/may/chan_ooh323_rework/doc/janitor-projects.txt
    team/may/chan_ooh323_rework/doc/manager_1_1.txt
    team/may/chan_ooh323_rework/doc/tex/asterisk.tex
    team/may/chan_ooh323_rework/doc/tex/channelvariables.tex
    team/may/chan_ooh323_rework/formats/format_siren14.c
    team/may/chan_ooh323_rework/funcs/func_callerid.c
    team/may/chan_ooh323_rework/funcs/func_channel.c
    team/may/chan_ooh323_rework/funcs/func_curl.c
    team/may/chan_ooh323_rework/funcs/func_cut.c
    team/may/chan_ooh323_rework/funcs/func_dialgroup.c
    team/may/chan_ooh323_rework/funcs/func_dialplan.c
    team/may/chan_ooh323_rework/funcs/func_enum.c
    team/may/chan_ooh323_rework/funcs/func_lock.c
    team/may/chan_ooh323_rework/funcs/func_math.c
    team/may/chan_ooh323_rework/funcs/func_odbc.c
    team/may/chan_ooh323_rework/funcs/func_rand.c
    team/may/chan_ooh323_rework/funcs/func_speex.c
    team/may/chan_ooh323_rework/funcs/func_sprintf.c
    team/may/chan_ooh323_rework/funcs/func_strings.c
    team/may/chan_ooh323_rework/funcs/func_timeout.c
    team/may/chan_ooh323_rework/funcs/func_volume.c
    team/may/chan_ooh323_rework/include/asterisk.h
    team/may/chan_ooh323_rework/include/asterisk/acl.h
    team/may/chan_ooh323_rework/include/asterisk/aes.h
    team/may/chan_ooh323_rework/include/asterisk/app.h
    team/may/chan_ooh323_rework/include/asterisk/astobj2.h
    team/may/chan_ooh323_rework/include/asterisk/autoconfig.h.in
    team/may/chan_ooh323_rework/include/asterisk/calendar.h
    team/may/chan_ooh323_rework/include/asterisk/callerid.h
    team/may/chan_ooh323_rework/include/asterisk/cdr.h
    team/may/chan_ooh323_rework/include/asterisk/channel.h
    team/may/chan_ooh323_rework/include/asterisk/doxyref.h
    team/may/chan_ooh323_rework/include/asterisk/event.h
    team/may/chan_ooh323_rework/include/asterisk/features.h
    team/may/chan_ooh323_rework/include/asterisk/file.h
    team/may/chan_ooh323_rework/include/asterisk/frame.h
    team/may/chan_ooh323_rework/include/asterisk/jabber.h
    team/may/chan_ooh323_rework/include/asterisk/lock.h
    team/may/chan_ooh323_rework/include/asterisk/netsock.h
    team/may/chan_ooh323_rework/include/asterisk/pbx.h
    team/may/chan_ooh323_rework/include/asterisk/rtp_engine.h
    team/may/chan_ooh323_rework/include/asterisk/sched.h
    team/may/chan_ooh323_rework/main/Makefile
    team/may/chan_ooh323_rework/main/acl.c
    team/may/chan_ooh323_rework/main/alaw.c
    team/may/chan_ooh323_rework/main/app.c
    team/may/chan_ooh323_rework/main/asterisk.c
    team/may/chan_ooh323_rework/main/astfd.c
    team/may/chan_ooh323_rework/main/astobj2.c
    team/may/chan_ooh323_rework/main/autoservice.c
    team/may/chan_ooh323_rework/main/cdr.c
    team/may/chan_ooh323_rework/main/cel.c
    team/may/chan_ooh323_rework/main/channel.c
    team/may/chan_ooh323_rework/main/cli.c
    team/may/chan_ooh323_rework/main/config.c
    team/may/chan_ooh323_rework/main/dnsmgr.c
    team/may/chan_ooh323_rework/main/dsp.c
    team/may/chan_ooh323_rework/main/enum.c
    team/may/chan_ooh323_rework/main/features.c
    team/may/chan_ooh323_rework/main/file.c
    team/may/chan_ooh323_rework/main/frame.c
    team/may/chan_ooh323_rework/main/http.c
    team/may/chan_ooh323_rework/main/indications.c
    team/may/chan_ooh323_rework/main/loader.c
    team/may/chan_ooh323_rework/main/logger.c
    team/may/chan_ooh323_rework/main/manager.c
    team/may/chan_ooh323_rework/main/netsock.c
    team/may/chan_ooh323_rework/main/pbx.c
    team/may/chan_ooh323_rework/main/poll.c
    team/may/chan_ooh323_rework/main/rtp_engine.c
    team/may/chan_ooh323_rework/main/say.c
    team/may/chan_ooh323_rework/main/tcptls.c
    team/may/chan_ooh323_rework/main/timing.c
    team/may/chan_ooh323_rework/main/udptl.c
    team/may/chan_ooh323_rework/main/ulaw.c
    team/may/chan_ooh323_rework/main/utils.c
    team/may/chan_ooh323_rework/main/xml.c
    team/may/chan_ooh323_rework/main/xmldoc.c
    team/may/chan_ooh323_rework/makeopts.in
    team/may/chan_ooh323_rework/pbx/pbx_config.c
    team/may/chan_ooh323_rework/pbx/pbx_dundi.c
    team/may/chan_ooh323_rework/pbx/pbx_loopback.c
    team/may/chan_ooh323_rework/pbx/pbx_lua.c
    team/may/chan_ooh323_rework/pbx/pbx_spool.c
    team/may/chan_ooh323_rework/res/ael/pval.c
    team/may/chan_ooh323_rework/res/res_agi.c
    team/may/chan_ooh323_rework/res/res_calendar.c
    team/may/chan_ooh323_rework/res/res_calendar_caldav.c
    team/may/chan_ooh323_rework/res/res_calendar_exchange.c
    team/may/chan_ooh323_rework/res/res_calendar_icalendar.c
    team/may/chan_ooh323_rework/res/res_clialiases.c
    team/may/chan_ooh323_rework/res/res_config_curl.c
    team/may/chan_ooh323_rework/res/res_config_ldap.c
    team/may/chan_ooh323_rework/res/res_config_odbc.c
    team/may/chan_ooh323_rework/res/res_config_pgsql.c
    team/may/chan_ooh323_rework/res/res_config_sqlite.c
    team/may/chan_ooh323_rework/res/res_http_post.c
    team/may/chan_ooh323_rework/res/res_jabber.c
    team/may/chan_ooh323_rework/res/res_limit.c
    team/may/chan_ooh323_rework/res/res_musiconhold.c
    team/may/chan_ooh323_rework/res/res_odbc.c
    team/may/chan_ooh323_rework/res/res_phoneprov.c
    team/may/chan_ooh323_rework/res/res_rtp_asterisk.c
    team/may/chan_ooh323_rework/res/res_smdi.c
    team/may/chan_ooh323_rework/res/snmp/agent.c
    team/may/chan_ooh323_rework/sounds/Makefile
    team/may/chan_ooh323_rework/sounds/sounds.xml
    team/may/chan_ooh323_rework/utils/extconf.c
    team/may/chan_ooh323_rework/utils/frame.c
    team/may/chan_ooh323_rework/utils/muted.c

Propchange: team/may/chan_ooh323_rework/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 20 15:08:22 2009
@@ -1,1 +1,1 @@
-/trunk:1-204982
+/trunk:1-224772

Modified: team/may/chan_ooh323_rework/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/CHANGES?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/CHANGES (original)
+++ team/may/chan_ooh323_rework/CHANGES Tue Oct 20 15:08:22 2009
@@ -41,16 +41,24 @@
    force_rport forces RFC 3581 behavior and disables symmetric RTP support.
    Setting it to comedia enables RFC 3581 behavior if the remote side requests it
    and enables symmetric RTP support.
+ * Slave SIP channels now set HASH(SIP_CAUSE,<slave-channel-name>) on each
+   response.  This permits the master channel to know how each channel dialled
+   in a multi-channel setup resolved in an individual way.
+ * Added 'externtcpport' and 'externtlsport' options to allow custom port
+   configuration for the externip and externhost options when tcp or tls is used.
+ * Added support for message body (stored in content variable) to SIP NOTIFY message
+   accessible via AMI and CLI.
 
 IAX2 Changes
 -----------
  * Added rtsavesysname option into iax.conf to allow the systname to be saved
    on realtime updates.
 
-DAHDI Changes
--------------
- * Added Reverse Charging Indication receipt & transmission (requires latest
-   LibPRI).
+MGCP Changes
+------------
+ * Added ability to preset channel variables on indicated lines with the setvar
+   configuration option.  Also, clearvars=all resets the list of variables back
+   to none.
 
 Applications
 ------------
@@ -65,9 +73,11 @@
    exit the application.
  * The Voicemail application has been improved to automatically ignore messages
    that only contain silence.
- * The ChanSpy application now has the 's' option, which makes the application
+ * The ChanSpy application now has the 'S' option, which makes the application
    automatically exit once it hits a point where no more channels are available
    to spy on.
+ * The ChanSpy application also now has the 'E' option, which spies on a single
+   channel and exits when that channel hangs up.
 
 Dialplan Functions
 ------------------
@@ -98,6 +108,27 @@
            disabled)
      voice - voice mode (returns from FAX mode, reverting the changes that
              were made when FAX mode was requested)
+ * Added new dialplan function MASTER_CHANNEL(), which permits retrieving
+   and setting variables on the channel which created the current channel.
+   Administrators should take care to avoid naming conflicts, when multiple
+   channels are dialled at once, especially when used with the Local channel
+   construct (which all could set variables on the master channel).  Usage
+   of the HASH() dialplan function, with the key set to the name of the slave
+   channel, is one approach that will avoid conflicts.
+ * Added new dialplan function MUTEAUDIO() for muting inbound and/or outbound
+   audio in a channel.
+ * func_odbc now allows multiple row results to be retrieved without using
+   mode=multirow.  If rowlimit is set, then additional rows may be retrieved
+   from the same query by using the name of the function which retrieved the
+   first row as an argument to ODBC_FETCH().
+  * Added JABBER_RECEIVE, which permits receiving XMPP messages from the
+    dialplan. This function returns the content of the received message.
+
+Dialplan Variables
+------------------
+ * Added DYNAMIC_FEATURENAME which holds the last triggered dynamic feature.
+ * Added DYNAMIC_PEERNAME which holds the unique channel name on the other side
+   and is set when a dynamic feature is triggered.
 
 Queue changes
 -------------
@@ -158,6 +189,29 @@
 http://svn.digium.com/svn/thirdparty/mISDN/tags
 http://svn.digium.com/svn/thirdparty/mISDNuser/tags
 
+libpri channel driver (chan_dahdi) DAHDI changes
+-------------------------------------------
+ * The channel variable PRIREDIRECTREASON is now just a status variable
+   and it is also deprecated.  Use the REDIRECTING(reason) dialplan function
+   to read and alter the reason.
+ * For Q.SIG and ETSI PRI/BRI-PTP, you should manually send the COLR of the
+   redirected-to party for an incomming redirected call if the incoming call
+   could experience further redirects.  Just set the
+   REDIRECTING(to-num,i) = CALLERID(dnid) and set the REDIRECTING(to-pres)
+   to the COLR.  A call has been redirected if the REDIRECTING(count) is not
+   zero.
+ * For outgoing Q.SIG and ETSI PRI/BRI-PTP redirected calls, you need to
+   use the inhibit(i) option on all of the REDIRECTING statements before
+   dialing the redirected-to party.  You still have to set the
+   REDIRECTING(to-xxx,i) and the REDIRECTING(from-xxx,i) values.  The call
+   will update the redirecting-to presentation (COLR) when it becomes available.
+ * Added Reverse Charging Indication receipt & transmission (requires latest
+   LibPRI).
+ * Added the ability to ignore calls that are not in a Multiple Subscriber
+   Number (MSN) list for PTMP CPE interfaces.
+ * Added dynamic range compression support for dahdi channels.  It is
+   configured via the rxdrc and txdrc parameters in chan_dahdi.conf.
+
 Asterisk Manager Interface
 --------------------------
  * The Hangup action now accepts a Cause header which may be used to
@@ -171,6 +225,8 @@
    across all .conf files. All affected sample.conf files have been modified to
    reflect this change.  Previous options such as 'sslenable' still work,
    but options with the 'tls' prefix are preferred.
+ * Added a MuteAudio AMI action for muting inbound and/or outbound audio
+   in a channel. (res_mutestream.so)
 
 Channel Event Logging
 ---------------------
@@ -216,6 +272,11 @@
    Asterisk component that reports security events.  However, SIP support will be
    coming soon.  For more information on the security events framework, see the
    "Security Events" chapter of the included documentation - doc/tex/asterisk.pdf.
+
+Miscellaneous
+-------------
+ * SendText is now implemented in chan_gtalk and chan_jingle. It will simply send
+   XMPP text messages to the remote JID.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2  -------------
@@ -366,7 +427,7 @@
    can connect calls in passthrough mode, as well as record and play back files.
  * Successful and unsuccessful call pickup can now be alerted through sounds, by
    using pickupsound and pickupfailsound in features.conf.
- * ASTVARRUNDIR is now set to $(localstatedir)/run/asterisk by default. 
+ * ASTVARRUNDIR is now set to $(localstatedir)/run/asterisk by default.
    This means the asterisk pid file will now be in /var/run/asterisk/asterisk.pid on LINUX
    instead of the /var/run/asterisk.pid where it used to be. This will make
    installs as non-root easier to manage.

Modified: team/may/chan_ooh323_rework/CREDITS
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/CREDITS?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/CREDITS (original)
+++ team/may/chan_ooh323_rework/CREDITS Tue Oct 20 15:08:22 2009
@@ -213,7 +213,7 @@
 	This product includes software developed by Brian M. Clapper <bmc(AT)clapper.org>
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 Asterisk uses libedit, the lightweight readline replacement from NetBSD.

Modified: team/may/chan_ooh323_rework/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/Makefile?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/Makefile (original)
+++ team/may/chan_ooh323_rework/Makefile Tue Oct 20 15:08:22 2009
@@ -95,10 +95,17 @@
   include makeopts
 endif
 
+# start the primary CFLAGS and LDFLAGS with any that were provided
+# to the configure script
+_ASTCFLAGS:=$(CONFIG_CFLAGS)
+_ASTLDFLAGS:=$(CONFIG_LDFLAGS)
+
 # Some build systems, such as the one in openwrt, like to pass custom target
-# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
-ASTCFLAGS+=$(COPTS)
-ASTLDFLAGS+=$(LDOPTS)
+# CFLAGS and LDFLAGS in the COPTS and LDOPTS variables; these should also
+# go before any build-system computed flags, since they are defaults, not
+# overrides
+_ASTCFLAGS+=$(COPTS)
+_ASTLDFLAGS+=$(LDOPTS)
 
 # libxml2 cflags
 _ASTCFLAGS+=$(LIBXML2_INCLUDE)
@@ -298,7 +305,7 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
-  SOLINK=-bundle -undefined suppress -force_flat_namespace
+  SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
 else
 # These are used for all but Darwin
   SOLINK=-shared
@@ -406,10 +413,10 @@
 endif
 
 $(MOD_SUBDIRS):
-	@_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+	+ at _ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
-	@_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+	+ at _ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
@@ -467,7 +474,9 @@
 	rm -f build_tools/menuselect-deps
 
 datafiles: _all
-	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	if [ `$(ID) -u` = 0 ]; then \
+		CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; \
+	fi
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
@@ -572,7 +581,7 @@
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -810,7 +819,7 @@
 		elif [ -f /etc/debian_version ]; then \
 			cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
 			chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
-			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk defaults 50 91; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
 			cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
 			chmod 755 $(DESTDIR)/etc/init.d/asterisk;\

Modified: team/may/chan_ooh323_rework/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/Makefile.rules?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/Makefile.rules (original)
+++ team/may/chan_ooh323_rework/Makefile.rules Tue Oct 20 15:08:22 2009
@@ -39,6 +39,8 @@
 
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     _ASTCFLAGS+=$(OPTIMIZE)
+else
+    _ASTCFLAGS+=-O0
 endif
 
 # shortcuts for common combinations of flags; these must be recursively expanded so that

Modified: team/may/chan_ooh323_rework/UPGRADE-1.4.txt
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/UPGRADE-1.4.txt?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/UPGRADE-1.4.txt (original)
+++ team/may/chan_ooh323_rework/UPGRADE-1.4.txt Tue Oct 20 15:08:22 2009
@@ -74,11 +74,11 @@
 use with Asterisk have been replaced with new versions produced from high quality
 master recordings, and are available in three languages (English, French and
 Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
-In addition, the music on hold files provided by FreePlay Music are now available
+In addition, the music on hold files provided by opsound.org Music are now available
 in the same five formats, but no longer available in MP3 format.
 
 The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
-(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
+(as were supplied with previous releases) and the opsound.org MOH files in WAV format.
 All of the other variations can be installed by running 'make menuselect' and
 selecting the packages you wish to install; when you run 'make install', those
 packages will be downloaded and installed along with the standard files included

Modified: team/may/chan_ooh323_rework/UPGRADE-1.6.txt
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/UPGRADE-1.6.txt?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/UPGRADE-1.6.txt (original)
+++ team/may/chan_ooh323_rework/UPGRADE-1.6.txt Tue Oct 20 15:08:22 2009
@@ -71,6 +71,12 @@
   You now only need to quote strings in configuration files if you literally
   want quotation marks within a string.
 
+* Any applications run that contain the pipe symbol but not a comma symbol will
+  get a warning printed to the effect that the application delimiter has changed.
+  However, there are legitimate reasons why this might be useful in certain
+  situations, so this warning can be turned off with the dontwarn option in
+  asterisk.conf.
+
 * The logger.conf option 'rotatetimestamp' has been deprecated in favor of
   'rotatestrategy'.  This new option supports a 'rotate' strategy that more
   closely mimics the system logger in terms of file rotation.

Modified: team/may/chan_ooh323_rework/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/UPGRADE.txt?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/UPGRADE.txt (original)
+++ team/may/chan_ooh323_rework/UPGRADE.txt Tue Oct 20 15:08:22 2009
@@ -39,7 +39,47 @@
   remains. It now exists within app_chanspy.c and retains the exact same 
   functionality as before. 
 
+* The default behavior for Set, AGI, and pbx_realtime has been changed to implement
+  1.6 behavior by default, if there is no [compat] section in asterisk.conf.  In
+  prior versions, the behavior defaulted to 1.4 behavior, to assist in upgrades.
+  Specifically, that means that pbx_realtime and res_agi expect you to use commas
+  to separate arguments in applications, and Set only takes a single pair of
+  a variable name/value.  The old 1.4 behavior may still be obtained by setting
+  app_set, pbx_realtime, and res_agi each to 1.4 in the [compat] section of
+  asterisk.conf.
+
+* The PRI channels in chan_dahdi can no longer change the channel name if a
+  different B channel is selected during call negotiation.  To prevent using
+  the channel name to infer what B channel a call is using and to avoid name
+  collisions, the channel name format is changed.
+  The new channel naming for PRI channels is:
+  DAHDI/ISDN-<span>-<sequence-number>
+
 From 1.6.1 to 1.6.2:
+
+* The firmware for the IAXy has been removed from Asterisk.  It can be
+  downloaded from http://downloads.digium.com/pub/iaxy/.  To have Asterisk
+  install the firmware into its proper location, place the firmware in the
+  contrib/firmware/iax/ directory in the Asterisk source tree before running
+  "make install".
+
+* T.38 FAX error correction mode can no longer be configured in udptl.conf;
+  instead, it is configured on a per-peer (or global) basis in sip.conf, with
+  the same default as was present in udptl.conf.sample.
+
+* T.38 FAX maximum datagram size can no longer be configured in updtl.conf;
+  instead, it is either supplied by the application servicing the T.38 channel
+  (for a FAX send or receive) or calculated from the bridged endpoint's
+  maximum datagram size (for a T.38 FAX passthrough call). In addition, sip.conf
+  allows for overriding the value supplied by a remote endpoint, which is useful
+  when T.38 connections are made to gateways that supply incorrectly-calculated
+  maximum datagram sizes.
+
+* There have been some changes to the IAX2 protocol to address the security
+  concerns documented in the security advisory AST-2009-006.  Please see the
+  IAX2 security document, doc/IAX2-security.pdf, for information regarding
+  backwards compatibility with versions of Asterisk that do not contain these
+  changes to IAX2.
 
 * The 'canreinvite' option support by the SIP, MGCP and Skinny channel drivers
   has been renamed to 'directmedia', to better reflect what it actually does.

Modified: team/may/chan_ooh323_rework/addons/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/Makefile?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/Makefile (original)
+++ team/may/chan_ooh323_rework/addons/Makefile Tue Oct 20 15:08:22 2009
@@ -47,5 +47,4 @@
 chan_ooh323.o: _ASTCFLAGS+=$(H323CFLAGS) $(SPANDSP_INCLUDE)
 
 $(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): _ASTCFLAGS+=$(H323CFLAGS) -lrt $(SPANDSP_LIB)
-
 $(if $(filter chan_ooh323,$(EMBEDDED_MODS)),modules.link,chan_ooh323.so): $(addprefix ooh323c/src/,$(H323OBJS)) chan_ooh323.o ooh323cDriver.o

Modified: team/may/chan_ooh323_rework/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/app_mysql.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/app_mysql.c (original)
+++ team/may/chan_ooh323_rework/addons/app_mysql.c Tue Oct 20 15:08:22 2009
@@ -333,7 +333,7 @@
 	}
 
 	ctimeout = pbx_builtin_getvar_helper(chan, "MYSQL_TIMEOUT");
-	if (ctimeout && sscanf(ctimeout, "%d", &timeout) == 1) {
+	if (ctimeout && sscanf(ctimeout, "%30d", &timeout) == 1) {
 		mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (void *)&timeout);
 	}
 
@@ -408,7 +408,7 @@
 	int connid = -1;
 
 	AST_NONSTANDARD_APP_ARGS(args, data, ' ');
-	sscanf(args.connid, "%d", &connid);
+	sscanf(args.connid, "%30d", &connid);
 
 	if (args.argc != 3 || connid <= 0) {
 		ast_log(LOG_WARNING, "missing some arguments\n");
@@ -451,7 +451,7 @@
 
 	parse = ast_strdupa(data);
 	AST_NONSTANDARD_APP_ARGS(args, parse, ' ');
-	sscanf(args.fetchid, "%d", &resultid);
+	sscanf(args.fetchid, "%30d", &resultid);
 
 	if (args.resultvar && (resultid >= 0) ) {
 		if ((mysqlres = find_identifier(resultid, AST_MYSQL_ID_RESID)) != NULL) {

Modified: team/may/chan_ooh323_rework/addons/app_saycountpl.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/app_saycountpl.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/app_saycountpl.c (original)
+++ team/may/chan_ooh323_rework/addons/app_saycountpl.c Tue Oct 20 15:08:22 2009
@@ -107,7 +107,7 @@
 		return -1;
 	}
 
-	if (sscanf(args.num, "%d", &inum) != 1) {
+	if (sscanf(args.num, "%30d", &inum) != 1) {
 		ast_log(LOG_WARNING, "'%s' is not a valid number\n", args.num);
 		return -1;
 	}

Modified: team/may/chan_ooh323_rework/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/cdr_mysql.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/cdr_mysql.c (original)
+++ team/may/chan_ooh323_rework/addons/cdr_mysql.c Tue Oct 20 15:08:22 2009
@@ -383,7 +383,7 @@
 
 	tmp = ast_variable_retrieve(cfg, category, variable);
 
-	if (!tmp || sscanf(tmp, "%d", field) < 1)
+	if (!tmp || sscanf(tmp, "%30d", field) < 1)
 		*field = def;
 
 	return 0;

Modified: team/may/chan_ooh323_rework/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/chan_ooh323.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/chan_ooh323.c (original)
+++ team/may/chan_ooh323_rework/addons/chan_ooh323.c Tue Oct 20 15:08:22 2009
@@ -517,9 +517,8 @@
 /*
 	Possible data values - peername, exten/peername, exten at ip
  */
-static struct ast_channel *ooh323_request(const char *type, int format,
-		const struct ast_channel *requestor, void *data, int *cause)
-
+static struct ast_channel *ooh323_request(const char *type, int format, const struct ast_channel *requestor,
+													 void *data, int *cause)
 {
 	struct ast_channel *chan = NULL;
 	struct ooh323_pvt *p = NULL;

Modified: team/may/chan_ooh323_rework/addons/format_mp3.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/format_mp3.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/format_mp3.c (original)
+++ team/may/chan_ooh323_rework/addons/format_mp3.c Tue Oct 20 15:08:22 2009
@@ -98,16 +98,7 @@
 static int mp3_open(struct ast_filestream *s)
 {
 	struct mp3_private *p = s->_private;
-	
 	InitMP3(&p->mp, OUTSCALE);
-	p->dbuflen = 0;
-	s->fr.data.ptr = s->buf;
-	s->fr.frametype = AST_FRAME_VOICE;
-	s->fr.subclass = AST_FORMAT_SLINEAR;
-	/* datalen will vary for each frame */
-	s->fr.src = name;
-	s->fr.mallocd = 0;
-	p->offset = 0;
 	return 0;
 }
 
@@ -209,7 +200,7 @@
 
 	if(p->dbuflen) {
 		for(p->buflen=0; p->buflen < MP3_BUFLEN && p->buflen < p->dbuflen; p->buflen++) {
-			s->buf[p->buflen] = p->dbuf[p->buflen+p->dbufoffset];
+			s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[p->buflen+p->dbufoffset];
 			p->sbufoffset++;
 		}
 		p->dbufoffset += p->buflen;
@@ -220,7 +211,7 @@
 				return NULL;
 
 			for(save = p->buflen; p->buflen < MP3_BUFLEN; p->buflen++) {
-				s->buf[p->buflen] = p->dbuf[(p->buflen-save)+p->dbufoffset];
+				s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[(p->buflen-save)+p->dbufoffset];
 				p->sbufoffset++;
 			}
 			p->dbufoffset += (MP3_BUFLEN - save);
@@ -234,9 +225,7 @@
 	delay = p->buflen/2;
 	s->fr.frametype = AST_FRAME_VOICE;
 	s->fr.subclass = AST_FORMAT_SLINEAR;
-	s->fr.offset = AST_FRIENDLY_OFFSET;
-	s->fr.datalen = p->buflen;
-	s->fr.data.ptr = s->buf;
+	AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, p->buflen);
 	s->fr.mallocd = 0;
 	s->fr.samples = delay;
 	*whennext = delay;

Modified: team/may/chan_ooh323_rework/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_rework/addons/res_config_mysql.c?view=diff&rev=224843&r1=224842&r2=224843
==============================================================================
--- team/may/chan_ooh323_rework/addons/res_config_mysql.c (original)
+++ team/may/chan_ooh323_rework/addons/res_config_mysql.c Tue Oct 20 15:08:22 2009
@@ -207,7 +207,7 @@
 	}
 
 	if (mysql_real_query(&dbh->handle, ast_str_buffer(sql), ast_str_strlen(sql))) {
-		ast_log(LOG_ERROR, "Failed to query database columns: %s\n", mysql_error(&dbh->handle));
+		ast_log(LOG_ERROR, "Failed to query database '%s', table '%s' columns: %s\n", database, tablename, mysql_error(&dbh->handle));
 		release_database(dbh);
 		AST_LIST_UNLOCK(&mysql_tables);
 		return NULL;
@@ -237,7 +237,7 @@
 			}
 
 			if (!(column = ast_calloc(1, sizeof(*column) + strlen(fname) + strlen(ftype) + strlen(fdflt) + 3))) {
-				ast_log(LOG_ERROR, "Unable to allocate column element for %s, %s\n", tablename, fname);
+				ast_log(LOG_ERROR, "Unable to allocate column element %s for %s\n", fname, tablename);
 				destroy_table(table);
 				release_database(dbh);
 				AST_LIST_UNLOCK(&mysql_tables);
@@ -245,7 +245,7 @@
 			}
 
 			if ((flen = strchr(ftype, '('))) {
-				sscanf(flen, "(%d)", &column->len);
+				sscanf(flen, "(%30d)", &column->len);
 			} else {
 				/* Columns like dates, times, and timestamps don't have a length */
 				column->len = -1;
@@ -306,7 +306,7 @@
 	struct ast_variable *var=NULL, *prev=NULL;
 
 	if (!(dbh = find_database(database, 0))) {
-		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: %s\n", database);
+		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: %s (check res_mysql.conf)\n", database);
 		return NULL;
 	}
 
@@ -412,7 +412,7 @@
 	struct ast_category *cat = NULL;
 
 	if (!(dbh = find_database(database, 0))) {
-		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s'\n", database);
+		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
 		return NULL;
 	}
 
@@ -531,7 +531,7 @@
 	struct columns *column = NULL;
 
 	if (!(dbh = find_database(database, 1))) {
-		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s'.\n", database);
+		ast_log(LOG_WARNING, "MySQL RealTime: Invalid database specified: '%s' (check res_mysql.conf)\n", database);
 		return -1;
 	}
 		
@@ -548,7 +548,7 @@
 	}
 
 	if (!(column = find_column(table, keyfield))) {
-		ast_log(LOG_ERROR, "MySQL RealTime: Updating on column '%s', but that column does not exist within the table '%s'!\n", keyfield, tablename);
+		ast_log(LOG_ERROR, "MySQL RealTime: Updating on column '%s', but that column does not exist within the table '%s' (db '%s')!\n", keyfield, tablename, database);
 		release_table(table);
 		release_database(dbh);
 		return -1;
@@ -558,7 +558,7 @@
 	newparam = va_arg(ap, const char *);
 	newval = va_arg(ap, const char *);
 	if (!newparam || !newval)  {
-		ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");
+		ast_log(LOG_WARNING, "MySQL RealTime: Realtime update requires at least 1 parameter and 1 value to update.\n");

[... 36888 lines stripped ...]

More information about the svn-commits mailing list