[asterisk-commits] mmichelson: branch mmichelson/sip_attended_transfer r389728 - in /team/mmiche...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 24 13:34:22 CDT 2013
Author: mmichelson
Date: Fri May 24 13:34:14 2013
New Revision: 389728
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389728
Log:
Resolve conflict and reset automerge.
Added:
team/mmichelson/sip_attended_transfer/apps/confbridge/conf_chan_announce.c
- copied unchanged from r389720, team/mmichelson/more_transfer/apps/confbridge/conf_chan_announce.c
team/mmichelson/sip_attended_transfer/apps/confbridge/conf_chan_record.c
- copied unchanged from r389720, team/mmichelson/more_transfer/apps/confbridge/conf_chan_record.c
team/mmichelson/sip_attended_transfer/apps/confbridge/confbridge_manager.c
- copied unchanged from r389720, team/mmichelson/more_transfer/apps/confbridge/confbridge_manager.c
team/mmichelson/sip_attended_transfer/bridges/bridge_native_rtp.c
- copied unchanged from r389720, team/mmichelson/more_transfer/bridges/bridge_native_rtp.c
team/mmichelson/sip_attended_transfer/configs/res_parking.conf.sample
- copied unchanged from r389720, team/mmichelson/more_transfer/configs/res_parking.conf.sample
team/mmichelson/sip_attended_transfer/include/asterisk/core_local.h
- copied unchanged from r389720, team/mmichelson/more_transfer/include/asterisk/core_local.h
team/mmichelson/sip_attended_transfer/include/asterisk/core_unreal.h
- copied unchanged from r389720, team/mmichelson/more_transfer/include/asterisk/core_unreal.h
team/mmichelson/sip_attended_transfer/include/asterisk/parking.h
- copied unchanged from r389720, team/mmichelson/more_transfer/include/asterisk/parking.h
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_app_impl.h
- copied unchanged from r389720, team/mmichelson/more_transfer/include/asterisk/stasis_app_impl.h
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_app_playback.h
- copied unchanged from r389720, team/mmichelson/more_transfer/include/asterisk/stasis_app_playback.h
team/mmichelson/sip_attended_transfer/main/core_local.c
- copied unchanged from r389720, team/mmichelson/more_transfer/main/core_local.c
team/mmichelson/sip_attended_transfer/main/core_unreal.c
- copied unchanged from r389720, team/mmichelson/more_transfer/main/core_unreal.c
team/mmichelson/sip_attended_transfer/main/parking.c
- copied unchanged from r389720, team/mmichelson/more_transfer/main/parking.c
team/mmichelson/sip_attended_transfer/res/parking/ (props changed)
- copied from r389720, team/mmichelson/more_transfer/res/parking/
team/mmichelson/sip_attended_transfer/res/parking/parking_applications.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_applications.c
team/mmichelson/sip_attended_transfer/res/parking/parking_bridge.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_bridge.c
team/mmichelson/sip_attended_transfer/res/parking/parking_bridge_features.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_bridge_features.c
team/mmichelson/sip_attended_transfer/res/parking/parking_controller.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_controller.c
team/mmichelson/sip_attended_transfer/res/parking/parking_manager.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_manager.c
team/mmichelson/sip_attended_transfer/res/parking/parking_ui.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/parking_ui.c
team/mmichelson/sip_attended_transfer/res/parking/res_parking.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/parking/res_parking.h
team/mmichelson/sip_attended_transfer/res/res_parking.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_parking.c
team/mmichelson/sip_attended_transfer/res/res_stasis_answer.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_answer.c
team/mmichelson/sip_attended_transfer/res/res_stasis_answer.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_answer.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_asterisk.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_asterisk.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_asterisk.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_asterisk.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_bridges.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_bridges.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_bridges.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_bridges.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_channels.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_channels.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_channels.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_channels.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_endpoints.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_endpoints.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_endpoints.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_endpoints.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_events.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_events.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_events.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_events.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_playback.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_playback.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_playback.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_playback.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_recordings.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_recordings.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_recordings.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_recordings.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_json_sounds.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_sounds.c
team/mmichelson/sip_attended_transfer/res/res_stasis_json_sounds.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_json_sounds.exports.in
team/mmichelson/sip_attended_transfer/res/res_stasis_playback.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_playback.c
team/mmichelson/sip_attended_transfer/res/res_stasis_playback.exports.in
- copied unchanged from r389720, team/mmichelson/more_transfer/res/res_stasis_playback.exports.in
team/mmichelson/sip_attended_transfer/res/stasis/ (props changed)
- copied from r389720, team/mmichelson/more_transfer/res/stasis/
team/mmichelson/sip_attended_transfer/res/stasis/app.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/app.c
team/mmichelson/sip_attended_transfer/res/stasis/app.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/app.h
team/mmichelson/sip_attended_transfer/res/stasis/command.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/command.c
team/mmichelson/sip_attended_transfer/res/stasis/command.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/command.h
team/mmichelson/sip_attended_transfer/res/stasis/control.c
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/control.c
team/mmichelson/sip_attended_transfer/res/stasis/control.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis/control.h
team/mmichelson/sip_attended_transfer/res/stasis_json/
- copied from r389720, team/mmichelson/more_transfer/res/stasis_json/
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_asterisk.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_asterisk.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_bridges.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_bridges.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_channels.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_channels.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_endpoints.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_endpoints.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_events.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_events.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_playback.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_playback.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_recordings.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_recordings.h
team/mmichelson/sip_attended_transfer/res/stasis_json/resource_sounds.h
- copied unchanged from r389720, team/mmichelson/more_transfer/res/stasis_json/resource_sounds.h
team/mmichelson/sip_attended_transfer/rest-api-templates/event_function_decl.mustache
- copied unchanged from r389720, team/mmichelson/more_transfer/rest-api-templates/event_function_decl.mustache
team/mmichelson/sip_attended_transfer/rest-api-templates/res_stasis_json_resource.c.mustache
- copied unchanged from r389720, team/mmichelson/more_transfer/rest-api-templates/res_stasis_json_resource.c.mustache
team/mmichelson/sip_attended_transfer/rest-api-templates/res_stasis_json_resource.exports.mustache
- copied unchanged from r389720, team/mmichelson/more_transfer/rest-api-templates/res_stasis_json_resource.exports.mustache
team/mmichelson/sip_attended_transfer/rest-api-templates/stasis_json_resource.h.mustache
- copied unchanged from r389720, team/mmichelson/more_transfer/rest-api-templates/stasis_json_resource.h.mustache
Removed:
team/mmichelson/sip_attended_transfer/apps/app_parkandannounce.c
team/mmichelson/sip_attended_transfer/channels/chan_bridge.c
team/mmichelson/sip_attended_transfer/channels/chan_local.c
Modified:
team/mmichelson/sip_attended_transfer/ (props changed)
team/mmichelson/sip_attended_transfer/CHANGES
team/mmichelson/sip_attended_transfer/UPGRADE.txt
team/mmichelson/sip_attended_transfer/addons/chan_ooh323.c
team/mmichelson/sip_attended_transfer/addons/chan_ooh323.h
team/mmichelson/sip_attended_transfer/apps/app_bridgewait.c (contents, props changed)
team/mmichelson/sip_attended_transfer/apps/app_celgenuserevent.c (props changed)
team/mmichelson/sip_attended_transfer/apps/app_chanspy.c
team/mmichelson/sip_attended_transfer/apps/app_confbridge.c
team/mmichelson/sip_attended_transfer/apps/app_dial.c
team/mmichelson/sip_attended_transfer/apps/app_dumpchan.c
team/mmichelson/sip_attended_transfer/apps/app_followme.c
team/mmichelson/sip_attended_transfer/apps/app_mixmonitor.c
team/mmichelson/sip_attended_transfer/apps/app_morsecode.c (props changed)
team/mmichelson/sip_attended_transfer/apps/app_queue.c
team/mmichelson/sip_attended_transfer/apps/app_setcallerid.c (props changed)
team/mmichelson/sip_attended_transfer/apps/app_stasis.c (contents, props changed)
team/mmichelson/sip_attended_transfer/apps/app_userevent.c
team/mmichelson/sip_attended_transfer/apps/app_voicemail.c
team/mmichelson/sip_attended_transfer/apps/app_waituntil.c (props changed)
team/mmichelson/sip_attended_transfer/apps/confbridge/conf_config_parser.c
team/mmichelson/sip_attended_transfer/apps/confbridge/include/confbridge.h
team/mmichelson/sip_attended_transfer/bridges/bridge_builtin_features.c
team/mmichelson/sip_attended_transfer/bridges/bridge_builtin_interval_features.c (props changed)
team/mmichelson/sip_attended_transfer/bridges/bridge_holding.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_custom.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_manager.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_odbc.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_pgsql.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_radius.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_sqlite3_custom.c (props changed)
team/mmichelson/sip_attended_transfer/cel/cel_tds.c (props changed)
team/mmichelson/sip_attended_transfer/channels/chan_agent.c
team/mmichelson/sip_attended_transfer/channels/chan_dahdi.c
team/mmichelson/sip_attended_transfer/channels/chan_gulp.c
team/mmichelson/sip_attended_transfer/channels/chan_h323.c
team/mmichelson/sip_attended_transfer/channels/chan_iax2.c
team/mmichelson/sip_attended_transfer/channels/chan_jingle.c
team/mmichelson/sip_attended_transfer/channels/chan_mgcp.c
team/mmichelson/sip_attended_transfer/channels/chan_misdn.c
team/mmichelson/sip_attended_transfer/channels/chan_motif.c
team/mmichelson/sip_attended_transfer/channels/chan_sip.c
team/mmichelson/sip_attended_transfer/channels/chan_skinny.c
team/mmichelson/sip_attended_transfer/channels/chan_unistim.c
team/mmichelson/sip_attended_transfer/channels/chan_vpb.cc
team/mmichelson/sip_attended_transfer/channels/misdn/isdn_msg_parser.c
team/mmichelson/sip_attended_transfer/channels/sip/config_parser.c
team/mmichelson/sip_attended_transfer/channels/sip/dialplan_functions.c (contents, props changed)
team/mmichelson/sip_attended_transfer/channels/sip/include/config_parser.h
team/mmichelson/sip_attended_transfer/channels/sip/include/dialog.h (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/include/dialplan_functions.h (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/include/globals.h (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/include/sdp_crypto.h (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/include/sip.h
team/mmichelson/sip_attended_transfer/channels/sip/include/srtp.h (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/sdp_crypto.c (props changed)
team/mmichelson/sip_attended_transfer/channels/sip/security_events.c
team/mmichelson/sip_attended_transfer/channels/sip/srtp.c (props changed)
team/mmichelson/sip_attended_transfer/codecs/codec_dahdi.c (props changed)
team/mmichelson/sip_attended_transfer/configs/skinny.conf.sample
team/mmichelson/sip_attended_transfer/configure
team/mmichelson/sip_attended_transfer/configure.ac
team/mmichelson/sip_attended_transfer/contrib/utils/eagi_proxy.c (props changed)
team/mmichelson/sip_attended_transfer/formats/format_h264.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_channel.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_dialgroup.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_iconv.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_odbc.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_presencestate.c
team/mmichelson/sip_attended_transfer/funcs/func_rand.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_realtime.c (props changed)
team/mmichelson/sip_attended_transfer/funcs/func_version.c (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/_private.h
team/mmichelson/sip_attended_transfer/include/asterisk/acl.h
team/mmichelson/sip_attended_transfer/include/asterisk/ael_structs.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/app.h
team/mmichelson/sip_attended_transfer/include/asterisk/astobj2.h
team/mmichelson/sip_attended_transfer/include/asterisk/autoconfig.h.in
team/mmichelson/sip_attended_transfer/include/asterisk/bridging.h
team/mmichelson/sip_attended_transfer/include/asterisk/bridging_roles.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/ccss.h
team/mmichelson/sip_attended_transfer/include/asterisk/cel.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/channel.h
team/mmichelson/sip_attended_transfer/include/asterisk/config_options.h
team/mmichelson/sip_attended_transfer/include/asterisk/dial.h
team/mmichelson/sip_attended_transfer/include/asterisk/event.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/event_defs.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/frame_defs.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/hashtab.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/json.h (contents, props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/module.h
team/mmichelson/sip_attended_transfer/include/asterisk/netsock2.h
team/mmichelson/sip_attended_transfer/include/asterisk/paths.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/pktccops.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/res_sip.h
team/mmichelson/sip_attended_transfer/include/asterisk/res_srtp.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/rtp_engine.h
team/mmichelson/sip_attended_transfer/include/asterisk/security_events.h
team/mmichelson/sip_attended_transfer/include/asterisk/security_events_defs.h
team/mmichelson/sip_attended_transfer/include/asterisk/sha1.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/smdi.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/stasis.h (contents, props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_app.h (contents, props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_bridging.h
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_channels.h
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_http.h (contents, props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/stasis_message_router.h (contents, props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/stringfields.h (props changed)
team/mmichelson/sip_attended_transfer/include/asterisk/strings.h
team/mmichelson/sip_attended_transfer/include/asterisk/udptl.h (props changed)
team/mmichelson/sip_attended_transfer/main/app.c
team/mmichelson/sip_attended_transfer/main/asterisk.c
team/mmichelson/sip_attended_transfer/main/astobj2.c
team/mmichelson/sip_attended_transfer/main/bridging.c
team/mmichelson/sip_attended_transfer/main/bridging_basic.c
team/mmichelson/sip_attended_transfer/main/bridging_roles.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/cel.c (props changed)
team/mmichelson/sip_attended_transfer/main/channel.c
team/mmichelson/sip_attended_transfer/main/channel_internal_api.c
team/mmichelson/sip_attended_transfer/main/cli.c
team/mmichelson/sip_attended_transfer/main/config_options.c
team/mmichelson/sip_attended_transfer/main/devicestate.c
team/mmichelson/sip_attended_transfer/main/dial.c
team/mmichelson/sip_attended_transfer/main/endpoints.c
team/mmichelson/sip_attended_transfer/main/event.c (props changed)
team/mmichelson/sip_attended_transfer/main/features.c
team/mmichelson/sip_attended_transfer/main/hashtab.c (props changed)
team/mmichelson/sip_attended_transfer/main/json.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/loader.c
team/mmichelson/sip_attended_transfer/main/lock.c
team/mmichelson/sip_attended_transfer/main/logger.c
team/mmichelson/sip_attended_transfer/main/manager.c
team/mmichelson/sip_attended_transfer/main/manager_bridging.c
team/mmichelson/sip_attended_transfer/main/manager_channels.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/named_acl.c
team/mmichelson/sip_attended_transfer/main/pbx.c
team/mmichelson/sip_attended_transfer/main/presencestate.c
team/mmichelson/sip_attended_transfer/main/rtp_engine.c
team/mmichelson/sip_attended_transfer/main/security_events.c
team/mmichelson/sip_attended_transfer/main/sha1.c (props changed)
team/mmichelson/sip_attended_transfer/main/sorcery.c
team/mmichelson/sip_attended_transfer/main/stasis.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/stasis_bridging.c
team/mmichelson/sip_attended_transfer/main/stasis_cache.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/stasis_channels.c
team/mmichelson/sip_attended_transfer/main/stasis_endpoints.c
team/mmichelson/sip_attended_transfer/main/stasis_message.c (props changed)
team/mmichelson/sip_attended_transfer/main/stasis_message_router.c (contents, props changed)
team/mmichelson/sip_attended_transfer/main/test.c
team/mmichelson/sip_attended_transfer/main/threadstorage.c (props changed)
team/mmichelson/sip_attended_transfer/main/udptl.c (props changed)
team/mmichelson/sip_attended_transfer/pbx/pbx_dundi.c
team/mmichelson/sip_attended_transfer/pbx/pbx_lua.c (props changed)
team/mmichelson/sip_attended_transfer/res/Makefile
team/mmichelson/sip_attended_transfer/res/ael/ael.tab.c (props changed)
team/mmichelson/sip_attended_transfer/res/ael/ael.tab.h (props changed)
team/mmichelson/sip_attended_transfer/res/ael/ael_lex.c (props changed)
team/mmichelson/sip_attended_transfer/res/ael/pval.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_ael_share.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_chan_stats.c
team/mmichelson/sip_attended_transfer/res/res_clioriginate.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_config_odbc.c
team/mmichelson/sip_attended_transfer/res/res_curl.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_jabber.c
team/mmichelson/sip_attended_transfer/res/res_pktccops.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_security_log.c
team/mmichelson/sip_attended_transfer/res/res_sip.c
team/mmichelson/sip_attended_transfer/res/res_sip/config_transport.c
team/mmichelson/sip_attended_transfer/res/res_sip_acl.c
team/mmichelson/sip_attended_transfer/res/res_sip_endpoint_identifier_ip.c
team/mmichelson/sip_attended_transfer/res/res_sip_nat.c
team/mmichelson/sip_attended_transfer/res/res_sip_outbound_registration.c
team/mmichelson/sip_attended_transfer/res/res_sip_sdp_rtp.c
team/mmichelson/sip_attended_transfer/res/res_sip_session.c
team/mmichelson/sip_attended_transfer/res/res_smdi.c (props changed)
team/mmichelson/sip_attended_transfer/res/res_srtp.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_asterisk.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_bridges.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_channels.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_endpoints.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_events.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_playback.c
team/mmichelson/sip_attended_transfer/res/res_stasis_http_recordings.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/res_stasis_http_sounds.c
team/mmichelson/sip_attended_transfer/res/res_stasis_test.c
team/mmichelson/sip_attended_transfer/res/res_stasis_websocket.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_asterisk.c (props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_asterisk.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_bridges.c (props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_bridges.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_channels.c (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_channels.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_endpoints.c (props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_endpoints.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_events.c (props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_events.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_playback.c
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_playback.h
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_recordings.c (props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_recordings.h (contents, props changed)
team/mmichelson/sip_attended_transfer/res/stasis_http/resource_sounds.h
team/mmichelson/sip_attended_transfer/rest-api-templates/asterisk_processor.py
team/mmichelson/sip_attended_transfer/rest-api-templates/make_stasis_http_stubs.py
team/mmichelson/sip_attended_transfer/rest-api-templates/res_stasis_http_resource.c.mustache
team/mmichelson/sip_attended_transfer/rest-api-templates/stasis_http_resource.h.mustache
team/mmichelson/sip_attended_transfer/rest-api-templates/swagger_model.py
team/mmichelson/sip_attended_transfer/rest-api/api-docs/channels.json
team/mmichelson/sip_attended_transfer/rest-api/api-docs/events.json
team/mmichelson/sip_attended_transfer/rest-api/api-docs/playback.json
team/mmichelson/sip_attended_transfer/tests/test_astobj2_thrash.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_dlinklists.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_gosub.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_hashtab_thrash.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_json.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_res_stasis.c (contents, props changed)
team/mmichelson/sip_attended_transfer/tests/test_security_events.c
team/mmichelson/sip_attended_transfer/tests/test_stasis.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_stasis_http.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_time.c (props changed)
team/mmichelson/sip_attended_transfer/tests/test_xml_escape.c (props changed)
team/mmichelson/sip_attended_transfer/utils/ael_main.c (props changed)
team/mmichelson/sip_attended_transfer/utils/refcounter.c (props changed)
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
automerge = *
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
--- bridge_construction-integrated (original)
+++ bridge_construction-integrated Fri May 24 13:34:14 2013
@@ -1,1 +1,1 @@
-/trunk:1-388176
+/trunk:1-389680
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
--- more_transfer-integrated (original)
+++ more_transfer-integrated Fri May 24 13:34:14 2013
@@ -1,1 +1,1 @@
-/team/mmichelson/transfer:1-388229
+/team/mmichelson/transfer:1-389719
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
--- sip_attended_transfer-integrated (original)
+++ sip_attended_transfer-integrated Fri May 24 13:34:14 2013
@@ -1,1 +1,1 @@
-/team/mmichelson/more_transfer:1-388612
+/team/mmichelson/more_transfer:1-389727
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri May 24 13:34:14 2013
@@ -12,6 +12,7 @@
config.log
config.status
defaults.h
+doxygen.log
makeopts
makeopts.embed_rules
menuselect-tree
Propchange: team/mmichelson/sip_attended_transfer/
------------------------------------------------------------------------------
--- transfer-integrated (original)
+++ transfer-integrated Fri May 24 13:34:14 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-388218
+/team/group/bridge_construction:1-389687
Modified: team/mmichelson/sip_attended_transfer/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_attended_transfer/CHANGES?view=diff&rev=389728&r1=389727&r2=389728
==============================================================================
--- team/mmichelson/sip_attended_transfer/CHANGES (original)
+++ team/mmichelson/sip_attended_transfer/CHANGES Fri May 24 13:34:14 2013
@@ -50,6 +50,19 @@
* The AMI event 'UserEvent' from app_userevent now contains the channel state
fields. The channel state fields will come before the body fields.
+ * The AMI events 'ParkedCall', 'ParkedCallTimeOut', 'ParkedCallGiveUp', and
+ 'UnParkedCall' have changed significantly in the new res_parking module.
+ First, channel snapshot data is included for both the parker and the parkee
+ in lieu of the "From" and "Channel" fields. They follow standard channel
+ snapshot format but each field is suffixed with 'Parker' or 'Parkee'
+ depending on which side it applies to. The 'Exten' field is replaced with
+ 'ParkingSpace' since the registration of extensions as for parking spaces
+ is no longer mandatory.
+
+ * The AMI event 'Parkinglot' (response to 'Parkinglots' command) in a similar
+ fashion has changed the field names 'StartExten' and 'StopExten' to
+ 'StartSpace' and 'StopSpace' respectively.
+
* The deprecated use of | (pipe) as a separator in the channelvars setting in
manager.conf has been removed.
@@ -62,8 +75,12 @@
* The Bridge Manager action's Playtone header now accepts more fine-grained
options. "Channel1" and "Channel2" may be specified in order to play a tone
to the specific channel. "Both" may be specified to play a tone to both
- channels. The old "yes" options is still accepted as a way of playing the
+ channels. The old "yes" option is still accepted as a way of playing the
tone to Channel2 only.
+
+ * The AMI 'Status' response event to the AMI Status action replaces the
+ BridgedChannel and BridgedUniqueid headers with the BridgeID header to
+ indicate what bridge the channel is currently in.
Channel Drivers
------------------
@@ -77,6 +94,8 @@
------------------
* The /b option is removed.
+ * chan_local moved into the system core and is no longer a loadable module.
+
chan_mobile
------------------
* Added general support for busy detection.
@@ -101,8 +120,8 @@
* Add support for automixmonitor to the BRIDGE_FEATURES channel variable.
- * PARKINGSLOT and PARKEDLOT channel variables will now be set for a parked
- channel even when comebactoorigin=yes
+ * Parking has been pulled from core and placed into a separate module called
+ res_parking. See Parking changes below for more details.
* You can now have the settings for a channel updated using the FEATURE()
and FEATUREMAP() functions inherited to child channels by setting
@@ -131,6 +150,51 @@
if a denoiser is attached to the channel; this option gives them the ability
to remove the denoiser without having to unload func_speex.
+Parking
+-------------------
+ * Parking is now implemented as a module instead of as core functionality.
+ The preferred way to configure parking is now through res_parking.conf while
+ configuration through features.conf is not currently supported.
+
+ * Parked calls are now placed in bridges. This is a largely architectural change,
+ but it could have some implications in allowing for new parked call retrieval
+ methods and the contents of parking lots will be visible though certain bridge
+ commands.
+
+ * The order of arguments for the new parking applications are different from the
+ old ones to be more intuitive. Timeout and return context/exten/priority are now
+ implemented as options. parking_lot_name is now the first parameter. See the
+ application documentation for Park, ParkedCall, and ParkAndAnnounce for more
+ in-depth information as well as syntax.
+
+ * Extensions are no longer automatically created in the dialplan to park calls,
+ pickup parked calls, etc by default.
+
+ * adsipark is no longer supported under the new parking model
+
+ * The PARKINGSLOT channel variable has been deprecated in favor of PARKING_SPACE
+ to match the naming scheme of the new system.
+
+ * PARKING_SPACE and PARKEDLOT channel variables will now be set for a parked
+ channel even when comebactoorigin=yes
+
+ * New CLI command 'parking show' allows you to inspect the currently in use
+ parking lots. 'parking show <parkinglot>' will also show the parked calls
+ in that specific parking lot.
+
+ * The CLI command 'parkedcalls' is now deprecated in favor of
+ 'parking show <parkinglot>'.
+
+ * The AMI command 'ParkedCalls' will now accept a 'ParkingLot' argument which
+ can be used to get a list of parked calls only for a specific parking lot.
+
+ * The ParkAndAnnounce application is now provided through res_parking instead
+ of through the separate app_parkandannounce module.
+
+ * ParkAndAnnounce will no longer go to the next position in dialplan on timeout
+ by default. Instead, it will follow the timeout rules of the parking lot. The
+ old behavior can be reproduced by using the 'c' option.
+
Queue
-------------------
* Add queue available hint. exten => 8501,hint,Queue:markq_avail
@@ -168,11 +232,22 @@
If no resources exist or all are unavailable the device state is considered
to be unavailable.
+Security Events Framework
+-------------------------
+ * Security Event timestamps now use ISO 8601 formatted date/time instead of the
+ "seconds-microseconds" format that it was using previously.
+
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.
+
+app_userevent
+------------------
+ * UserEvent will now handle duplicate keys by overwriting the previous value
+ assigned to the key. UserEvent invocations will also be distributed to any
+ interested res_stasis applications.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
Modified: team/mmichelson/sip_attended_transfer/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_attended_transfer/UPGRADE.txt?view=diff&rev=389728&r1=389727&r2=389728
==============================================================================
--- team/mmichelson/sip_attended_transfer/UPGRADE.txt (original)
+++ team/mmichelson/sip_attended_transfer/UPGRADE.txt Fri May 24 13:34:14 2013
@@ -89,6 +89,12 @@
no longer honored. The feature is activated by which channel
DYNAMIC_FEATURES includes the feature is on. Use predial to set different
values of DYNAMIC_FEATURES on the channels
+
+Parking:
+ - The arguments for the Park, ParkedCall, and ParkAndAnnounce applications have
+ been modified significantly. See the application documents for specific details.
+ Also parking lot configuration is now done in res_parking.conf instead of
+ features.conf
From 10 to 11:
Modified: team/mmichelson/sip_attended_transfer/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_attended_transfer/addons/chan_ooh323.c?view=diff&rev=389728&r1=389727&r2=389728
==============================================================================
--- team/mmichelson/sip_attended_transfer/addons/chan_ooh323.c (original)
+++ team/mmichelson/sip_attended_transfer/addons/chan_ooh323.c Fri May 24 13:34:14 2013
@@ -117,7 +117,6 @@
.fixup = ooh323_fixup,
.send_html = 0,
.queryoption = ooh323_queryoption,
- .bridge = ast_rtp_instance_bridge, /* XXX chan unlocked ? */
.early_bridge = ast_rtp_instance_early_bridge,
.func_channel_read = function_ooh323_read,
.func_channel_write = function_ooh323_write,
@@ -490,9 +489,8 @@
}
if (ch) {
- manager_event(EVENT_FLAG_SYSTEM, "ChannelUpdate",
- "Channel: %s\r\nChanneltype: %s\r\n"
- "CallRef: %d\r\n", ast_channel_name(ch), "OOH323", i->call_reference);
+ ast_publish_channel_state(ch);
+
}
} else
ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
@@ -2149,8 +2147,7 @@
ast_queue_control(c, AST_CONTROL_ANSWER);
ast_channel_unlock(p->owner);
- manager_event(EVENT_FLAG_SYSTEM,"ChannelUpdate","Channel: %s\r\nChanneltype: %s\r\n"
- "CallRef: %d\r\n", ast_channel_name(c), "OOH323", p->call_reference);
+ ast_publish_channel_state(c);
}
ast_mutex_unlock(&p->lock);
Modified: team/mmichelson/sip_attended_transfer/addons/chan_ooh323.h
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_attended_transfer/addons/chan_ooh323.h?view=diff&rev=389728&r1=389727&r2=389728
==============================================================================
--- team/mmichelson/sip_attended_transfer/addons/chan_ooh323.h (original)
+++ team/mmichelson/sip_attended_transfer/addons/chan_ooh323.h Fri May 24 13:34:14 2013
@@ -64,6 +64,7 @@
#include "asterisk/format.h"
#include "asterisk/format_cap.h"
#include "asterisk/udptl.h"
+#include "asterisk/stasis_channels.h"
#include "ootypes.h"
#include "ooUtils.h"
Modified: team/mmichelson/sip_attended_transfer/apps/app_bridgewait.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/sip_attended_transfer/apps/app_bridgewait.c?view=diff&rev=389728&r1=389727&r2=389728
==============================================================================
--- team/mmichelson/sip_attended_transfer/apps/app_bridgewait.c (original)
[... 18205 lines stripped ...]
More information about the asterisk-commits
mailing list