[svn-commits] mjordan: branch mjordan/12-hep r418781 - in /team/mjordan/12-hep: ./ addons/ ...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jul 16 12:48:51 CDT 2014
Author: mjordan
Date: Wed Jul 16 12:48:23 2014
New Revision: 418781
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418781
Log:
Re-enable automerge
Added:
team/mjordan/12-hep/configs/hep.conf.sample
- copied unchanged from r418756, branches/12/configs/hep.conf.sample
team/mjordan/12-hep/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py
- copied unchanged from r418756, branches/12/contrib/ast-db-manage/config/versions/1d50859ed02e_create_accountcode.py
team/mjordan/12-hep/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py
- copied unchanged from r418756, branches/12/contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py
team/mjordan/12-hep/contrib/ast-db-manage/config/versions/c6d929b23a8_create_pjsip_subscription_persistence_.py
- copied unchanged from r418756, branches/12/contrib/ast-db-manage/config/versions/c6d929b23a8_create_pjsip_subscription_persistence_.py
team/mjordan/12-hep/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py
- copied unchanged from r418756, branches/12/contrib/ast-db-manage/config/versions/e96a0b8071c_increase_pjsip_column_size.py
team/mjordan/12-hep/contrib/scripts/refcounter.py
- copied unchanged from r418756, branches/12/contrib/scripts/refcounter.py
team/mjordan/12-hep/funcs/func_talkdetect.c
- copied unchanged from r418756, branches/12/funcs/func_talkdetect.c
team/mjordan/12-hep/include/asterisk/spinlock.h
- copied unchanged from r418756, branches/12/include/asterisk/spinlock.h
team/mjordan/12-hep/main/astobj2_container.c
- copied unchanged from r418756, branches/12/main/astobj2_container.c
team/mjordan/12-hep/main/astobj2_container_private.h
- copied unchanged from r418756, branches/12/main/astobj2_container_private.h
team/mjordan/12-hep/main/astobj2_hash.c
- copied unchanged from r418756, branches/12/main/astobj2_hash.c
team/mjordan/12-hep/main/astobj2_private.h
- copied unchanged from r418756, branches/12/main/astobj2_private.h
team/mjordan/12-hep/main/astobj2_rbtree.c
- copied unchanged from r418756, branches/12/main/astobj2_rbtree.c
team/mjordan/12-hep/res/res_pjsip_dialog_info_body_generator.c
- copied unchanged from r418756, branches/12/res/res_pjsip_dialog_info_body_generator.c
team/mjordan/12-hep/res/stasis/stasis_bridge.c
- copied unchanged from r418756, branches/12/res/stasis/stasis_bridge.c
team/mjordan/12-hep/res/stasis/stasis_bridge.h
- copied unchanged from r418756, branches/12/res/stasis/stasis_bridge.h
Modified:
team/mjordan/12-hep/ (props changed)
team/mjordan/12-hep/CHANGES
team/mjordan/12-hep/Makefile
team/mjordan/12-hep/Makefile.rules
team/mjordan/12-hep/UPGRADE.txt
team/mjordan/12-hep/addons/chan_ooh323.c
team/mjordan/12-hep/addons/ooh323c/src/ooCmdChannel.c
team/mjordan/12-hep/addons/ooh323c/src/ooGkClient.c
team/mjordan/12-hep/addons/ooh323c/src/oochannels.c
team/mjordan/12-hep/addons/ooh323c/src/ooh323.c
team/mjordan/12-hep/addons/ooh323c/src/ooq931.c
team/mjordan/12-hep/apps/app_adsiprog.c
team/mjordan/12-hep/apps/app_agent_pool.c
team/mjordan/12-hep/apps/app_chanspy.c
team/mjordan/12-hep/apps/app_confbridge.c
team/mjordan/12-hep/apps/app_dial.c
team/mjordan/12-hep/apps/app_dumpchan.c
team/mjordan/12-hep/apps/app_festival.c
team/mjordan/12-hep/apps/app_getcpeid.c
team/mjordan/12-hep/apps/app_meetme.c
team/mjordan/12-hep/apps/app_minivm.c
team/mjordan/12-hep/apps/app_mixmonitor.c
team/mjordan/12-hep/apps/app_originate.c
team/mjordan/12-hep/apps/app_queue.c
team/mjordan/12-hep/apps/app_skel.c
team/mjordan/12-hep/apps/app_sms.c
team/mjordan/12-hep/apps/app_stack.c
team/mjordan/12-hep/apps/app_userevent.c
team/mjordan/12-hep/apps/app_verbose.c
team/mjordan/12-hep/apps/app_voicemail.c
team/mjordan/12-hep/apps/confbridge/conf_config_parser.c
team/mjordan/12-hep/apps/confbridge/include/confbridge.h
team/mjordan/12-hep/autoconf/ast_ext_tool_check.m4
team/mjordan/12-hep/bridges/bridge_native_rtp.c
team/mjordan/12-hep/bridges/bridge_softmix.c
team/mjordan/12-hep/build_tools/cflags.xml
team/mjordan/12-hep/cdr/cdr_adaptive_odbc.c
team/mjordan/12-hep/cdr/cdr_sqlite3_custom.c
team/mjordan/12-hep/cel/cel_odbc.c
team/mjordan/12-hep/cel/cel_pgsql.c
team/mjordan/12-hep/cel/cel_sqlite3_custom.c
team/mjordan/12-hep/channels/chan_alsa.c
team/mjordan/12-hep/channels/chan_dahdi.c
team/mjordan/12-hep/channels/chan_gtalk.c
team/mjordan/12-hep/channels/chan_iax2.c
team/mjordan/12-hep/channels/chan_jingle.c
team/mjordan/12-hep/channels/chan_mgcp.c
team/mjordan/12-hep/channels/chan_motif.c
team/mjordan/12-hep/channels/chan_oss.c
team/mjordan/12-hep/channels/chan_phone.c
team/mjordan/12-hep/channels/chan_pjsip.c
team/mjordan/12-hep/channels/chan_sip.c
team/mjordan/12-hep/channels/chan_skinny.c
team/mjordan/12-hep/channels/chan_unistim.c
team/mjordan/12-hep/channels/iax2/firmware.c
team/mjordan/12-hep/channels/iax2/parser.c
team/mjordan/12-hep/channels/pjsip/dialplan_functions.c
team/mjordan/12-hep/channels/sig_analog.c
team/mjordan/12-hep/channels/sig_pri.c
team/mjordan/12-hep/channels/sig_pri.h
team/mjordan/12-hep/channels/sip/config_parser.c
team/mjordan/12-hep/channels/sip/include/sip.h
team/mjordan/12-hep/channels/sip/reqresp_parser.c
team/mjordan/12-hep/channels/sip/security_events.c
team/mjordan/12-hep/configs/ari.conf.sample
team/mjordan/12-hep/configs/asterisk.conf.sample
team/mjordan/12-hep/configs/chan_dahdi.conf.sample
team/mjordan/12-hep/configs/cli_aliases.conf.sample
team/mjordan/12-hep/configs/extensions.lua.sample
team/mjordan/12-hep/configs/http.conf.sample
team/mjordan/12-hep/configs/pjsip.conf.sample
team/mjordan/12-hep/configs/res_odbc.conf.sample
team/mjordan/12-hep/configs/sip.conf.sample
team/mjordan/12-hep/configure
team/mjordan/12-hep/configure.ac
team/mjordan/12-hep/contrib/ast-db-manage/cdr/env.py
team/mjordan/12-hep/contrib/scripts/safe_asterisk
team/mjordan/12-hep/formats/format_pcm.c
team/mjordan/12-hep/funcs/func_channel.c
team/mjordan/12-hep/funcs/func_env.c
team/mjordan/12-hep/funcs/func_frame_trace.c
team/mjordan/12-hep/funcs/func_hangupcause.c
team/mjordan/12-hep/funcs/func_iconv.c
team/mjordan/12-hep/funcs/func_odbc.c
team/mjordan/12-hep/funcs/func_srv.c
team/mjordan/12-hep/funcs/func_strings.c
team/mjordan/12-hep/funcs/func_sysinfo.c
team/mjordan/12-hep/funcs/func_uri.c
team/mjordan/12-hep/include/asterisk/acl.h
team/mjordan/12-hep/include/asterisk/app.h
team/mjordan/12-hep/include/asterisk/astobj.h
team/mjordan/12-hep/include/asterisk/astobj2.h
team/mjordan/12-hep/include/asterisk/autoconfig.h.in
team/mjordan/12-hep/include/asterisk/bridge.h
team/mjordan/12-hep/include/asterisk/bridge_channel.h
team/mjordan/12-hep/include/asterisk/channel.h
team/mjordan/12-hep/include/asterisk/config.h
team/mjordan/12-hep/include/asterisk/devicestate.h
team/mjordan/12-hep/include/asterisk/event.h
team/mjordan/12-hep/include/asterisk/event_defs.h
team/mjordan/12-hep/include/asterisk/framehook.h
team/mjordan/12-hep/include/asterisk/http.h
team/mjordan/12-hep/include/asterisk/http_websocket.h
team/mjordan/12-hep/include/asterisk/logger.h
team/mjordan/12-hep/include/asterisk/manager.h
team/mjordan/12-hep/include/asterisk/message.h
team/mjordan/12-hep/include/asterisk/netsock2.h
team/mjordan/12-hep/include/asterisk/options.h
team/mjordan/12-hep/include/asterisk/parking.h
team/mjordan/12-hep/include/asterisk/pbx.h
team/mjordan/12-hep/include/asterisk/res_pjsip.h
team/mjordan/12-hep/include/asterisk/res_pjsip_body_generator_types.h
team/mjordan/12-hep/include/asterisk/res_pjsip_presence_xml.h
team/mjordan/12-hep/include/asterisk/res_pjsip_pubsub.h
team/mjordan/12-hep/include/asterisk/res_pjsip_session.h
team/mjordan/12-hep/include/asterisk/rtp_engine.h
team/mjordan/12-hep/include/asterisk/sdp_srtp.h
team/mjordan/12-hep/include/asterisk/stasis.h
team/mjordan/12-hep/include/asterisk/stasis_app.h
team/mjordan/12-hep/include/asterisk/stasis_bridges.h
team/mjordan/12-hep/include/asterisk/stasis_channels.h
team/mjordan/12-hep/include/asterisk/tcptls.h
team/mjordan/12-hep/include/asterisk/utils.h
team/mjordan/12-hep/include/asterisk/xmpp.h
team/mjordan/12-hep/main/Makefile
team/mjordan/12-hep/main/abstract_jb.c
team/mjordan/12-hep/main/acl.c
team/mjordan/12-hep/main/adsi.c
team/mjordan/12-hep/main/aoc.c
team/mjordan/12-hep/main/app.c
team/mjordan/12-hep/main/asterisk.c
team/mjordan/12-hep/main/astobj2.c
team/mjordan/12-hep/main/audiohook.c
team/mjordan/12-hep/main/autoservice.c
team/mjordan/12-hep/main/bridge.c
team/mjordan/12-hep/main/bridge_after.c
team/mjordan/12-hep/main/bridge_basic.c
team/mjordan/12-hep/main/bridge_channel.c
team/mjordan/12-hep/main/bucket.c
team/mjordan/12-hep/main/callerid.c
team/mjordan/12-hep/main/ccss.c
team/mjordan/12-hep/main/cdr.c
team/mjordan/12-hep/main/cel.c
team/mjordan/12-hep/main/channel.c
team/mjordan/12-hep/main/channel_internal_api.c
team/mjordan/12-hep/main/cli.c
team/mjordan/12-hep/main/config.c
team/mjordan/12-hep/main/config_options.c
team/mjordan/12-hep/main/core_local.c
team/mjordan/12-hep/main/core_unreal.c
team/mjordan/12-hep/main/data.c
team/mjordan/12-hep/main/db.c
team/mjordan/12-hep/main/devicestate.c
team/mjordan/12-hep/main/dial.c
team/mjordan/12-hep/main/dsp.c
team/mjordan/12-hep/main/endpoints.c
team/mjordan/12-hep/main/enum.c
team/mjordan/12-hep/main/event.c
team/mjordan/12-hep/main/features_config.c
team/mjordan/12-hep/main/file.c
team/mjordan/12-hep/main/format.c
team/mjordan/12-hep/main/frame.c
team/mjordan/12-hep/main/framehook.c
team/mjordan/12-hep/main/http.c
team/mjordan/12-hep/main/io.c
team/mjordan/12-hep/main/loader.c
team/mjordan/12-hep/main/logger.c
team/mjordan/12-hep/main/manager.c
team/mjordan/12-hep/main/manager_bridges.c
team/mjordan/12-hep/main/manager_channels.c
team/mjordan/12-hep/main/message.c
team/mjordan/12-hep/main/netsock.c
team/mjordan/12-hep/main/netsock2.c
team/mjordan/12-hep/main/parking.c
team/mjordan/12-hep/main/pbx.c
team/mjordan/12-hep/main/pickup.c
team/mjordan/12-hep/main/rtp_engine.c
team/mjordan/12-hep/main/sched.c
team/mjordan/12-hep/main/sdp_srtp.c
team/mjordan/12-hep/main/security_events.c
team/mjordan/12-hep/main/slinfactory.c
team/mjordan/12-hep/main/stasis.c
team/mjordan/12-hep/main/stasis_bridges.c
team/mjordan/12-hep/main/stasis_cache.c
team/mjordan/12-hep/main/stasis_channels.c
team/mjordan/12-hep/main/stasis_endpoints.c
team/mjordan/12-hep/main/stasis_message.c
team/mjordan/12-hep/main/stdtime/localtime.c
team/mjordan/12-hep/main/stun.c
team/mjordan/12-hep/main/taskprocessor.c
team/mjordan/12-hep/main/tcptls.c
team/mjordan/12-hep/main/test.c
team/mjordan/12-hep/main/translate.c
team/mjordan/12-hep/main/udptl.c
team/mjordan/12-hep/main/utils.c
team/mjordan/12-hep/main/xmldoc.c
team/mjordan/12-hep/pbx/dundi-parser.c
team/mjordan/12-hep/pbx/pbx_config.c
team/mjordan/12-hep/pbx/pbx_dundi.c
team/mjordan/12-hep/pbx/pbx_lua.c
team/mjordan/12-hep/res/ael/pval.c
team/mjordan/12-hep/res/ari/ari_model_validators.c
team/mjordan/12-hep/res/ari/ari_model_validators.h
team/mjordan/12-hep/res/ari/ari_websockets.c
team/mjordan/12-hep/res/ari/config.c
team/mjordan/12-hep/res/ari/internal.h
team/mjordan/12-hep/res/ari/resource_applications.h
team/mjordan/12-hep/res/ari/resource_asterisk.h
team/mjordan/12-hep/res/ari/resource_bridges.c
team/mjordan/12-hep/res/ari/resource_bridges.h
team/mjordan/12-hep/res/ari/resource_channels.c
team/mjordan/12-hep/res/ari/resource_channels.h
team/mjordan/12-hep/res/ari/resource_device_states.h
team/mjordan/12-hep/res/ari/resource_endpoints.h
team/mjordan/12-hep/res/ari/resource_events.c
team/mjordan/12-hep/res/ari/resource_events.h
team/mjordan/12-hep/res/ari/resource_mailboxes.h
team/mjordan/12-hep/res/ari/resource_playbacks.h
team/mjordan/12-hep/res/ari/resource_recordings.c
team/mjordan/12-hep/res/ari/resource_recordings.h
team/mjordan/12-hep/res/ari/resource_sounds.h
team/mjordan/12-hep/res/parking/parking_applications.c
team/mjordan/12-hep/res/parking/parking_bridge.c
team/mjordan/12-hep/res/parking/parking_bridge_features.c
team/mjordan/12-hep/res/parking/parking_manager.c
team/mjordan/12-hep/res/parking/parking_tests.c
team/mjordan/12-hep/res/parking/res_parking.h
team/mjordan/12-hep/res/res_agi.c
team/mjordan/12-hep/res/res_ari.c
team/mjordan/12-hep/res/res_ari_bridges.c
team/mjordan/12-hep/res/res_ari_events.c
team/mjordan/12-hep/res/res_ari_model.c
team/mjordan/12-hep/res/res_calendar.c
team/mjordan/12-hep/res/res_calendar_caldav.c
team/mjordan/12-hep/res/res_calendar_ews.c
team/mjordan/12-hep/res/res_calendar_icalendar.c
team/mjordan/12-hep/res/res_config_odbc.c
team/mjordan/12-hep/res/res_config_pgsql.c
team/mjordan/12-hep/res/res_config_sqlite3.c
team/mjordan/12-hep/res/res_corosync.c
team/mjordan/12-hep/res/res_crypto.c
team/mjordan/12-hep/res/res_fax.c
team/mjordan/12-hep/res/res_fax_spandsp.c
team/mjordan/12-hep/res/res_format_attr_celt.c
team/mjordan/12-hep/res/res_format_attr_h263.c
team/mjordan/12-hep/res/res_format_attr_h264.c
team/mjordan/12-hep/res/res_format_attr_opus.c
team/mjordan/12-hep/res/res_format_attr_silk.c
team/mjordan/12-hep/res/res_http_post.c
team/mjordan/12-hep/res/res_http_websocket.c
team/mjordan/12-hep/res/res_http_websocket.exports.in
team/mjordan/12-hep/res/res_jabber.c
team/mjordan/12-hep/res/res_monitor.c
team/mjordan/12-hep/res/res_musiconhold.c
team/mjordan/12-hep/res/res_odbc.c
team/mjordan/12-hep/res/res_parking.c
team/mjordan/12-hep/res/res_phoneprov.c
team/mjordan/12-hep/res/res_pjsip.c
team/mjordan/12-hep/res/res_pjsip/config_transport.c
team/mjordan/12-hep/res/res_pjsip/location.c
team/mjordan/12-hep/res/res_pjsip/pjsip_configuration.c
team/mjordan/12-hep/res/res_pjsip/pjsip_options.c
team/mjordan/12-hep/res/res_pjsip/presence_xml.c
team/mjordan/12-hep/res/res_pjsip/security_events.c
team/mjordan/12-hep/res/res_pjsip_endpoint_identifier_ip.c
team/mjordan/12-hep/res/res_pjsip_exten_state.c
team/mjordan/12-hep/res/res_pjsip_header_funcs.c
team/mjordan/12-hep/res/res_pjsip_messaging.c
team/mjordan/12-hep/res/res_pjsip_mwi.c
team/mjordan/12-hep/res/res_pjsip_notify.c
team/mjordan/12-hep/res/res_pjsip_outbound_registration.c
team/mjordan/12-hep/res/res_pjsip_pidf_body_generator.c
team/mjordan/12-hep/res/res_pjsip_pidf_digium_body_supplement.c
team/mjordan/12-hep/res/res_pjsip_pubsub.c
team/mjordan/12-hep/res/res_pjsip_pubsub.exports.in
team/mjordan/12-hep/res/res_pjsip_refer.c
team/mjordan/12-hep/res/res_pjsip_registrar.c
team/mjordan/12-hep/res/res_pjsip_sdp_rtp.c
team/mjordan/12-hep/res/res_pjsip_session.c
team/mjordan/12-hep/res/res_pjsip_t38.c
team/mjordan/12-hep/res/res_pjsip_transport_websocket.c
team/mjordan/12-hep/res/res_pjsip_xpidf_body_generator.c
team/mjordan/12-hep/res/res_pktccops.c
team/mjordan/12-hep/res/res_rtp_asterisk.c
team/mjordan/12-hep/res/res_sorcery_config.c
team/mjordan/12-hep/res/res_srtp.c
team/mjordan/12-hep/res/res_stasis.c
team/mjordan/12-hep/res/res_stasis_answer.c
team/mjordan/12-hep/res/res_stasis_playback.c
team/mjordan/12-hep/res/res_stasis_recording.c
team/mjordan/12-hep/res/res_stasis_snoop.c
team/mjordan/12-hep/res/res_stun_monitor.c
team/mjordan/12-hep/res/res_timing_dahdi.c
team/mjordan/12-hep/res/res_xmpp.c
team/mjordan/12-hep/res/stasis/app.c
team/mjordan/12-hep/res/stasis/control.c
team/mjordan/12-hep/res/stasis/control.h
team/mjordan/12-hep/res/stasis_recording/stored.c
team/mjordan/12-hep/rest-api-templates/ari_resource.h.mustache
team/mjordan/12-hep/rest-api/api-docs/applications.json
team/mjordan/12-hep/rest-api/api-docs/asterisk.json
team/mjordan/12-hep/rest-api/api-docs/bridges.json
team/mjordan/12-hep/rest-api/api-docs/channels.json
team/mjordan/12-hep/rest-api/api-docs/deviceStates.json
team/mjordan/12-hep/rest-api/api-docs/endpoints.json
team/mjordan/12-hep/rest-api/api-docs/events.json
team/mjordan/12-hep/rest-api/api-docs/mailboxes.json
team/mjordan/12-hep/rest-api/api-docs/playbacks.json
team/mjordan/12-hep/rest-api/api-docs/recordings.json
team/mjordan/12-hep/rest-api/api-docs/sounds.json
team/mjordan/12-hep/rest-api/resources.json
team/mjordan/12-hep/sounds/Makefile
team/mjordan/12-hep/sounds/sounds.xml
team/mjordan/12-hep/tests/test_astobj2.c
team/mjordan/12-hep/tests/test_cel.c
team/mjordan/12-hep/tests/test_stasis_endpoints.c
team/mjordan/12-hep/utils/ (props changed)
team/mjordan/12-hep/utils/Makefile
Propchange: team/mjordan/12-hep/
------------------------------------------------------------------------------
automerge = *
Propchange: team/mjordan/12-hep/
------------------------------------------------------------------------------
--- branch-11-blocked (original)
+++ branch-11-blocked Wed Jul 16 12:48:23 2014
@@ -1,1 +1,1 @@
-/branches/11:373240,375247,375702,385356,395020,396441,397034,397604,399305,401379,405362,405380,407457,409002,409208,409524
+/branches/11:373240,375247,375702,385356,395020,396441,397034,397604,399305,401379,405362,405380,407457,409002,409208,409524,411633,412767,415915
Propchange: team/mjordan/12-hep/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Propchange: team/mjordan/12-hep/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 16 12:48:23 2014
@@ -1,1 +1,1 @@
-/branches/12:1-411518
+/branches/12:1-418780
Modified: team/mjordan/12-hep/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/12-hep/CHANGES?view=diff&rev=418781&r1=418780&r2=418781
==============================================================================
--- team/mjordan/12-hep/CHANGES (original)
+++ team/mjordan/12-hep/CHANGES Wed Jul 16 12:48:23 2014
@@ -9,6 +9,98 @@
==============================================================================
------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 12.4.0 to Asterisk 12.5.0 ------------
+------------------------------------------------------------------------------
+
+res_pjsip
+------------------
+ * The endpoint configuration object now supports 'accountcode'. Any channel
+ created for an endpoint with this setting will have its accountcode set
+ to the specified value.
+
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 12.3.0 to Asterisk 12.4.0 ------------
+------------------------------------------------------------------------------
+
+AgentRequest
+------------------
+ * Returns new AGENT_STATUS value "NOT_CONNECTED" if the agent fails to
+ connect with an incoming caller after being alerted to the presence
+ of the incoming caller. The most likely reason this would happen is
+ the agent did not acknowledge the call in time.
+
+AMI
+------------------
+ * New events have been added for the TALK_DETECT function. When the function
+ is used on a channel, ChannelTalkingStart/ChannelTalkingStop events will be
+ emitted to connected AMI clients indicating the start/stop of talking on
+ the channel.
+
+ARI
+------------------
+ * New event models have been aded for the TALK_DETECT function. When the
+ function is used on a channel, ChannelTalkingStarted/ChannelTalkingFinished
+ events will be emitted to connected WebSockets subscribed to the channel,
+ indicating the start/stop of talking on the channel.
+
+Functions
+------------------
+ * A new function, TALK_DETECT, has been added. When set on a channel, this
+ fucntion causes events indicating the starting/stoping of talking on said
+ channel to be emitted to both AMI and ARI clients.
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 12.2.0 to Asterisk 12.3.0 ------------
+------------------------------------------------------------------------------
+
+ARI
+------------------
+ * A new Playback URI 'tone' has been added. Tones are specified either as
+ an indication name (e.g. 'tone:busy') from indications.conf or as a tone
+ pattern (e.g. 'tone:240/250,0/250'). Tones differ from normal playback
+ URIs in that they must be stopped manually and will continue to occupy
+ a channel's ARI control queue until they are stopped. They also can not
+ be rewound or fastforwarded.
+
+ * User events can now be generated from ARI. Events can be signalled with
+ arbitrary json variables, and include one or more of channel, bridge, or
+ endpoint snapshots. An application must be specified which will receive
+ the event message (other applications can subscribe to it). The message
+ will also be delivered via AMI provided a channel is attached. Dialplan
+ generated user event messages are still transmitted via the channel, and
+ will only be received by a stasis application they are attached to or if
+ the channel is subscribed to.
+
+chan_sip
+-----------
+ * SIP peers can now specify 'trust_id_outbound' which affects RPID/PAI
+ fields for prohibited callingpres information. Values are legacy, no, and
+ yes. By default, legacy is used.
+ trust_id_outbound=legacy - behavior remains the same as 1.8.26.1. When
+ dealing with prohibited callingpres and sendrpid=pai/rpid, RPID/PAI
+ headers are appended to outbound SIP messages just as they are with
+ allowed callingpres values, but data about the remote party's identity is
+ anonymized.
+ When sendrpid=rpid, only the remote party's domain is anonymized.
+ trust_id_outbound=no - when dealing with prohibited callingpres, RPID/PAI
+ headers are not sent.
+ trust_id_outbound=yes - RPID/PAI headers are applied with the full remote
+ party information in tact even for prohibited callingpres information.
+ In the case of PAI, a Privacy: id header will be appended for prohibited
+ calling information to communicate that the private information should
+ not be relayed to untrusted parties.
+
+res_parking
+------------------
+ * Manager action 'Park' now takes an additional argument 'AnnounceChannel'
+ which can be used to announce the parked call's location to an arbitrary
+ channel in a bridge. If 'Channel' and 'TimeoutChannel' are now the two
+ parties in a one to one bridge, 'TimeoutChannel' is treated as having
+ parked 'Channel' like with the Park Call DTMF feature and will receive
+ announcements prior to being hung up.
+
+------------------------------------------------------------------------------
--- Functionality changes from Asterisk 12.1.0 to Asterisk 12.2.0 ------------
------------------------------------------------------------------------------
@@ -21,6 +113,7 @@
------------------
* The live recording object on recording events now contains a target_uri
field which contains the URI of what is being recorded.
+
* The bridge type used when creating a bridge is now a comma separated list of
bridge properties. Valid options are: mixing, holding, dtmf_events, and
proxy_media.
@@ -34,7 +127,8 @@
(POST bridges/my-bridge-id) or as a query parameter.
* A playbackId can be provided when starting a playback, either in the uri
- (POST channels/my-channel-id/play/my-playback-id) or as a query parameter.
+ (POST channels/my-channel-id/play/my-playback-id /
+ POST bridges/my-bridge-id/play/my-playback-id) or as a query parameter.
* A snoop channel can be started with a snoopId, in the uri or query.
@@ -45,10 +139,61 @@
second channel when dialing LOCAL, or defaults to appending ;2 if only
the single Id is given.
+ * The Mixmonitor action now has a "Command" header that can be used to
+ indicate a post-process command to run once recording finishes.
+
+RealTime
+------------------
+ * A new set of Alembic scripts has been added for CDR tables. This will create
+ a 'cdr' table with the default schema that Asterisk expects.
+
+res_hep
+------------------
+ * A new module, res_hep, has been added, that acts as a generic packet
+ capture agent for the Homer Encapsulation Protocol (HEP) version 3.
+ It can be configured via hep.conf. Other modules can use res_hep to send
+ message traffic to a HEP capture server.
+
+res_hep_pjsip
+------------------
+ * A new module, res_hep_pjsip, has been added that will forward PJSIP
+ message traffic to a HEP capture server. See res_hep for more
+ information.
+
res_pjsip
------------------
* transport and endpoint ToS options (tos, tos_audio, and tos_video) may now
be set as the named set of ToS values (cs0-cs7, af11-af43, ef).
+
+ * Added the following new CLI commands:
+ - "pjsip show contacts" - list all current PJSIP contacts.
+ - "pjsip show contact" - show specific information about a current PJSIP
+ contact.
+ - "pjsip show channel" - show detailed information about a PJSIP channel.
+
+res_pjsip_multihomed
+------------------
+ * A new module, res_pjsip_multihomed handles situations where the system
+ Asterisk is running out has multiple interfaces. res_pjsip_multihomed
+ determines which interface should be used during message sending.
+
+res_pjsip_pidf_digium_body_supplement
+------------------
+ * A new module, res_pjsip_pidf_digium_body_supplement provides NOTIFY
+ request body formatting for presence support in Digium phones.
+
+res_pjsip_send_to_voicemail
+------------------
+ * A new module, res_pjsip_send_to_voicemail allows for REFER requests with
+ particular headers to transfer a PJSIP channel directly to a particular
+ extension that has VoiceMail. This is intended to be used with Digium
+ phones that support this feature.
+
+res_pjsip_outbound_registration
+------------------
+ * A new CLI command has been added: "pjsip show registrations", which lists
+ all configured PJSIP registrations
+
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 12.0.0 to Asterisk 12.1.0 ------------
@@ -1326,7 +1471,6 @@
is meant to be an aid in converting an existing chan_sip configuration to
a chan_pjsip configuration, but it is expected that configuration beyond
what the script provides will be needed.
-
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
Modified: team/mjordan/12-hep/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/12-hep/Makefile?view=diff&rev=418781&r1=418780&r2=418781
==============================================================================
--- team/mjordan/12-hep/Makefile (original)
+++ team/mjordan/12-hep/Makefile Wed Jul 16 12:48:23 2014
@@ -188,7 +188,6 @@
_ASTCFLAGS+=-Werror
_ASTCFLAGS+=-Wunused
_ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
- _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
_ASTCFLAGS+=$(AST_TRAMPOLINES)
_ASTCFLAGS+=-Wundef
_ASTCFLAGS+=-Wmissing-format-attribute
@@ -569,8 +568,8 @@
bininstall: _all installdirs $(SUBDIRS_INSTALL) main-bininstall
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
- if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;' > contrib/scripts/safe.tmp ; \
+ if [ ! -f /sbin/launchd ]; then \
+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;s|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;' > contrib/scripts/safe.tmp ; \
$(INSTALL) -m 755 contrib/scripts/safe.tmp "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" ; \
rm -f contrib/scripts/safe.tmp ; \
fi
Modified: team/mjordan/12-hep/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/12-hep/Makefile.rules?view=diff&rev=418781&r1=418780&r2=418781
==============================================================================
--- team/mjordan/12-hep/Makefile.rules (original)
+++ team/mjordan/12-hep/Makefile.rules Wed Jul 16 12:48:23 2014
@@ -82,6 +82,8 @@
# and if that doesn't fail then compile again with optimizer disabled
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_DEVMODE),DONT_OPTIMIZEyes)
COMPILE_DOUBLE=yes
+else
+_ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
endif
ifeq ($(findstring BUILD_NATIVE,$(MENUSELECT_CFLAGS)),BUILD_NATIVE)
Modified: team/mjordan/12-hep/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/mjordan/12-hep/UPGRADE.txt?view=diff&rev=418781&r1=418780&r2=418781
==============================================================================
--- team/mjordan/12-hep/UPGRADE.txt (original)
+++ team/mjordan/12-hep/UPGRADE.txt Wed Jul 16 12:48:23 2014
@@ -20,7 +20,157 @@
=== UPGRADE-11.txt -- Upgrade info for 10 to 11
===
===========================================================
+
+From 12.3.2 to 12.4.0:
+
+ - The safe_asterisk script was previously not installed on top of an existing
+ version. This caused bug-fixes in that script not to be deployed. If your
+ safe_asterisk script is customized, be sure to keep your changes. Custom
+ values for variables should be created in *.sh file(s) inside
+ ASTETCDIR/startup.d/. See ASTERISK-21965.
+
+ - Changed a log message in safe_asterisk and the $NOTIFY mail subject. If
+ you use tools to parse either of them, update your parse functions
+ accordingly. The changed strings are:
+ - "Exited on signal $EXITSIGNAL" => "Asterisk exited on signal $EXITSIGNAL."
+ - "Asterisk Died" => "Asterisk on $MACHINE died (sig $EXITSIGNAL)"
+
+AMI:
+ - The AMI version has been changed from 2.3.0 to 2.4.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+ARI:
+ - Added a compatibility option 'websocket_write_timeout'. When a websocket
+ connection exists where Asterisk writes a substantial amount of data to
+ the connected client, and the connected client is slow to process the
+ received data, the socket may be disconnected. In such cases, it may be
+ necessary to adjust this value.
+ Default is 100 ms.
+
+ - The ARI version has been changed from 1.3.0 to 1.4.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+chan_dahdi:
+ - Added the inband_on_setup_ack compatibility option to chan_dahdi.conf to
+ deal with switches that don't send an inband progress indication in the
+ SETUP ACKNOWLEDGE message.
+
+chan_pjsip:
+ - Added a compatibility option 'websocket_write_timeout'. When a websocket
+ connection exists where Asterisk writes a substantial amount of data to
+ the connected client, and the connected client is slow to process the
+ received data, the socket may be disconnected. In such cases, it may be
+ necessary to adjust this value.
+ Default is 100 ms.
+
+ - Added a 'force_avp' option to chan_pjsip which will force the usage of
+ 'RTP/AVP', 'RTP/AVPF', 'RTP/SAVP', or 'RTP/SAVPF' as the media transport type
+ in SDP offers depending on settings, even when DTLS is used for media
+ encryption.
+
+ - Added a 'media_use_received_transport' option to chan_pjsip which will
+ cause the SDP answer to use the media transport as received in the SDP
+ offer.
+
+chan_sip:
+ - Added a compatibility option 'websocket_write_timeout'. When a websocket
+ connection exists where Asterisk writes a substantial amount of data to
+ the connected client, and the connected client is slow to process the
+ received data, the socket may be disconnected. In such cases, it may be
+ necessary to adjust this value.
+ Default is 100 ms.
+
+ - Added a 'force_avp' option for chan_sip. When enabled this option will
+ cause the media transport in the offer or answer SDP to be 'RTP/AVP',
+ 'RTP/AVPF', 'RTP/SAVP', or 'RTP/SAVPF' even if a DTLS stream has been
+ configured. This option can be set to improve interoperability with WebRTC
+ clients that don't use the RFC defined transport for DTLS.
+
+ - The 'dtlsverify' option in chan_sip now has additional values besides
+ 'yes' and 'no'. If 'yes' is specified both the certificate and fingerprint
+ will be verified. If 'no' is specified then neither the certificate or
+ fingerprint is verified. If 'certificate' is specified then only the
+ certificate is verified. If 'fingerprint' is specified then only the
+ fingerprint is verified.
+
+ - A 'dtlsfingerprint' option has been added to chan_sip which allows the
+ hash to be specified for the DTLS fingerprint placed in SDP. Supported
+ values are 'sha-1' and 'sha-256' with 'sha-256' being the default.
+
+HTTP:
+ - Added support for persistent HTTP connections. To enable persistent
+ HTTP connections configure the keep alive time between HTTP requests. The
+ keep alive time between HTTP requests is configured in http.conf with the
+ session_keep_alive parameter.
+
+From 12.3.0 to 12.3.1:
+
+ - MixMonitor AMI actions now require users to have authorization classes.
+ * MixMonitor - system
+ * MixMonitorMute - call or system
+ * StopMixMonitor - call or system
+
+ - Added http.conf session_inactivity timer option to close HTTP connections
+ that aren't doing anything.
+
+ - Removed the undocumented manager.conf block-sockets option. It interferes with
+ TCP/TLS inactivity timeouts.
+
+From 12.2.0 to 12.3.0:
+
+ - The asterisk command line -I option and the asterisk.conf internal_timing
+ option are removed and always enabled if any timing module is loaded.
+
+AMI:
+ - The AMI version has been changed from 2.2.0 to 2.3.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+ARI:
+ - The ARI version has been changed from 1.2.0 to 1.3.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+Build Options:
+ - Added a new Compiler Flag, REF_DEBUG. When enabled, reference counted
+ objects will emit additional debug information to the refs log file located
+ in the standard Asterisk log file directory. This log file is useful in
+ tracking down object leaks and other reference counting issues. Prior to
+ this version, this option was only available by modifying the source code
+ directly. This change also includes a new script, refcounter.py, in the
+ contrib folder that will process the refs log file.
+
+chan_sip:
+ - Made set SIPREFERREDBYHDR as inheritable for better chan_pjsip
+
From 12.1.0 to 12.2.0:
+
+AMI:
+ - The AMI version has been changed from 2.1.0 to 2.2.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+ARI:
+ - The ARI version has been changed from 1.1.0 to 1.2.0. This is to reflect
+ the backwards compatible changes listed in the CHANGES file.
+
+ - A bug fix in bridge creation has caused a behavioural change in how
+ subscriptions are created for bridges. A bridge created through ARI, does
+ not, by itself, have a subscription created for any particular Stasis
+ application. When a channel in a Stasis application joins a bridge, an
+ implicit event subscription is created for that bridge as well. Previously,
+ when a channel left such a bridge, the subscription was leaked; this allowed
+ for later bridge events to continue to be pushed to the subscribed
+ applications. That leak has been fixed; as a result, bridge events that were
+ delivered after a channel left the bridge are no longer delivered. An
+ application must subscribe to a bridge through the applications resource if
+ it wishes to receive all events related to a bridge.
+
+ConfBridge:
+ - The sound_place_into_conference sound used in Confbridge is now deprecated
+ and is no longer functional since it has been broken since its inception
+ and the fix involved using a different method to achieve the same goal. The
+ new method to achieve this functionality is by using sound_begin to play
+ a sound to the conference when waitmarked users are moved into the
+ conference.
+
IAX2:
- When communicating with a peer on an Asterisk 1.4 or earlier system, the
chan_iax2 parameter 'connectedline' must be set to "no" in iax.conf. This
@@ -37,30 +187,32 @@
Disable it for PostgreSQL backends in order to avoid errors caused by
updating integer columns with an empty string instead of NULL
- (sipppeers,sipregs)
+ (sippeers, sipregs, ..).
PJSIP:
- - The PJSIP registrar now stores the contents of the User-Agent header of incoming
- REGISTER requests for each contact that is registered. If using realtime for
- PJSIP contacts, this means that the schema has been updated to add a user_agent
- column. An alembic revision has been added to facilitate this update.
+ - The PJSIP registrar now stores the contents of the User-Agent header of
+ incoming REGISTER requests for each contact that is registered. If using
+ realtime for PJSIP contacts, this means that the schema has been updated to
+ add a user_agent column. An alembic revision has been added to facilitate
+ this update.
- - PJSIP endpoints now have a "message_context" option that can be used to determine
- where to route incoming MESSAGE requests from the endpoint.
+ - PJSIP endpoints now have a "message_context" option that can be used to
+ determine where to route incoming MESSAGE requests from the endpoint.
Realtime Configuration:
- - PJSIP endpoint columns 'tos_audio' and 'tos_video' have been changed from yes/no
- enumerators to string values. 'cos_audio' and 'cos_video' have been changed from
- yes/no enumerators to integer values. PJSIP transport column 'tos' has been
- changed from a yes/no enumerator to a string value. 'cos' has been changed from
- a yes/no enumerator to an integer value.
+ - PJSIP endpoint columns 'tos_audio' and 'tos_video' have been changed from
+ yes/no enumerators to string values. 'cos_audio' and 'cos_video' have been
+ changed from yes/no enumerators to integer values. PJSIP transport column
+ 'tos' has been changed from a yes/no enumerator to a string value. 'cos' has
+ been changed from a yes/no enumerator to an integer value.
+
+ - The 'queues' and 'queue_members' realtime tables have been added to the
+ config Alembic scripts.
+
+ - A new set of Alembic scripts has been added for CDR tables. This will create
+ a 'cdr' table with the default schema that Asterisk expects.
From 12.0.0 to 12.1.0:
-- The sound_place_into_conference sound used in Confbridge is now deprecated
- and is no longer functional since it has been broken since its inception
[... 39017 lines stripped ...]
More information about the svn-commits
mailing list