[asterisk-commits] oej: branch group/darjeeling-prack-TRUNK r386838 - in /team/group/darjeeling-...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Apr 29 08:01:32 CDT 2013
Author: oej
Date: Mon Apr 29 08:01:25 2013
New Revision: 386838
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=386838
Log:
Reset what needs to be reset.
Added:
team/group/darjeeling-prack-TRUNK/apps/app_stasis.c
- copied unchanged from r386774, trunk/apps/app_stasis.c
team/group/darjeeling-prack-TRUNK/channels/chan_gulp.c
- copied unchanged from r386774, trunk/channels/chan_gulp.c
team/group/darjeeling-prack-TRUNK/configs/res_sip.conf.sample
- copied unchanged from r386774, trunk/configs/res_sip.conf.sample
team/group/darjeeling-prack-TRUNK/configs/stasis_core.conf.sample
- copied unchanged from r386774, trunk/configs/stasis_core.conf.sample
team/group/darjeeling-prack-TRUNK/configs/stasis_http.conf.sample
- copied unchanged from r386774, trunk/configs/stasis_http.conf.sample
team/group/darjeeling-prack-TRUNK/configs/statsd.conf.sample
- copied unchanged from r386774, trunk/configs/statsd.conf.sample
team/group/darjeeling-prack-TRUNK/include/asterisk/res_sip.h
- copied unchanged from r386774, trunk/include/asterisk/res_sip.h
team/group/darjeeling-prack-TRUNK/include/asterisk/res_sip_pubsub.h
- copied unchanged from r386774, trunk/include/asterisk/res_sip_pubsub.h
team/group/darjeeling-prack-TRUNK/include/asterisk/res_sip_session.h
- copied unchanged from r386774, trunk/include/asterisk/res_sip_session.h
team/group/darjeeling-prack-TRUNK/include/asterisk/stasis_app.h
- copied unchanged from r386774, trunk/include/asterisk/stasis_app.h
team/group/darjeeling-prack-TRUNK/include/asterisk/stasis_channels.h
- copied unchanged from r386774, trunk/include/asterisk/stasis_channels.h
team/group/darjeeling-prack-TRUNK/include/asterisk/stasis_http.h
- copied unchanged from r386774, trunk/include/asterisk/stasis_http.h
team/group/darjeeling-prack-TRUNK/include/asterisk/stasis_message_router.h
- copied unchanged from r386774, trunk/include/asterisk/stasis_message_router.h
team/group/darjeeling-prack-TRUNK/include/asterisk/statsd.h
- copied unchanged from r386774, trunk/include/asterisk/statsd.h
team/group/darjeeling-prack-TRUNK/main/json.c
- copied unchanged from r386774, trunk/main/json.c
team/group/darjeeling-prack-TRUNK/main/manager_channels.c
- copied unchanged from r386774, trunk/main/manager_channels.c
team/group/darjeeling-prack-TRUNK/main/stasis_channels.c
- copied unchanged from r386774, trunk/main/stasis_channels.c
team/group/darjeeling-prack-TRUNK/main/stasis_message_router.c
- copied unchanged from r386774, trunk/main/stasis_message_router.c
team/group/darjeeling-prack-TRUNK/res/res_chan_stats.c
- copied unchanged from r386774, trunk/res/res_chan_stats.c
team/group/darjeeling-prack-TRUNK/res/res_sip/ (props changed)
- copied from r386774, trunk/res/res_sip/
team/group/darjeeling-prack-TRUNK/res/res_sip.c
- copied unchanged from r386774, trunk/res/res_sip.c
team/group/darjeeling-prack-TRUNK/res/res_sip.exports.in
- copied unchanged from r386774, trunk/res/res_sip.exports.in
team/group/darjeeling-prack-TRUNK/res/res_sip_acl.c
- copied unchanged from r386774, trunk/res/res_sip_acl.c
team/group/darjeeling-prack-TRUNK/res/res_sip_authenticator_digest.c
- copied unchanged from r386774, trunk/res/res_sip_authenticator_digest.c
team/group/darjeeling-prack-TRUNK/res/res_sip_caller_id.c
- copied unchanged from r386774, trunk/res/res_sip_caller_id.c
team/group/darjeeling-prack-TRUNK/res/res_sip_dtmf_info.c
- copied unchanged from r386774, trunk/res/res_sip_dtmf_info.c
team/group/darjeeling-prack-TRUNK/res/res_sip_endpoint_identifier_constant.c
- copied unchanged from r386774, trunk/res/res_sip_endpoint_identifier_constant.c
team/group/darjeeling-prack-TRUNK/res/res_sip_endpoint_identifier_ip.c
- copied unchanged from r386774, trunk/res/res_sip_endpoint_identifier_ip.c
team/group/darjeeling-prack-TRUNK/res/res_sip_endpoint_identifier_user.c
- copied unchanged from r386774, trunk/res/res_sip_endpoint_identifier_user.c
team/group/darjeeling-prack-TRUNK/res/res_sip_logger.c
- copied unchanged from r386774, trunk/res/res_sip_logger.c
team/group/darjeeling-prack-TRUNK/res/res_sip_mwi.c
- copied unchanged from r386774, trunk/res/res_sip_mwi.c
team/group/darjeeling-prack-TRUNK/res/res_sip_nat.c
- copied unchanged from r386774, trunk/res/res_sip_nat.c
team/group/darjeeling-prack-TRUNK/res/res_sip_outbound_authenticator_digest.c
- copied unchanged from r386774, trunk/res/res_sip_outbound_authenticator_digest.c
team/group/darjeeling-prack-TRUNK/res/res_sip_outbound_registration.c
- copied unchanged from r386774, trunk/res/res_sip_outbound_registration.c
team/group/darjeeling-prack-TRUNK/res/res_sip_pubsub.c
- copied unchanged from r386774, trunk/res/res_sip_pubsub.c
team/group/darjeeling-prack-TRUNK/res/res_sip_pubsub.exports.in
- copied unchanged from r386774, trunk/res/res_sip_pubsub.exports.in
team/group/darjeeling-prack-TRUNK/res/res_sip_registrar.c
- copied unchanged from r386774, trunk/res/res_sip_registrar.c
team/group/darjeeling-prack-TRUNK/res/res_sip_rfc3326.c
- copied unchanged from r386774, trunk/res/res_sip_rfc3326.c
team/group/darjeeling-prack-TRUNK/res/res_sip_sdp_rtp.c
- copied unchanged from r386774, trunk/res/res_sip_sdp_rtp.c
team/group/darjeeling-prack-TRUNK/res/res_sip_session.c
- copied unchanged from r386774, trunk/res/res_sip_session.c
team/group/darjeeling-prack-TRUNK/res/res_sip_session.exports.in
- copied unchanged from r386774, trunk/res/res_sip_session.exports.in
team/group/darjeeling-prack-TRUNK/res/res_sorcery_astdb.c
- copied unchanged from r386774, trunk/res/res_sorcery_astdb.c
team/group/darjeeling-prack-TRUNK/res/res_sorcery_realtime.c
- copied unchanged from r386774, trunk/res/res_sorcery_realtime.c
team/group/darjeeling-prack-TRUNK/res/res_stasis.c
- copied unchanged from r386774, trunk/res/res_stasis.c
team/group/darjeeling-prack-TRUNK/res/res_stasis.exports.in
- copied unchanged from r386774, trunk/res/res_stasis.exports.in
team/group/darjeeling-prack-TRUNK/res/res_stasis_http.c
- copied unchanged from r386774, trunk/res/res_stasis_http.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http.exports.in
- copied unchanged from r386774, trunk/res/res_stasis_http.exports.in
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_asterisk.c
- copied unchanged from r386774, trunk/res/res_stasis_http_asterisk.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_bridges.c
- copied unchanged from r386774, trunk/res/res_stasis_http_bridges.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_channels.c
- copied unchanged from r386774, trunk/res/res_stasis_http_channels.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_endpoints.c
- copied unchanged from r386774, trunk/res/res_stasis_http_endpoints.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_events.c
- copied unchanged from r386774, trunk/res/res_stasis_http_events.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_playback.c
- copied unchanged from r386774, trunk/res/res_stasis_http_playback.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_recordings.c
- copied unchanged from r386774, trunk/res/res_stasis_http_recordings.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_http_sounds.c
- copied unchanged from r386774, trunk/res/res_stasis_http_sounds.c
team/group/darjeeling-prack-TRUNK/res/res_stasis_websocket.c
- copied unchanged from r386774, trunk/res/res_stasis_websocket.c
team/group/darjeeling-prack-TRUNK/res/res_statsd.c
- copied unchanged from r386774, trunk/res/res_statsd.c
team/group/darjeeling-prack-TRUNK/res/res_statsd.exports.in
- copied unchanged from r386774, trunk/res/res_statsd.exports.in
team/group/darjeeling-prack-TRUNK/res/stasis_http/ (props changed)
- copied from r386774, trunk/res/stasis_http/
team/group/darjeeling-prack-TRUNK/res/stasis_http.make
- copied unchanged from r386774, trunk/res/stasis_http.make
team/group/darjeeling-prack-TRUNK/rest-api/
- copied from r386774, trunk/rest-api/
team/group/darjeeling-prack-TRUNK/rest-api-templates/ (props changed)
- copied from r386774, trunk/rest-api-templates/
team/group/darjeeling-prack-TRUNK/tests/test_res_stasis.c
- copied unchanged from r386774, trunk/tests/test_res_stasis.c
team/group/darjeeling-prack-TRUNK/tests/test_sorcery_astdb.c
- copied unchanged from r386774, trunk/tests/test_sorcery_astdb.c
team/group/darjeeling-prack-TRUNK/tests/test_sorcery_realtime.c
- copied unchanged from r386774, trunk/tests/test_sorcery_realtime.c
team/group/darjeeling-prack-TRUNK/tests/test_stasis_channels.c
- copied unchanged from r386774, trunk/tests/test_stasis_channels.c
team/group/darjeeling-prack-TRUNK/tests/test_stasis_http.c
- copied unchanged from r386774, trunk/tests/test_stasis_http.c
Removed:
team/group/darjeeling-prack-TRUNK/res/res_json.c
team/group/darjeeling-prack-TRUNK/res/res_json.exports.in
Modified:
team/group/darjeeling-prack-TRUNK/ (props changed)
team/group/darjeeling-prack-TRUNK/BSDmakefile (props changed)
team/group/darjeeling-prack-TRUNK/CHANGES
team/group/darjeeling-prack-TRUNK/Makefile
team/group/darjeeling-prack-TRUNK/UPGRADE-11.txt
team/group/darjeeling-prack-TRUNK/UPGRADE.txt
team/group/darjeeling-prack-TRUNK/addons/res_config_mysql.c
team/group/darjeeling-prack-TRUNK/apps/Makefile
team/group/darjeeling-prack-TRUNK/apps/app_confbridge.c
team/group/darjeeling-prack-TRUNK/apps/app_dial.c
team/group/darjeeling-prack-TRUNK/apps/app_meetme.c
team/group/darjeeling-prack-TRUNK/apps/app_minivm.c
team/group/darjeeling-prack-TRUNK/apps/app_mixmonitor.c
team/group/darjeeling-prack-TRUNK/apps/app_queue.c
team/group/darjeeling-prack-TRUNK/apps/app_saycounted.c (props changed)
team/group/darjeeling-prack-TRUNK/apps/app_userevent.c
team/group/darjeeling-prack-TRUNK/apps/app_voicemail.c
team/group/darjeeling-prack-TRUNK/apps/confbridge/conf_config_parser.c
team/group/darjeeling-prack-TRUNK/build_tools/make_buildopts_h
team/group/darjeeling-prack-TRUNK/build_tools/make_linker_version_script
team/group/darjeeling-prack-TRUNK/build_tools/make_version
team/group/darjeeling-prack-TRUNK/build_tools/mkpkgconfig
team/group/darjeeling-prack-TRUNK/build_tools/sha1sum-sh (props changed)
team/group/darjeeling-prack-TRUNK/channels/Makefile
team/group/darjeeling-prack-TRUNK/channels/chan_alsa.c
team/group/darjeeling-prack-TRUNK/channels/chan_dahdi.c
team/group/darjeeling-prack-TRUNK/channels/chan_iax2.c
team/group/darjeeling-prack-TRUNK/channels/chan_mgcp.c
team/group/darjeeling-prack-TRUNK/channels/chan_multicast_rtp.c (props changed)
team/group/darjeeling-prack-TRUNK/channels/chan_sip.c
team/group/darjeeling-prack-TRUNK/channels/chan_skinny.c
team/group/darjeeling-prack-TRUNK/channels/chan_unistim.c
team/group/darjeeling-prack-TRUNK/channels/sig_pri.c
team/group/darjeeling-prack-TRUNK/channels/sig_pri.h
team/group/darjeeling-prack-TRUNK/channels/sig_ss7.c (props changed)
team/group/darjeeling-prack-TRUNK/channels/sig_ss7.h (props changed)
team/group/darjeeling-prack-TRUNK/channels/sip/include/security_events.h (props changed)
team/group/darjeeling-prack-TRUNK/channels/sip/include/sip.h
team/group/darjeeling-prack-TRUNK/channels/sip/security_events.c (contents, props changed)
team/group/darjeeling-prack-TRUNK/codecs/Makefile
team/group/darjeeling-prack-TRUNK/codecs/codec_resample.c
team/group/darjeeling-prack-TRUNK/configs/chan_dahdi.conf.sample
team/group/darjeeling-prack-TRUNK/configs/cli_aliases.conf.sample
team/group/darjeeling-prack-TRUNK/configs/extconfig.conf.sample
team/group/darjeeling-prack-TRUNK/configs/res_curl.conf.sample (props changed)
team/group/darjeeling-prack-TRUNK/configure
team/group/darjeeling-prack-TRUNK/configure.ac
team/group/darjeeling-prack-TRUNK/contrib/realtime/mysql/musiconhold.sql (props changed)
team/group/darjeeling-prack-TRUNK/contrib/realtime/mysql/queue_log.sql (props changed)
team/group/darjeeling-prack-TRUNK/contrib/realtime/mysql/voicemail_data.sql (props changed)
team/group/darjeeling-prack-TRUNK/contrib/realtime/mysql/voicemail_messages.sql (props changed)
team/group/darjeeling-prack-TRUNK/contrib/scripts/install_prereq
team/group/darjeeling-prack-TRUNK/doc/Makefile (props changed)
team/group/darjeeling-prack-TRUNK/funcs/func_channel.c
team/group/darjeeling-prack-TRUNK/funcs/func_curl.c
team/group/darjeeling-prack-TRUNK/funcs/func_presencestate.c
team/group/darjeeling-prack-TRUNK/include/asterisk/app.h
team/group/darjeeling-prack-TRUNK/include/asterisk/astobj2.h
team/group/darjeeling-prack-TRUNK/include/asterisk/autoconfig.h.in
team/group/darjeeling-prack-TRUNK/include/asterisk/bridging_features.h (props changed)
team/group/darjeeling-prack-TRUNK/include/asterisk/bridging_technology.h (props changed)
team/group/darjeeling-prack-TRUNK/include/asterisk/channel.h
team/group/darjeeling-prack-TRUNK/include/asterisk/cli.h
team/group/darjeeling-prack-TRUNK/include/asterisk/config.h
team/group/darjeeling-prack-TRUNK/include/asterisk/devicestate.h
team/group/darjeeling-prack-TRUNK/include/asterisk/frame.h
team/group/darjeeling-prack-TRUNK/include/asterisk/http.h
team/group/darjeeling-prack-TRUNK/include/asterisk/http_websocket.h
team/group/darjeeling-prack-TRUNK/include/asterisk/json.h
team/group/darjeeling-prack-TRUNK/include/asterisk/localtime.h
team/group/darjeeling-prack-TRUNK/include/asterisk/manager.h
team/group/darjeeling-prack-TRUNK/include/asterisk/presencestate.h
team/group/darjeeling-prack-TRUNK/include/asterisk/select.h (props changed)
team/group/darjeeling-prack-TRUNK/include/asterisk/sorcery.h
team/group/darjeeling-prack-TRUNK/include/asterisk/srv.h
team/group/darjeeling-prack-TRUNK/include/asterisk/stasis.h
team/group/darjeeling-prack-TRUNK/include/asterisk/strings.h
team/group/darjeeling-prack-TRUNK/include/asterisk/test.h
team/group/darjeeling-prack-TRUNK/include/asterisk/threadpool.h
team/group/darjeeling-prack-TRUNK/include/asterisk/utils.h
team/group/darjeeling-prack-TRUNK/include/asterisk/uuid.h
team/group/darjeeling-prack-TRUNK/include/asterisk/xmpp.h
team/group/darjeeling-prack-TRUNK/main/Makefile
team/group/darjeeling-prack-TRUNK/main/app.c
team/group/darjeeling-prack-TRUNK/main/asterisk.c
team/group/darjeeling-prack-TRUNK/main/astobj2.c
team/group/darjeeling-prack-TRUNK/main/ccss.c
team/group/darjeeling-prack-TRUNK/main/cdr.c
team/group/darjeeling-prack-TRUNK/main/channel.c
team/group/darjeeling-prack-TRUNK/main/channel_internal_api.c
team/group/darjeeling-prack-TRUNK/main/cli.c
team/group/darjeeling-prack-TRUNK/main/config.c
team/group/darjeeling-prack-TRUNK/main/devicestate.c
team/group/darjeeling-prack-TRUNK/main/dial.c
team/group/darjeeling-prack-TRUNK/main/event.c
team/group/darjeeling-prack-TRUNK/main/features.c
team/group/darjeeling-prack-TRUNK/main/format_pref.c
team/group/darjeeling-prack-TRUNK/main/frame.c
team/group/darjeeling-prack-TRUNK/main/http.c
team/group/darjeeling-prack-TRUNK/main/loader.c
team/group/darjeeling-prack-TRUNK/main/manager.c
team/group/darjeeling-prack-TRUNK/main/message.c
team/group/darjeeling-prack-TRUNK/main/pbx.c
team/group/darjeeling-prack-TRUNK/main/presencestate.c
team/group/darjeeling-prack-TRUNK/main/sorcery.c
team/group/darjeeling-prack-TRUNK/main/stasis.c
team/group/darjeeling-prack-TRUNK/main/stasis_cache.c
team/group/darjeeling-prack-TRUNK/main/stasis_message.c
team/group/darjeeling-prack-TRUNK/main/taskprocessor.c
team/group/darjeeling-prack-TRUNK/main/test.c
team/group/darjeeling-prack-TRUNK/main/threadpool.c
team/group/darjeeling-prack-TRUNK/main/uuid.c
team/group/darjeeling-prack-TRUNK/pbx/pbx_realtime.c
team/group/darjeeling-prack-TRUNK/res/Makefile
team/group/darjeeling-prack-TRUNK/res/res_calendar_exchange.c
team/group/darjeeling-prack-TRUNK/res/res_config_curl.c
team/group/darjeeling-prack-TRUNK/res/res_config_ldap.c
team/group/darjeeling-prack-TRUNK/res/res_config_odbc.c
team/group/darjeeling-prack-TRUNK/res/res_config_pgsql.c
team/group/darjeeling-prack-TRUNK/res/res_config_sqlite.c
team/group/darjeeling-prack-TRUNK/res/res_config_sqlite3.c
team/group/darjeeling-prack-TRUNK/res/res_corosync.c
team/group/darjeeling-prack-TRUNK/res/res_format_attr_h264.c
team/group/darjeeling-prack-TRUNK/res/res_http_websocket.c
team/group/darjeeling-prack-TRUNK/res/res_jabber.c
team/group/darjeeling-prack-TRUNK/res/res_mutestream.c (contents, props changed)
team/group/darjeeling-prack-TRUNK/res/res_rtp_asterisk.c
team/group/darjeeling-prack-TRUNK/res/res_rtp_multicast.c (contents, props changed)
team/group/darjeeling-prack-TRUNK/res/res_sorcery_config.c
team/group/darjeeling-prack-TRUNK/res/res_sorcery_memory.c
team/group/darjeeling-prack-TRUNK/res/res_timing_kqueue.c (props changed)
team/group/darjeeling-prack-TRUNK/res/res_timing_pthread.c
team/group/darjeeling-prack-TRUNK/res/res_xmpp.c
team/group/darjeeling-prack-TRUNK/tests/test_abstract_jb.c
team/group/darjeeling-prack-TRUNK/tests/test_devicestate.c
team/group/darjeeling-prack-TRUNK/tests/test_expr.c (props changed)
team/group/darjeeling-prack-TRUNK/tests/test_func_file.c (props changed)
team/group/darjeeling-prack-TRUNK/tests/test_json.c
team/group/darjeeling-prack-TRUNK/tests/test_locale.c (props changed)
team/group/darjeeling-prack-TRUNK/tests/test_poll.c (props changed)
team/group/darjeeling-prack-TRUNK/tests/test_sorcery.c
team/group/darjeeling-prack-TRUNK/tests/test_stasis.c
team/group/darjeeling-prack-TRUNK/tests/test_strings.c
team/group/darjeeling-prack-TRUNK/tests/test_uuid.c
Propchange: team/group/darjeeling-prack-TRUNK/
------------------------------------------------------------------------------
automerge = Is-there-life-off-net?
Propchange: team/group/darjeeling-prack-TRUNK/
------------------------------------------------------------------------------
--- branch-11-blocked (original)
+++ branch-11-blocked Mon Apr 29 08:01:25 2013
@@ -1,1 +1,1 @@
-/branches/11:373240,375247,375702
+/branches/11:373240,375247,375702,385356
Propchange: team/group/darjeeling-prack-TRUNK/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Propchange: team/group/darjeeling-prack-TRUNK/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 29 08:01:25 2013
@@ -1,1 +1,1 @@
-/trunk:1-383212
+/trunk:1-386792
Propchange: team/group/darjeeling-prack-TRUNK/BSDmakefile
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Mon Apr 29 08:01:25 2013
@@ -1,1 +1,1 @@
-'Date Author Id Revision Yoyo'
+Author Date Id Revision
Modified: team/group/darjeeling-prack-TRUNK/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/group/darjeeling-prack-TRUNK/CHANGES?view=diff&rev=386838&r1=386837&r2=386838
==============================================================================
--- team/group/darjeeling-prack-TRUNK/CHANGES (original)
+++ team/group/darjeeling-prack-TRUNK/CHANGES Mon Apr 29 08:01:25 2013
@@ -41,6 +41,24 @@
mechanisms (such as the Playback application), the audio can be stopped,
reversed, or skipped forward.
+ * Channel related events now contain a snapshot of channel state, adding new
+ fields to many of these events.
+
+ * The AMI event 'Newexten' field 'Extension' is deprecated, and may be removed
+ in a future release. Please use the common 'Exten' field instead.
+
+ * The AMI event 'UserEvent' from app_userevent now contains the channel state
+ fields. The channel state fields will come before the body fields.
+
+ * The deprecated use of | (pipe) as a separator in the channelvars setting in
+ manager.conf has been removed.
+
+ * Channel Variables conveyed with a channel no longer contain the name of the
+ channel as part of the key field, i.e., ChanVariable(SIP/foo): bar=baz is now
+ ChanVariable: bar=baz. When multiple channels are present in a single AMI
+ event, the various ChanVariable fields will contain a suffix that specifies
+ which channel they correspond to.
+
Channel Drivers
------------------
@@ -71,6 +89,10 @@
* PARKINGSLOT and PARKEDLOT channel variables will now be set for a parked
channel even when comebactoorigin=yes
+ * You can now have the settings for a channel updated using the FEATURE()
+ and FEATUREMAP() functions inherited to child channels by setting
+ FEATURE(inherit)=yes.
+
Logging
-------------------
* When performing queue pause/unpause on an interface without specifying an
@@ -116,6 +138,20 @@
* ICE/STUN/TURN support in res_rtp_asterisk has been made optional. To enable
them, an Asterisk-specific version of pjproject needs to be installed.
Tarballs are available from https://github.com/asterisk/pjproject/tags/.
+
+XMPP
+------------------
+ * Device state for XMPP buddies is now available using the following format:
+ XMPP/<client name>/<buddy address>
+ If any resource is available the device state is considered to be not in use.
+ If no resources exist or all are unavailable the device state is considered
+ to be unavailable.
+
+Sorcery
+------------------
+ * All future modules which utilize Sorcery for object persistence must have a
+ column named "id" within their schema when using the Sorcery realtime module.
+ This column must be able to contain a string of up to 128 characters in length.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
Modified: team/group/darjeeling-prack-TRUNK/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/darjeeling-prack-TRUNK/Makefile?view=diff&rev=386838&r1=386837&r2=386838
==============================================================================
--- team/group/darjeeling-prack-TRUNK/Makefile (original)
+++ team/group/darjeeling-prack-TRUNK/Makefile Mon Apr 29 08:01:25 2013
@@ -81,6 +81,8 @@
# should go directly to ASTLDFLAGS
#--- paths to various commands
+# The makeopts include below tries to set these if they're found during
+# configure.
export CC
export CXX
export AR
@@ -221,10 +223,13 @@
_ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2 -D__EXTENSIONS__
endif
-ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
-
-ifneq ($(wildcard .version),)
- ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ifneq ($(GREP),)
+ ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) GIT=$(GIT) build_tools/make_version .)
+endif
+ifneq ($(AWK),)
+ ifneq ($(wildcard .version),)
+ ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
+ endif
endif
ifneq ($(wildcard .svn),)
@@ -351,7 +356,7 @@
+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+@$(SUBMAKE) $(MOD_SUBDIRS_EMBED_LIBS)
-$(SUBDIRS): makeopts cleantest main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
+$(SUBDIRS): makeopts .lastclean main/version.c include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
# Non-windows:
@@ -377,25 +382,25 @@
$(OTHER_SUBDIRS): makeopts
+ 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
+defaults.h: makeopts .lastclean build_tools/make_defaults_h
@build_tools/make_defaults_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-main/version.c: FORCE
+main/version.c: FORCE .lastclean
@build_tools/make_version_c > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/buildopts.h: menuselect.makeopts
+include/asterisk/buildopts.h: menuselect.makeopts .lastclean
@build_tools/make_buildopts_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/build.h:
- @build_tools/make_build_h > $@.tmp
- @cmp -s $@.tmp $@ || mv $@.tmp $@
- @rm -f $@.tmp
+# build.h must depend on .lastclean, or parallel make may wipe it out after it's
+# been created.
+include/asterisk/build.h: .lastclean
+ @build_tools/make_build_h > $@
$(SUBDIRS_CLEAN):
+@$(SUBMAKE) -C $(@:-clean=) clean
@@ -448,8 +453,15 @@
$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
done
$(MAKE) -C sounds install
-
-doc/core-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ find rest-api -name "*.json" | while read x; do \
+ $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/rest-api" ; \
+ done
+
+ifneq ($(GREP),)
+ XML_core_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+endif
+
+doc/core-en_US.xml: makeopts .lastclean $(XML_core_en_US)
@printf "Building Documentation For: "
@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
@@ -463,7 +475,11 @@
@echo
@echo "</docs>" >> $@
-doc/full-en_US.xml: makeopts $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ifneq ($(GREP),)
+ XMX_full_en_US = $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+endif
+
+doc/full-en_US.xml: makeopts .lastclean $(XML_full_en_US)
ifeq ($(PYTHON),:)
@echo "--------------------------------------------------------------------------"
@echo "--- Please install python to build full documentation ---"
@@ -524,8 +540,8 @@
"$(ASTLOGDIR)/cel-custom" "$(ASTDATADIR)" "$(ASTDATADIR)/documentation" \
"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
- "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
+ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
+ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
installdirs:
@for i in $(INSTALLDIRS); do \
@@ -834,8 +850,8 @@
# .cleancount is the global clean count, and .lastclean is the
# last clean count we had
-cleantest:
- @cmp -s .cleancount .lastclean || $(MAKE) clean
+.lastclean: .cleancount
+ @$(MAKE) clean
@[ -f "$(DESTDIR)$(ASTDBDIR)/astdb.sqlite3" ] || [ ! -f "$(DESTDIR)$(ASTDBDIR)/astdb" ] || [ ! -f menuselect.makeopts ] || grep -q MENUSELECT_UTILS=.*astdb2sqlite3 menuselect.makeopts || (sed -i.orig -e's/MENUSELECT_UTILS=\(.*\)/MENUSELECT_UTILS=\1 astdb2sqlite3/' menuselect.makeopts && echo "Updating menuselect.makeopts to include astdb2sqlite3" && echo "Original version backed up to menuselect.makeopts.orig")
$(SUBDIRS_UNINSTALL):
@@ -913,19 +929,19 @@
CFLAGS="$(BUILD_CFLAGS)" LDFLAGS="$(BUILD_LDFLAGS)" \
$(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
-menuselect/menuselect: menuselect/makeopts cleantest
+menuselect/menuselect: menuselect/makeopts .lastclean
+$(MAKE_MENUSELECT) menuselect
-menuselect/cmenuselect: menuselect/makeopts cleantest
+menuselect/cmenuselect: menuselect/makeopts .lastclean
+$(MAKE_MENUSELECT) cmenuselect
-menuselect/gmenuselect: menuselect/makeopts cleantest
+menuselect/gmenuselect: menuselect/makeopts .lastclean
+$(MAKE_MENUSELECT) gmenuselect
-menuselect/nmenuselect: menuselect/makeopts cleantest
+menuselect/nmenuselect: menuselect/makeopts .lastclean
+$(MAKE_MENUSELECT) nmenuselect
-menuselect/makeopts: makeopts cleantest
+menuselect/makeopts: makeopts .lastclean
+$(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 makeopts
@@ -945,6 +961,19 @@
@cat sounds/sounds.xml >> $@
@echo "</menu>" >> $@
+# We don't want to require Python or Pystache for every build, so this is its
+# own target.
+stasis-stubs:
+ifeq ($(PYTHON),:)
+ @echo "--------------------------------------------------------------------------"
+ @echo "--- Please install python to build Stasis HTTP stubs ---"
+ @echo "--------------------------------------------------------------------------"
+ @false
+else
+ $(PYTHON) rest-api-templates/make_stasis_http_stubs.py \
+ rest-api/resources.json res/
+endif
+
.PHONY: menuselect
.PHONY: main
.PHONY: sounds
@@ -956,7 +985,6 @@
.PHONY: full
.PHONY: _full
.PHONY: prereqs
-.PHONY: cleantest
.PHONY: uninstall
.PHONY: _uninstall
.PHONY: uninstall-all
@@ -965,6 +993,7 @@
.PHONY: installdirs
.PHONY: validate-docs
.PHONY: _clean
+.PHONY: stasis-stubs
.PHONY: $(SUBDIRS_INSTALL)
.PHONY: $(SUBDIRS_DIST_CLEAN)
.PHONY: $(SUBDIRS_CLEAN)
Modified: team/group/darjeeling-prack-TRUNK/UPGRADE-11.txt
URL: http://svnview.digium.com/svn/asterisk/team/group/darjeeling-prack-TRUNK/UPGRADE-11.txt?view=diff&rev=386838&r1=386837&r2=386838
==============================================================================
--- team/group/darjeeling-prack-TRUNK/UPGRADE-11.txt (original)
+++ team/group/darjeeling-prack-TRUNK/UPGRADE-11.txt Mon Apr 29 08:01:25 2013
@@ -19,6 +19,30 @@
=== UPGRADE-10.txt -- Upgrade info for 1.8 to 10
===
===========================================================
+
+From 11.4 to 11.5:
+* The default settings for chan_sip are now overriden properly by the general
+ settings in sip.conf. Please look over your settings upon upgrading.
+
+From 11.3 to 11.4:
+* Added the 'n' option to MeetMe to prevent application of the DENOISE function
+ to a channel joining a conference. Some channel drivers that vary the number
+ of audio samples in a voice frame will experience significant quality problems
+ if a denoiser is attached to the channel; this option gives them the ability
+ to remove the denoiser without having to unload func_speex.
+
+* The Registry AMI event for SIP registrations will now always include the
+ Username field. A previous bug fix missed an instance where it was not
+ included; that has been corrected in this release.
+
+From 11.2.0 to 11.2.1:
+* Asterisk would previously not output certain error messages when a remote
+ console attempted to connect to Asterisk and no instance of Asterisk was
+ running. This error message is displayed on stderr; as a result, some
+ initialization scripts that used remote consoles to test for the presence
+ of a running Asterisk instance started to display erroneous error messages.
+ The init.d scripts and the safe_asterisk have been updated in the contrib
+ folder to account for this.
From 11.2 to 11.3:
Modified: team/group/darjeeling-prack-TRUNK/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/group/darjeeling-prack-TRUNK/UPGRADE.txt?view=diff&rev=386838&r1=386837&r2=386838
==============================================================================
--- team/group/darjeeling-prack-TRUNK/UPGRADE.txt (original)
+++ team/group/darjeeling-prack-TRUNK/UPGRADE.txt Mon Apr 29 08:01:25 2013
@@ -67,6 +67,7 @@
- Analog port dialing and deferred DTMF dialing for PRI now distinguishes
between 'w' and 'W'. The 'w' pauses dialing for half a second. The 'W'
pauses dialing for one second.
+ - The default for inband_on_proceeding has changed to no.
Dialplan:
- All channel and global variable names are evaluated in a case-sensitive manner.
@@ -191,7 +192,7 @@
configuration option. Symptoms of this include one way media or no media flow.
chan_unistim
- - Due to massive update in chan_unistim phone keys functions and on-screen
+ - Due to massive update in chan_unistim phone keys functions and on-screen
information changed.
users.conf:
@@ -263,10 +264,10 @@
unchanged.
Module Support Level
- - All modules in the addons, apps, bridge, cdr, cel, channels, codecs,
+ - All modules in the addons, apps, bridge, cdr, cel, channels, codecs,
formats, funcs, pbx, and res have been updated to include MODULEINFO data
that includes <support_level> tags with a value of core, extended, or deprecated.
- More information is available on the Asterisk wiki at
+ More information is available on the Asterisk wiki at
https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
Deprecated modules are now marked to not build by default and must be explicitly
Modified: team/group/darjeeling-prack-TRUNK/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/group/darjeeling-prack-TRUNK/addons/res_config_mysql.c?view=diff&rev=386838&r1=386837&r2=386838
==============================================================================
--- team/group/darjeeling-prack-TRUNK/addons/res_config_mysql.c (original)
+++ team/group/darjeeling-prack-TRUNK/addons/res_config_mysql.c Mon Apr 29 08:01:25 2013
@@ -316,7 +316,7 @@
return orig;
}
-static struct ast_variable *realtime_mysql(const char *database, const char *table, va_list ap)
+static struct ast_variable *realtime_mysql(const char *database, const char *table, const struct ast_variable *rt_fields)
{
struct mysql_conn *dbh;
MYSQL_RES *result;
@@ -328,7 +328,7 @@
char *stringp;
char *chunk;
char *op;
- const char *newparam, *newval;
+ const struct ast_variable *field = rt_fields;
struct ast_variable *var=NULL, *prev=NULL;
if (!(dbh = find_database(database, 0))) {
@@ -343,7 +343,7 @@
}
/* Get the first parameter and first value in our list of passed paramater/value pairs */
- if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) {
+ if (!field) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");
release_database(dbh);
return NULL;
@@ -358,21 +358,20 @@
/* 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 */
- if (!strchr(newparam, ' '))
+ if (!strchr(field->name, ' '))
op = " =";
else
op = "";
- ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf));
- while ((newparam = va_arg(ap, const char *))) {
- newval = va_arg(ap, const char *);
- if (!strchr(newparam, ' '))
+ ESCAPE_STRING(buf, field->value);
+ ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, field->name, op, ast_str_buffer(buf));
+ while ((field = field->next)) {
+ if (!strchr(field->name, ' '))
op = " =";
else
op = "";
- ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, " AND %s%s '%s'", newparam, op, ast_str_buffer(buf));
+ ESCAPE_STRING(buf, field->value);
+ ast_str_append(&sql, 0, " AND %s%s '%s'", field->name, op, ast_str_buffer(buf));
}
ast_debug(1, "MySQL RealTime: Retrieve SQL: %s\n", ast_str_buffer(sql));
@@ -417,7 +416,7 @@
return var;
}
-static struct ast_config *realtime_multi_mysql(const char *database, const char *table, va_list ap)
+static struct ast_config *realtime_multi_mysql(const char *database, const char *table, const struct ast_variable *rt_fields)
{
struct mysql_conn *dbh;
MYSQL_RES *result;
@@ -430,7 +429,7 @@
char *stringp;
char *chunk;
char *op;
- const char *newparam, *newval;
+ const struct ast_variable *field = rt_fields;
struct ast_variable *var = NULL;
struct ast_config *cfg = NULL;
struct ast_category *cat = NULL;
@@ -454,14 +453,14 @@
}
/* Get the first parameter and first value in our list of passed paramater/value pairs */
- if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) {
+ if (!field) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n");
ast_config_destroy(cfg);
release_database(dbh);
return NULL;
}
- initfield = ast_strdupa(newparam);
+ initfield = ast_strdupa(field->name);
if ((op = strchr(initfield, ' '))) {
*op = '\0';
}
@@ -476,18 +475,17 @@
/* 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 */
- if (!strchr(newparam, ' '))
+ if (!strchr(field->name, ' '))
op = " =";
else
op = "";
- ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, ast_str_buffer(buf));
- while ((newparam = va_arg(ap, const char *))) {
- newval = va_arg(ap, const char *);
- if (!strchr(newparam, ' ')) op = " ="; else op = "";
- ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, " AND %s%s '%s'", newparam, op, ast_str_buffer(buf));
+ ESCAPE_STRING(buf, field->value);
+ ast_str_set(&sql, 0, "SELECT * FROM %s WHERE %s%s '%s'", table, field->name, op, ast_str_buffer(buf));
+ while ((field = field->next)) {
+ if (!strchr(field->name, ' ')) op = " ="; else op = "";
+ ESCAPE_STRING(buf, field->value);
+ ast_str_append(&sql, 0, " AND %s%s '%s'", field->name, op, ast_str_buffer(buf));
}
if (initfield) {
@@ -540,11 +538,11 @@
return cfg;
}
-static int update_mysql(const char *database, const char *tablename, const char *keyfield, const char *lookup, va_list ap)
+static int update_mysql(const char *database, const char *tablename, const char *keyfield, const char *lookup, const struct ast_variable *rt_fields)
{
struct mysql_conn *dbh;
my_ulonglong numrows;
- const char *newparam, *newval;
+ const struct ast_variable *field = rt_fields;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 100), *buf = ast_str_thread_get(&scratch_buf, 100);
struct tables *table;
struct columns *column = NULL;
@@ -574,7 +572,7 @@
}
/* Get the first parameter and first value in our list of passed paramater/value pairs */
- if (!(newparam = va_arg(ap, const char *)) || !(newval = va_arg(ap, const char *))) {
+ if (!field) {
ast_log(LOG_WARNING, "MySQL RealTime: Realtime update requires at least 1 parameter and 1 value to update.\n");
release_table(table);
release_database(dbh);
@@ -582,8 +580,8 @@
}
/* Check that the column exists in the table */
- if (!(column = find_column(table, newparam))) {
- ast_log(LOG_ERROR, "MySQL RealTime: Updating column '%s', but that column does not exist within the table '%s' (first pair MUST exist)!\n", newparam, tablename);
+ if (!(column = find_column(table, field->name))) {
[... 17032 lines stripped ...]
More information about the asterisk-commits
mailing list