git.asterisk.org Git - asterisk/asterisk.git/commit

projects / asterisk/asterisk.git / commit

author	Richard Mudgett <rmudgett@digium.com>
	Tue, 21 May 2013 18:00:22 +0000 (18:00 +0000)
committer	Richard Mudgett <rmudgett@digium.com>
	Tue, 21 May 2013 18:00:22 +0000 (18:00 +0000)
commit	3d63833bd6c869b7efa383e8dea14be1a6eff998
tree	34957dd051b8f67c7cc58a510e24ee3873a61ad4	tree \| snapshot
parent	e1e1cc2deefb92f8b43825f1f34e619354737842	commit \| diff

Merge in the bridge_construction branch to make the system use the Bridging API.

Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3

99 files changed:

CHANGES		diff \| blob \| history
UPGRADE.txt		diff \| blob \| history
addons/chan_ooh323.c		diff \| blob \| history
apps/app_bridgewait.c	[new file with mode: 0644]	blob
apps/app_channelredirect.c		diff \| blob \| history
apps/app_chanspy.c		diff \| blob \| history
apps/app_confbridge.c		diff \| blob \| history
apps/app_dial.c		diff \| blob \| history
apps/app_dumpchan.c		diff \| blob \| history
apps/app_followme.c		diff \| blob \| history
apps/app_mixmonitor.c		diff \| blob \| history
apps/app_parkandannounce.c	[deleted file]	blob \| history
apps/app_queue.c		diff \| blob \| history
apps/confbridge/conf_chan_announce.c	[new file with mode: 0644]	blob
apps/confbridge/conf_chan_record.c	[new file with mode: 0644]	blob
apps/confbridge/conf_config_parser.c		diff \| blob \| history
apps/confbridge/confbridge_manager.c	[new file with mode: 0644]	blob
apps/confbridge/include/confbridge.h		diff \| blob \| history
bridges/bridge_builtin_features.c		diff \| blob \| history
bridges/bridge_builtin_interval_features.c	[new file with mode: 0644]	blob
bridges/bridge_holding.c	[new file with mode: 0644]	blob
bridges/bridge_multiplexed.c	[deleted file]	blob \| history
bridges/bridge_native_rtp.c	[new file with mode: 0644]	blob
bridges/bridge_simple.c		diff \| blob \| history
bridges/bridge_softmix.c		diff \| blob \| history
channels/chan_agent.c		diff \| blob \| history
channels/chan_bridge.c	[deleted file]	blob \| history
channels/chan_dahdi.c		diff \| blob \| history
channels/chan_gulp.c		diff \| blob \| history
channels/chan_h323.c		diff \| blob \| history
channels/chan_iax2.c		diff \| blob \| history
channels/chan_jingle.c		diff \| blob \| history
channels/chan_local.c	[deleted file]	blob \| history
channels/chan_mgcp.c		diff \| blob \| history
channels/chan_misdn.c		diff \| blob \| history
channels/chan_motif.c		diff \| blob \| history
channels/chan_sip.c		diff \| blob \| history
channels/chan_skinny.c		diff \| blob \| history
channels/chan_unistim.c		diff \| blob \| history
channels/chan_vpb.cc		diff \| blob \| history
configs/features.conf.sample		diff \| blob \| history
configs/res_parking.conf.sample	[new file with mode: 0644]	blob
funcs/func_channel.c		diff \| blob \| history
funcs/func_frame_trace.c		diff \| blob \| history
funcs/func_jitterbuffer.c		diff \| blob \| history
include/asterisk/_private.h		diff \| blob \| history
include/asterisk/abstract_jb.h		diff \| blob \| history
include/asterisk/bridging.h		diff \| blob \| history
include/asterisk/bridging_basic.h	[new file with mode: 0644]	blob
include/asterisk/bridging_features.h		diff \| blob \| history
include/asterisk/bridging_roles.h	[new file with mode: 0644]	blob
include/asterisk/bridging_technology.h		diff \| blob \| history
include/asterisk/ccss.h		diff \| blob \| history
include/asterisk/channel.h		diff \| blob \| history
include/asterisk/config_options.h		diff \| blob \| history
include/asterisk/core_local.h	[new file with mode: 0644]	blob
include/asterisk/core_unreal.h	[new file with mode: 0644]	blob
include/asterisk/frame.h		diff \| blob \| history
include/asterisk/framehook.h		diff \| blob \| history
include/asterisk/manager.h		diff \| blob \| history
include/asterisk/parking.h	[new file with mode: 0644]	blob
include/asterisk/rtp_engine.h		diff \| blob \| history
include/asterisk/stasis_bridging.h	[new file with mode: 0644]	blob
main/abstract_jb.c		diff \| blob \| history
main/asterisk.c		diff \| blob \| history
main/bridging.c		diff \| blob \| history
main/bridging_basic.c	[new file with mode: 0644]	blob
main/bridging_roles.c	[new file with mode: 0644]	blob
main/channel.c		diff \| blob \| history
main/channel_internal_api.c		diff \| blob \| history
main/cli.c		diff \| blob \| history
main/config_options.c		diff \| blob \| history
main/core_local.c	[new file with mode: 0644]	blob
main/core_unreal.c	[new file with mode: 0644]	blob
main/features.c		diff \| blob \| history
main/frame.c		diff \| blob \| history
main/manager.c		diff \| blob \| history
main/manager_bridging.c	[new file with mode: 0644]	blob
main/manager_channels.c		diff \| blob \| history
main/parking.c	[new file with mode: 0644]	blob
main/pbx.c		diff \| blob \| history
main/rtp_engine.c		diff \| blob \| history
main/stasis_bridging.c	[new file with mode: 0644]	blob
main/strings.c		diff \| blob \| history
res/Makefile		diff \| blob \| history
res/parking/parking_applications.c	[new file with mode: 0644]	blob
res/parking/parking_bridge.c	[new file with mode: 0644]	blob
res/parking/parking_bridge_features.c	[new file with mode: 0644]	blob
res/parking/parking_controller.c	[new file with mode: 0644]	blob
res/parking/parking_manager.c	[new file with mode: 0644]	blob
res/parking/parking_ui.c	[new file with mode: 0644]	blob
res/parking/res_parking.h	[new file with mode: 0644]	blob
res/res_parking.c	[new file with mode: 0644]	blob
res/res_stasis_json_events.c		diff \| blob \| history
res/res_stasis_json_events.exports.in		diff \| blob \| history
res/stasis_json/resource_events.h		diff \| blob \| history
rest-api-templates/res_stasis_json_resource.c.mustache		diff \| blob \| history
rest-api-templates/stasis_json_resource.h.mustache		diff \| blob \| history
rest-api/api-docs/events.json		diff \| blob \| history

Mirror of the Asterisk Project (https://gerrit.asterisk.org)

RSS Atom