main/asterisk: upgrade to 12.1.0

ASTERISK-19109, rebased against 12.x (untested)
ASTERISK-19499, cherry picked from upstream

7 files changed, 542 insertions, 368 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index e8fdb4332..50c068f2d 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=11.7.0
-pkgrel=1
+pkgver=12.1.0
+pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
@@ -10,11 +10,11 @@ url="http://www.asterisk.org/"
 arch="all"
 license="GPL2"
 depends=
-makedepends="autoconf automake libtool ncurses-dev popt-dev newt-dev zlib-dev
-	postgresql-dev unixodbc-dev dahdi-tools-dev libpri-dev tar
-	freetds-dev openssl-dev lua-dev alsa-lib-dev spandsp-dev tiff-dev
-	libresample sqlite-dev wget speex-dev libogg-dev bluez-dev curl-dev
-	libedit-dev libsrtp-dev util-linux-dev"
+makedepends="autoconf automake libtool tar wget ncurses-dev popt-dev newt-dev
+	zlib-dev pjproject-dev jansson-dev libedit-dev dahdi-tools-dev libpri-dev
+	sqlite-dev postgresql-dev unixodbc-dev freetds-dev openssl-dev lua-dev
+	alsa-lib-dev spandsp-dev tiff-dev libresample speex-dev libogg-dev
+	bluez-dev curl-dev libsrtp-dev util-linux-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
 	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample
@@ -35,10 +35,11 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	$_patches
 	100-uclibc-daemon.patch
 	101-caps-uclibc.patch
-	musl-cdefs.patch
+	musl-includes.patch
 	musl-glob-compat.patch
-	musl-pjsip-mutex.patch
+	musl-outofmem-handling.patch
 	ASTERISK-18995.patch
+	ASTERISK-19499.patch
 	ASTERISK-19109.patch
 	ASTERISK-20527.patch
 	asterisk.initd
@@ -235,38 +236,41 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="f0c6b577f1efd8dc2de1f259b95a8d66  asterisk-11.7.0.tar.gz
+md5sums="87a7894f47d4420c4f4e1a3618a0259d  asterisk-12.1.0.tar.gz
 837fc3bc835699462a8d2a7a16b9b6a3  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
-735e5ae1e2121878a55eb2f5c6946ee2  musl-cdefs.patch
+b4211313aae31efa8c3c1931ba47dbf9  musl-includes.patch
 9b3e6cb75464a6ef4c40d191bdfdf7ea  musl-glob-compat.patch
-dfbd596ac95f52e3e668ade2c38147b1  musl-pjsip-mutex.patch
+10b84632764a6f05ec9973c31f5e82fb  musl-outofmem-handling.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
-146befabe95798a67c58d8ac00d397a6  ASTERISK-19109.patch
+823856836230ed657ed11e6d895c23ed  ASTERISK-19499.patch
+b06ae4aecf862769158b60bd6b2e9cb0  ASTERISK-19109.patch
 676ca42ee1859d8a7bae4345ede5eb89  ASTERISK-20527.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="4fb283b96447f5d871632a14069f35643c8c34d08d6ec5fedf0ae3df30e0c397  asterisk-11.7.0.tar.gz
+sha256sums="879bbd2bbf68ef76eb77406ba3309b8515db0a662408af991d694fbba99c0b9e  asterisk-12.1.0.tar.gz
 6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003  100-uclibc-daemon.patch
 c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclibc.patch
-ad2506945246a6c2010bf39c1b3a8b10a6a635f02b56cbfa3014dcb2257298ff  musl-cdefs.patch
+e3b7128813d0452b152d3af5015da927b07849e7f33de9f80f1d10f65907d268  musl-includes.patch
 c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52  musl-glob-compat.patch
-84e8d17572ee362c411bb641ae339eb42cb4542c32b0d1f41b7ac5f22b3328cb  musl-pjsip-mutex.patch
+235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b  musl-outofmem-handling.patch
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
-d657634d4c96f42ac1a8b7103104185e8cd9d5a59e5214cc1658e01805975ce8  ASTERISK-19109.patch
+798e550e637917d66a8fce31d85f64fd31f4255b3addf5dd46a19ca9e7ac5282  ASTERISK-19499.patch
+62c6f6f254a0ca83fb7e13d16779121b4de0ecf7a1268c14d27d4463f5631420  ASTERISK-19109.patch
 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94  ASTERISK-20527.patch
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="cd7ee59f9133fbd088b30c0495ac4d94cb0ca273015681340eeb4192ee1c510b59c8290255fc2df81f070369ff2ca56073fdee3f39e0b0186d95bb85f9ad1bd6  asterisk-11.7.0.tar.gz
+sha512sums="690b952b9685220cd53419b5fdcf7aad96f01f8d66144fe53aa4a0456c1b000d71981a446e21187c13dc68dd067f540e169e59dcb2626741ac9de7837980e50d  asterisk-12.1.0.tar.gz
 24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831  100-uclibc-daemon.patch
 601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368  101-caps-uclibc.patch
-29c74eee1df4826a8b63a049b57cc1a3d898b6e54bc32f4895e8e4e0ed88aece0061755ec1294fd6fb3d1cc4b2fd4de56ee5a8f036230609b0b08d2213c2d1cf  musl-cdefs.patch
+878b8cddc5af338a07658c388d42a7f9ddf3edcf302ca8b294adcf278b6ceacd463d279cb716b0b6b059f47eb287803bc15a7f36a403c66697f466ff3cd5a6e4  musl-includes.patch
 edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac  musl-glob-compat.patch
-33f376cf37ff6a916a4ca67edc686b4afbfaecd74fdc7ef08ed19bf3fb01f4e6a604ff2de3b2a14b4313c91037e6587b85917111998b5166eeccab5317601f11  musl-pjsip-mutex.patch
+7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e  musl-outofmem-handling.patch
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch
-a9a0a4199291a6ef5ebdf07daee07293d96a16a38116f6afdea61d68b167235d63b5a54e3ae45b7e11be0b9dc82863fdced1ad45110dcac29b353ddcc1d6337a  ASTERISK-19109.patch
+3bddb216c3902354f2bb41bab0a2392b01933a82736cb4ad4cecbc70739fd716fc2fa1cbd250fa669d529763cd4ad192e573283376e0c746209cc0607edc24e3  ASTERISK-19499.patch
+1dbf0f63e5e1721e90fdd5ff0956753958a2c7eb5f710afd5ebf6d871c9b894d698d0f019f8876b5427be0b4c40497edb97ba1f64f214c9a6f8ef4478764ca74  ASTERISK-19109.patch
 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d  ASTERISK-20527.patch
 e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
diff --git a/main/asterisk/ASTERISK-19109.patch b/main/asterisk/ASTERISK-19109.patch
index cd45b4273..b7b8d76e0 100644
--- a/main/asterisk/ASTERISK-19109.patch
+++ b/main/asterisk/ASTERISK-19109.patch
@@ -1,42 +1,21 @@
-From 806946c35cf0560248e63fea53c4d82426a2034a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 5 Sep 2012 10:07:05 +0300
-Subject: [PATCH] ASTERISK-19109: Implement deaf participant support for
- ConfBridge
-
----
- CHANGES                                |   3 +
- apps/app_confbridge.c                  | 218 ++++++++++++++++++++++++++++++---
- apps/confbridge/conf_config_parser.c   |  14 +++
- apps/confbridge/include/confbridge.h   |   6 +
- bridges/bridge_multiplexed.c           |   2 +-
- bridges/bridge_simple.c                |   2 +-
- bridges/bridge_softmix.c               |  38 +++---
- configs/confbridge.conf.sample         |   5 +
- include/asterisk/bridging_features.h   |   2 +
- include/asterisk/bridging_technology.h |  15 +++
- main/bridging.c                        |  22 ++++
- 11 files changed, 294 insertions(+), 33 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index c3c9891..2efa17b 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -66,6 +66,9 @@ ConfBridge
-    file will be played to the user, and only the user, upon joining the
-    conference bridge.
+diff -ru asterisk-12.1.0.orig/CHANGES asterisk-12.1.0/CHANGES
+--- asterisk-12.1.0.orig/CHANGES	2014-03-04 12:28:27.967573113 +0000
++++ asterisk-12.1.0/CHANGES	2014-03-04 12:25:54.994802007 +0000
+@@ -8,6 +8,10 @@
+ ===
+ ==============================================================================
  
++
 + * Added support for deaf participants with CLI commands, manager actions
 +   and ConfBridge DTMF actions to toggle the deaf state.
 +
- 
- Dial
- -------------------
-diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
-index 90954b8..0455be4 100644
---- a/apps/app_confbridge.c
-+++ b/apps/app_confbridge.c
-@@ -185,6 +185,30 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ ------------------------------------------------------------------------------
+ --- Functionality changes from Asterisk 12.0.0 to Asterisk 12.1.0 ------------
+ ------------------------------------------------------------------------------
+diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_confbridge.c
+--- asterisk-12.1.0.orig/apps/app_confbridge.c	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/apps/app_confbridge.c	2014-03-04 12:35:39.105383185 +0000
+@@ -215,6 +215,30 @@
  		<description>
  		</description>
  	</manager>
@@ -67,9 +46,9 @@ index 90954b8..0455be4 100644
  	<manager name="ConfbridgeKick" language="en_US">
  		<synopsis>
  			Kick a Confbridge user.
-@@ -273,6 +297,13 @@ static const char app[] = "ConfBridge";
- /* Number of buckets our conference bridges container can have */
- #define CONFERENCE_BRIDGE_BUCKETS 53
+@@ -311,6 +335,13 @@
+ 	CONF_RECORD_STOP,
+ };
  
 +enum confbridge_feature_action {
 +	CONFBRIDGE_FEATURE_MUTE,
@@ -79,9 +58,9 @@ index 90954b8..0455be4 100644
 +};
 +
  /*! \brief Container to hold all conference bridges in progress */
- static struct ao2_container *conference_bridges;
+ struct ao2_container *conference_bridges;
  
-@@ -311,6 +342,10 @@ const char *conf_get_sound(enum conf_sounds sound, struct bridge_profile_sounds
+@@ -382,6 +413,10 @@
  		return S_OR(custom_sounds->muted, "conf-muted");
  	case CONF_SOUND_UNMUTED:
  		return S_OR(custom_sounds->unmuted, "conf-unmuted");
@@ -92,57 +71,101 @@ index 90954b8..0455be4 100644
  	case CONF_SOUND_ONLY_ONE:
  		return S_OR(custom_sounds->onlyone, "conf-onlyone");
  	case CONF_SOUND_THERE_ARE:
-@@ -1504,10 +1539,13 @@ static int confbridge_exec(struct ast_channel *chan, const char *data)
+@@ -493,6 +528,16 @@
+ 	send_conf_stasis(conference, chan, confbridge_unmute_type(), NULL, 1);
+ }
+ 
++static void send_deafen_event(struct ast_channel *chan, struct confbridge_conference *conference)
++{
++	send_conf_stasis(conference, chan, confbridge_deafen_type(), NULL, 1);
++}
++
++static void send_undeafen_event(struct ast_channel *chan, struct confbridge_conference *conference)
++{
++	send_conf_stasis(conference, chan, confbridge_undeafen_type(), NULL, 1);
++}
++
+ static void set_rec_filename(struct confbridge_conference *conference, struct ast_str **filename, int is_new)
+ {
+ 	char *rec_file = conference->b_profile.rec_file;
+@@ -1661,11 +1706,14 @@
  	volume_adjustments[0] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_READ);
  	volume_adjustments[1] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_WRITE);
  
 -	/* If the caller should be joined already muted, make it so */
 +	/* If the caller should be joined already muted or deaf, make it so */
- 	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_STARTMUTED)) {
- 		conference_bridge_user.features.mute = 1;
+ 	if (ast_test_flag(&user.u_profile, USER_OPT_STARTMUTED)) {
+ 		/* Set user level mute request. */
+ 		user.muted = 1;
  	}
-+	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_STARTDEAF)) {
-+		conference_bridge_user.features.deaf = 1;
++	if (ast_test_flag(&user.u_profile, USER_OPT_STARTDEAF)) {
++		user.features.deaf = 1;
 +	}
  
- 	if (ast_test_flag(&conference_bridge_user.u_profile, USER_OPT_DROP_SILENCE)) {
- 		conference_bridge_user.tech_args.drop_silence = 1;
-@@ -1668,6 +1706,20 @@ static int action_toggle_mute_participants(struct conference_bridge *conference_
+ 	if (ast_test_flag(&user.u_profile, USER_OPT_DROP_SILENCE)) {
+ 		user.tech_args.drop_silence = 1;
+@@ -1845,6 +1893,30 @@
  	return 0;
  }
  
-+static int action_toggle_deaf(struct conference_bridge *conference_bridge,
-+	struct conference_bridge_user *conference_bridge_user,
-+	struct ast_channel *chan)
++static int action_toggle_deaf(struct confbridge_conference *conference,
++	struct confbridge_user *user, struct ast_channel *chan)
 +{
 +	/* Deafen or undeafen yourself */
-+	conference_bridge_user->features.deaf = (!conference_bridge_user->features.deaf ? 1 : 0);
-+	ast_test_suite_event_notify("CONF_DEAF", "Message: participant %s %s\r\nConference: %s\r\nChannel: %s", chan->name, conference_bridge_user->features.deaf ? "deafened" : "undeafened", conference_bridge_user->b_profile.name, chan->name);
-+
-+	return ast_stream_and_wait(chan, (conference_bridge_user->features.deaf ?
-+		conf_get_sound(CONF_SOUND_DEAFENED, conference_bridge_user->b_profile.sounds) :
-+		conf_get_sound(CONF_SOUND_UNDEAFENED, conference_bridge_user->b_profile.sounds)),
++	user->features.deaf = !user->features.deaf;
++	ast_test_suite_event_notify("CONF_DEAF",
++		"Message: participant %s %s\r\n"
++		"Conference: %s\r\n"
++		"Channel: %s",
++		ast_channel_name(chan),
++		user->features.deaf ? "deafened" : "undeafened",
++		user->b_profile.name,
++		ast_channel_name(chan));
++	if (user->features.deaf) {
++		send_deafen_event(chan, conference);
++	} else {
++		send_undeafen_event(chan, conference);
++	}
++	return ast_stream_and_wait(chan, (user->features.deaf ?
++		conf_get_sound(CONF_SOUND_DEAFENED, user->b_profile.sounds) :
++		conf_get_sound(CONF_SOUND_UNDEAFENED, user->b_profile.sounds)),
 +		"");
 +}
 +
  static int action_playback(struct ast_bridge_channel *bridge_channel, const char *playback_file)
  {
  	char *file_copy = ast_strdupa(playback_file);
-@@ -1856,6 +1908,11 @@ static int execute_menu_entry(struct conference_bridge *conference_bridge,
+@@ -2033,6 +2105,11 @@
  		case MENU_ACTION_PARTICIPANT_COUNT:
- 			announce_user_count(conference_bridge, conference_bridge_user);
+ 			announce_user_count(conference, user);
  			break;
 +		case MENU_ACTION_TOGGLE_DEAF:
-+			res |= action_toggle_deaf(conference_bridge,
-+				conference_bridge_user,
++			res |= action_toggle_deaf(conference,
++				user,
 +				bridge_channel->chan);
 +			break;
  		case MENU_ACTION_PLAYBACK:
  			if (!stop_prompts) {
  				res |= action_playback(bridge_channel, menu_action->data.playback_file);
-@@ -2119,13 +2176,13 @@ static int generic_lock_unlock_helper(int lock, const char *conference)
+@@ -2379,14 +2456,29 @@
+ 	return res;
  }
  
++static void test_suite_feature_action_event_notify(
++	struct confbridge_conference *conference,
++	struct confbridge_user *user,
++	const char *state, const char *verb)
++{
++	ast_test_suite_event_notify(state,
++		"Message: participant %s %s\r\n"
++		"Conference: %s\r\n"
++		"Channel: %s",
++		ast_channel_name(user->chan),
++		verb,
++		conference->b_profile.name,
++		ast_channel_name(user->chan));
++}
++
  /* \internal
 - * \brief finds a conference user by channel name and mutes/unmutes them.
 + * \brief finds a conference user by channel name and changes feature bits on it.
@@ -151,60 +174,61 @@ index 90954b8..0455be4 100644
   * \retval -1 conference not found
   * \retval -2 user not found
   */
--static int generic_mute_unmute_helper(int mute, const char *conference, const char *user)
-+static int generic_feature_action_helper(enum confbridge_feature_action action, const char *conference, const char *user)
+-static int generic_mute_unmute_helper(int mute, const char *conference_name, const char *chan_name)
++static int generic_feature_action_helper(enum confbridge_feature_action action, const char *conference_name, const char *chan_name)
  {
- 	struct conference_bridge *bridge = NULL;
- 	struct conference_bridge tmp;
-@@ -2143,10 +2200,44 @@ static int generic_mute_unmute_helper(int mute, const char *conference, const ch
+ 	struct confbridge_conference *conference;
+ 	struct confbridge_user *user;
+@@ -2403,25 +2495,33 @@
  		}
  	}
- 	if (participant) {
--		participant->features.mute = mute;
--		ast_test_suite_event_notify("CONF_MUTE", "Message: participant %s %s\r\nConference: %s\r\nChannel: %s", ast_channel_name(participant->chan), participant->features.mute ? "muted" : "unmuted", bridge->b_profile.name, ast_channel_name(participant->chan));
-+		const char *state, *verb;
-+
+ 	if (user) {
+-		/* Set user level mute request. */
+-		user->muted = mute ? 1 : 0;
+-
+-		conf_update_user_mute(user);
+-		ast_test_suite_event_notify("CONF_MUTE",
+-			"Message: participant %s %s\r\n"
+-			"Conference: %s\r\n"
+-			"Channel: %s",
+-			ast_channel_name(user->chan),
+-			mute ? "muted" : "unmuted",
+-			conference->b_profile.name,
+-			ast_channel_name(user->chan));
+-		if (mute) {
 +		switch (action) {
 +		case CONFBRIDGE_FEATURE_DEAFEN:
-+			participant->features.deaf = 1;
-+			state = "CONF_DEAF";
-+			verb = "deafened";
++			user->features.deaf = 1;
++			test_suite_feature_action_event_notify(conference, user, "CONF_DEAF", "deafened");
++			send_deafen_event(user->chan, conference);
 +			break;
 +		case CONFBRIDGE_FEATURE_UNDEAFEN:
-+			participant->features.deaf = 0;
-+			state = "CONF_DEAF";
-+			verb = "undeafened";
++			user->features.deaf = 0;
++			test_suite_feature_action_event_notify(conference, user, "CONF_DEAF", "undeafened");
++			send_undeafen_event(user->chan, conference);
 +			break;
 +		case CONFBRIDGE_FEATURE_MUTE:
-+			participant->features.mute = 1;
-+			state = "CONF_MUTE";
-+			verb = "muted";
++			user->muted = 1;
++			conf_update_user_mute(user);
++			test_suite_feature_action_event_notify(conference, user, "CONF_MUTE", "muted");
+ 			send_mute_event(user->chan, conference);
+-		} else {
 +			break;
 +		case CONFBRIDGE_FEATURE_UNMUTE:
 +		default:
-+			participant->features.mute = 0;
-+			state = "CONF_MUTE";
-+			verb = "unmuted";
++			user->muted = 0;
++			conf_update_user_mute(user);
++			test_suite_feature_action_event_notify(conference, user, "CONF_MUTE", "unmuted");
+ 			send_unmute_event(user->chan, conference);
 +			break;
-+		}
-+
-+		if (state != NULL && verb != NULL) {
-+			ast_test_suite_event_notify(state,
-+				"Message: participant %s %s\r\n"
-+				"Conference: %s\r\n"
-+				"Channel: %s",
-+				ast_channel_name(participant->chan),
-+				verb,
-+				bridge->b_profile.name,
-+				ast_channel_name(participant->chan));
-+		}
+ 		}
  	} else {
 -		res = -2;;
 +		res = -2;
  	}
- 	ao2_unlock(bridge);
- 	ao2_ref(bridge, -1);
-@@ -2154,9 +2245,10 @@ static int generic_mute_unmute_helper(int mute, const char *conference, const ch
+ 	ao2_unlock(conference);
+ 	ao2_ref(conference, -1);
+@@ -2429,9 +2529,10 @@
  	return res;
  }
  
@@ -217,7 +241,7 @@ index 90954b8..0455be4 100644
  
  	if (res == -1) {
  		ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
-@@ -2165,7 +2257,24 @@ static int cli_mute_unmute_helper(int mute, struct ast_cli_args *a)
+@@ -2440,7 +2541,24 @@
  		ast_cli(a->fd, "No channel named '%s' found in conference %s\n", a->argv[3], a->argv[2]);
  		return -1;
  	}
@@ -243,7 +267,7 @@ index 90954b8..0455be4 100644
  	return 0;
  }
  
-@@ -2187,7 +2296,7 @@ static char *handle_cli_confbridge_mute(struct ast_cli_entry *e, int cmd, struct
+@@ -2469,7 +2587,7 @@
  		return CLI_SHOWUSAGE;
  	}
  
@@ -252,7 +276,7 @@ index 90954b8..0455be4 100644
  
  	return CLI_SUCCESS;
  }
-@@ -2210,7 +2319,53 @@ static char *handle_cli_confbridge_unmute(struct ast_cli_entry *e, int cmd, stru
+@@ -2499,7 +2617,53 @@
  		return CLI_SHOWUSAGE;
  	}
  
@@ -307,7 +331,7 @@ index 90954b8..0455be4 100644
  
  	return CLI_SUCCESS;
  }
-@@ -2358,6 +2513,8 @@ static struct ast_cli_entry cli_confbridge[] = {
+@@ -2654,6 +2818,8 @@
  	AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of conference bridges."),
  	AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute a participant."),
  	AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute a participant."),
@@ -316,29 +340,29 @@ index 90954b8..0455be4 100644
  	AST_CLI_DEFINE(handle_cli_confbridge_lock, "Lock a conference."),
  	AST_CLI_DEFINE(handle_cli_confbridge_unlock, "Unlock a conference."),
  	AST_CLI_DEFINE(handle_cli_confbridge_start_record, "Start recording a conference"),
-@@ -2492,10 +2649,11 @@ static int action_confbridgelistrooms(struct mansession *s, const struct message
+@@ -2804,10 +2970,11 @@
  	return 0;
  }
  
 -static int action_mute_unmute_helper(struct mansession *s, const struct message *m, int mute)
 +static int action_feature_action_helper(struct mansession *s, const struct message *m, enum confbridge_feature_action action)
  {
- 	const char *conference = astman_get_header(m, "Conference");
- 	const char *channel = astman_get_header(m, "Channel");
+ 	const char *conference_name = astman_get_header(m, "Conference");
+ 	const char *channel_name = astman_get_header(m, "Channel");
 +	char *verb;
  	int res = 0;
  
- 	if (ast_strlen_zero(conference)) {
-@@ -2511,7 +2669,7 @@ static int action_mute_unmute_helper(struct mansession *s, const struct message
+ 	if (ast_strlen_zero(conference_name)) {
+@@ -2823,7 +2990,7 @@
  		return 0;
  	}
  
--	res = generic_mute_unmute_helper(mute, conference, channel);
-+	res = generic_feature_action_helper(action, conference, channel);
+-	res = generic_mute_unmute_helper(mute, conference_name, channel_name);
++	res = generic_feature_action_helper(action, conference_name, channel_name);
  
  	if (res == -1) {
  		astman_send_error(s, m, "No Conference by that name found.");
-@@ -2521,17 +2679,41 @@ static int action_mute_unmute_helper(struct mansession *s, const struct message
+@@ -2833,17 +3000,41 @@
  		return 0;
  	}
  
@@ -383,16 +407,16 @@ index 90954b8..0455be4 100644
  }
  
  static int action_lock_unlock_helper(struct mansession *s, const struct message *m, int lock)
-@@ -2818,6 +3000,8 @@ static int unload_module(void)
- 	res |= ast_manager_unregister("ConfbridgeListRooms");
- 	res |= ast_manager_unregister("ConfbridgeMute");
- 	res |= ast_manager_unregister("ConfbridgeUnmute");
-+	res |= ast_manager_unregister("ConfbridgeDeafen");
-+	res |= ast_manager_unregister("ConfbridgeUndeafen");
- 	res |= ast_manager_unregister("ConfbridgeKick");
- 	res |= ast_manager_unregister("ConfbridgeUnlock");
- 	res |= ast_manager_unregister("ConfbridgeLock");
-@@ -2860,6 +3044,8 @@ static int load_module(void)
+@@ -3196,6 +3387,8 @@
+ 	ast_manager_unregister("ConfbridgeListRooms");
+ 	ast_manager_unregister("ConfbridgeMute");
+ 	ast_manager_unregister("ConfbridgeUnmute");
++	ast_manager_unregister("ConfbridgeDeafen");
++	ast_manager_unregister("ConfbridgeUndeafen");
+ 	ast_manager_unregister("ConfbridgeKick");
+ 	ast_manager_unregister("ConfbridgeUnlock");
+ 	ast_manager_unregister("ConfbridgeLock");
+@@ -3265,6 +3458,8 @@
  	res |= ast_manager_register_xml("ConfbridgeListRooms", EVENT_FLAG_REPORTING, action_confbridgelistrooms);
  	res |= ast_manager_register_xml("ConfbridgeMute", EVENT_FLAG_CALL, action_confbridgemute);
  	res |= ast_manager_register_xml("ConfbridgeUnmute", EVENT_FLAG_CALL, action_confbridgeunmute);
@@ -401,11 +425,10 @@ index 90954b8..0455be4 100644
  	res |= ast_manager_register_xml("ConfbridgeKick", EVENT_FLAG_CALL, action_confbridgekick);
  	res |= ast_manager_register_xml("ConfbridgeUnlock", EVENT_FLAG_CALL, action_confbridgeunlock);
  	res |= ast_manager_register_xml("ConfbridgeLock", EVENT_FLAG_CALL, action_confbridgelock);
-diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
-index f4a9604..8a02de7 100644
---- a/apps/confbridge/conf_config_parser.c
-+++ b/apps/confbridge/conf_config_parser.c
-@@ -279,6 +279,10 @@ static int set_sound(const char *sound_name, const char *sound_file, struct brid
+diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1.0/apps/confbridge/conf_config_parser.c
+--- asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/apps/confbridge/conf_config_parser.c	2014-03-04 12:25:54.998135400 +0000
+@@ -862,6 +862,10 @@
  		ast_string_field_set(sounds, muted, sound_file);
  	} else if (!strcasecmp(sound_name, "sound_unmuted")) {
  		ast_string_field_set(sounds, unmuted, sound_file);
@@ -416,7 +439,7 @@ index f4a9604..8a02de7 100644
  	} else if (!strcasecmp(sound_name, "sound_there_are")) {
  		ast_string_field_set(sounds, thereare, sound_file);
  	} else if (!strcasecmp(sound_name, "sound_other_in_party")) {
-@@ -418,6 +422,7 @@ static int add_action_to_menu_entry(struct conf_menu_entry *menu_entry, enum con
+@@ -1001,6 +1005,7 @@
  	switch (id) {
  	case MENU_ACTION_NOOP:
  	case MENU_ACTION_TOGGLE_MUTE:
@@ -424,7 +447,7 @@ index f4a9604..8a02de7 100644
  	case MENU_ACTION_INCREASE_LISTENING:
  	case MENU_ACTION_DECREASE_LISTENING:
  	case MENU_ACTION_INCREASE_TALKING:
-@@ -708,6 +713,9 @@ static char *handle_cli_confbridge_show_user_profile(struct ast_cli_entry *e, in
+@@ -1291,6 +1296,9 @@
  	ast_cli(a->fd,"Start Muted:             %s\n",
  		u_profile.flags & USER_OPT_STARTMUTED?
  		"true" : "false");
@@ -434,7 +457,7 @@ index f4a9604..8a02de7 100644
  	ast_cli(a->fd,"MOH When Empty:          %s\n",
  		u_profile.flags & USER_OPT_MUSICONHOLD ?
  		"enabled" : "disabled");
-@@ -896,6 +904,8 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e,
+@@ -1494,6 +1502,8 @@
  	ast_cli(a->fd,"sound_kicked:         %s\n", conf_get_sound(CONF_SOUND_KICKED, b_profile.sounds));
  	ast_cli(a->fd,"sound_muted:          %s\n", conf_get_sound(CONF_SOUND_MUTED, b_profile.sounds));
  	ast_cli(a->fd,"sound_unmuted:        %s\n", conf_get_sound(CONF_SOUND_UNMUTED, b_profile.sounds));
@@ -443,7 +466,7 @@ index f4a9604..8a02de7 100644
  	ast_cli(a->fd,"sound_there_are:      %s\n", conf_get_sound(CONF_SOUND_THERE_ARE, b_profile.sounds));
  	ast_cli(a->fd,"sound_other_in_party: %s\n", conf_get_sound(CONF_SOUND_OTHER_IN_PARTY, b_profile.sounds));
  	ast_cli(a->fd,"sound_place_into_conference: %s\n", conf_get_sound(CONF_SOUND_PLACE_IN_CONF, b_profile.sounds));
-@@ -1021,6 +1031,9 @@ static char *handle_cli_confbridge_show_menu(struct ast_cli_entry *e, int cmd, s
+@@ -1621,6 +1631,9 @@
  			case MENU_ACTION_TOGGLE_MUTE:
  				ast_cli(a->fd, "toggle_mute");
  				break;
@@ -453,7 +476,7 @@ index f4a9604..8a02de7 100644
  			case MENU_ACTION_NOOP:
  				ast_cli(a->fd, "no_op");
  				break;
-@@ -1268,6 +1281,7 @@ int conf_load_config(int reload)
+@@ -1917,6 +1930,7 @@
  	aco_option_register(&cfg_info, "admin", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_ADMIN);
  	aco_option_register(&cfg_info, "marked", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_MARKEDUSER);
  	aco_option_register(&cfg_info, "startmuted", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_STARTMUTED);
@@ -461,11 +484,140 @@ index f4a9604..8a02de7 100644
  	aco_option_register(&cfg_info, "music_on_hold_when_empty", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_MUSICONHOLD);
  	aco_option_register(&cfg_info, "quiet", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_QUIET);
  	aco_option_register_custom(&cfg_info, "announce_user_count_all", ACO_EXACT, user_types, "no", announce_user_count_all_handler, 0);
-diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h
-index d3ead35..3d773c5 100644
---- a/apps/confbridge/include/confbridge.h
-+++ b/apps/confbridge/include/confbridge.h
-@@ -57,6 +57,7 @@ enum user_profile_flags {
+diff -ru asterisk-12.1.0.orig/apps/confbridge/confbridge_manager.c asterisk-12.1.0/apps/confbridge/confbridge_manager.c
+--- asterisk-12.1.0.orig/apps/confbridge/confbridge_manager.c	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/apps/confbridge/confbridge_manager.c	2014-03-04 12:25:54.998135400 +0000
+@@ -161,6 +161,38 @@
+ 			</see-also>
+ 		</managerEventInstance>
+ 	</managerEvent>
++	<managerEvent language="en_US" name="ConfbridgeDeafen">
++		<managerEventInstance class="EVENT_FLAG_CALL">
++			<synopsis>Raised when a Confbridge participant deafens.</synopsis>
++			<syntax>
++				<parameter name="Conference">
++					<para>The name of the Confbridge conference.</para>
++				</parameter>
++				<bridge_snapshot/>
++				<channel_snapshot/>
++			</syntax>
++			<see-also>
++				<ref type="managerEvent">ConfbridgeUndeafen</ref>
++				<ref type="application">ConfBridge</ref>
++			</see-also>
++		</managerEventInstance>
++	</managerEvent>
++	<managerEvent language="en_US" name="ConfbridgeUndeafen">
++		<managerEventInstance class="EVENT_FLAG_CALL">
++			<synopsis>Raised when a confbridge participant undeafens.</synopsis>
++			<syntax>
++				<parameter name="Conference">
++					<para>The name of the Confbridge conference.</para>
++				</parameter>
++				<bridge_snapshot/>
++				<channel_snapshot/>
++			</syntax>
++			<see-also>
++				<ref type="managerEvent">ConfbridgeMute</ref>
++				<ref type="application">ConfBridge</ref>
++			</see-also>
++		</managerEventInstance>
++	</managerEvent>
+ 	<managerEvent language="en_US" name="ConfbridgeTalking">
+ 		<managerEventInstance class="EVENT_FLAG_CALL">
+ 			<synopsis>Raised when a confbridge participant unmutes.</synopsis>
+@@ -271,6 +303,18 @@
+ 	confbridge_publish_manager_event(message, "ConfbridgeUnmute", NULL);
+ }
+ 
++static void confbridge_deafen_cb(void *data, struct stasis_subscription *sub,
++	struct stasis_message *message)
++{
++	confbridge_publish_manager_event(message, "ConfbridgeDeafen", NULL);
++}
++
++static void confbridge_undeafen_cb(void *data, struct stasis_subscription *sub,
++	struct stasis_message *message)
++{
++	confbridge_publish_manager_event(message, "ConfbridgeUndeafen", NULL);
++}
++
+ static void confbridge_talking_cb(void *data, struct stasis_subscription *sub,
+ 	struct stasis_message *message)
+ {
+@@ -297,6 +341,8 @@
+ STASIS_MESSAGE_TYPE_DEFN(confbridge_stop_record_type);
+ STASIS_MESSAGE_TYPE_DEFN(confbridge_mute_type);
+ STASIS_MESSAGE_TYPE_DEFN(confbridge_unmute_type);
++STASIS_MESSAGE_TYPE_DEFN(confbridge_deafen_type);
++STASIS_MESSAGE_TYPE_DEFN(confbridge_undeafen_type);
+ STASIS_MESSAGE_TYPE_DEFN(confbridge_talking_type);
+ 
+ void manager_confbridge_shutdown(void) {
+@@ -308,6 +354,8 @@
+ 	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_stop_record_type);
+ 	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_mute_type);
+ 	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_unmute_type);
++	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_deafen_type);
++	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_undeafen_type);
+ 	STASIS_MESSAGE_TYPE_CLEANUP(confbridge_talking_type);
+ 
+ 	if (bridge_state_router) {
+@@ -331,6 +379,8 @@
+ 	STASIS_MESSAGE_TYPE_INIT(confbridge_stop_record_type);
+ 	STASIS_MESSAGE_TYPE_INIT(confbridge_mute_type);
+ 	STASIS_MESSAGE_TYPE_INIT(confbridge_unmute_type);
++	STASIS_MESSAGE_TYPE_INIT(confbridge_deafen_type);
++	STASIS_MESSAGE_TYPE_INIT(confbridge_undeafen_type);
+ 	STASIS_MESSAGE_TYPE_INIT(confbridge_talking_type);
+ 
+ 	bridge_state_router = stasis_message_router_create(
+@@ -397,6 +447,20 @@
+ 		return -1;
+ 	}
+ 	if (stasis_message_router_add(bridge_state_router,
++			confbridge_deafen_type(),
++			confbridge_deafen_cb,
++			NULL)) {
++		manager_confbridge_shutdown();
++		return -1;
++	}
++	if (stasis_message_router_add(bridge_state_router,
++			confbridge_undeafen_type(),
++			confbridge_undeafen_cb,
++			NULL)) {
++		manager_confbridge_shutdown();
++		return -1;
++	}
++	if (stasis_message_router_add(bridge_state_router,
+ 			confbridge_talking_type(),
+ 			confbridge_talking_cb,
+ 			NULL)) {
+@@ -467,6 +531,20 @@
+ 			NULL)) {
+ 		manager_confbridge_shutdown();
+ 		return -1;
++	}
++	if (stasis_message_router_add(channel_state_router,
++			confbridge_deafen_type(),
++			confbridge_deafen_cb,
++			NULL)) {
++		manager_confbridge_shutdown();
++		return -1;
++	}
++	if (stasis_message_router_add(channel_state_router,
++			confbridge_undeafen_type(),
++			confbridge_undeafen_cb,
++			NULL)) {
++		manager_confbridge_shutdown();
++		return -1;
+ 	}
+ 	if (stasis_message_router_add(channel_state_router,
+ 			confbridge_talking_type(),
+diff -ru asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h asterisk-12.1.0/apps/confbridge/include/confbridge.h
+--- asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/apps/confbridge/include/confbridge.h	2014-03-04 12:25:54.998135400 +0000
+@@ -58,6 +58,7 @@
  	USER_OPT_DTMF_PASS    =  (1 << 13), /*!< Sets if dtmf should be passed into the conference or not */
  	USER_OPT_ANNOUNCEUSERCOUNTALL = (1 << 14), /*!< Sets if the number of users should be announced to everyone. */
  	USER_OPT_JITTERBUFFER =  (1 << 15), /*!< Places a jitterbuffer on the user. */
@@ -473,7 +625,7 @@ index d3ead35..3d773c5 100644
  };
  
  enum bridge_profile_flags {
-@@ -68,6 +69,7 @@ enum bridge_profile_flags {
+@@ -70,6 +71,7 @@
  
  enum conf_menu_action_id {
  	MENU_ACTION_TOGGLE_MUTE = 1,
@@ -481,7 +633,7 @@ index d3ead35..3d773c5 100644
  	MENU_ACTION_PLAYBACK,
  	MENU_ACTION_PLAYBACK_AND_CONTINUE,
  	MENU_ACTION_INCREASE_LISTENING,
-@@ -142,6 +144,8 @@ enum conf_sounds {
+@@ -144,6 +146,8 @@
  	CONF_SOUND_KICKED,
  	CONF_SOUND_MUTED,
  	CONF_SOUND_UNMUTED,
@@ -490,7 +642,7 @@ index d3ead35..3d773c5 100644
  	CONF_SOUND_ONLY_ONE,
  	CONF_SOUND_THERE_ARE,
  	CONF_SOUND_OTHER_IN_PARTY,
-@@ -168,6 +172,8 @@ struct bridge_profile_sounds {
+@@ -170,6 +174,8 @@
  		AST_STRING_FIELD(kicked);
  		AST_STRING_FIELD(muted);
  		AST_STRING_FIELD(unmuted);
@@ -499,99 +651,30 @@ index d3ead35..3d773c5 100644
  		AST_STRING_FIELD(onlyone);
  		AST_STRING_FIELD(thereare);
  		AST_STRING_FIELD(otherinparty);
-diff --git a/bridges/bridge_multiplexed.c b/bridges/bridge_multiplexed.c
-index cd30266..190f790 100644
---- a/bridges/bridge_multiplexed.c
-+++ b/bridges/bridge_multiplexed.c
-@@ -386,7 +386,7 @@ static enum ast_bridge_write_result multiplexed_bridge_write(struct ast_bridge *
- 	}
+@@ -344,6 +350,8 @@
+ 	struct conf_menu_entry *menu_entry,
+ 	struct conf_menu *menu);
  
- 	if (other->state == AST_BRIDGE_CHANNEL_STATE_WAIT) {
--		ast_write(other->chan, frame);
-+		ast_bridge_handle_channel_write(bridge, other, frame);
- 	}
- 
- 	return AST_BRIDGE_WRITE_SUCCESS;
-diff --git a/bridges/bridge_simple.c b/bridges/bridge_simple.c
-index 69e4114..1623ce0 100644
---- a/bridges/bridge_simple.c
-+++ b/bridges/bridge_simple.c
-@@ -81,7 +81,7 @@ static enum ast_bridge_write_result simple_bridge_write(struct ast_bridge *bridg
- 
- 	/* Write the frame out if they are in the waiting state... don't worry about freeing it, the bridging core will take care of it */
- 	if (other->state == AST_BRIDGE_CHANNEL_STATE_WAIT) {
--		ast_write(other->chan, frame);
-+		ast_bridge_handle_channel_write(bridge, other, frame);
- 	}
++struct stasis_message_type *confbridge_deafen_type(void);
++struct stasis_message_type *confbridge_undeafen_type(void);
  
- 	return AST_BRIDGE_WRITE_SUCCESS;
-diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
-index 52e5551..5754e41 100644
---- a/bridges/bridge_softmix.c
-+++ b/bridges/bridge_softmix.c
-@@ -435,7 +435,7 @@ static void softmix_pass_dtmf(struct ast_bridge *bridge, struct ast_bridge_chann
- 		if (tmp == bridge_channel) {
- 			continue;
- 		}
--		ast_write(tmp->chan, frame);
-+		ast_bridge_handle_channel_write(bridge, tmp, frame);
- 	}
- }
- 
-@@ -447,7 +447,7 @@ static void softmix_pass_video_top_priority(struct ast_bridge *bridge, struct as
- 			continue;
- 		}
- 		if (ast_bridge_is_video_src(bridge, tmp->chan) == 1) {
--			ast_write(tmp->chan, frame);
-+			ast_bridge_handle_channel_write(bridge, tmp, frame);
- 			break;
- 		}
- 	}
-@@ -463,7 +463,7 @@ static void softmix_pass_video_all(struct ast_bridge *bridge, struct ast_bridge_
- 		if ((tmp->chan == bridge_channel->chan) && !echo) {
- 			continue;
- 		}
--		ast_write(tmp->chan, frame);
-+		ast_bridge_handle_channel_write(bridge, tmp, frame);
- 	}
- }
- 
-@@ -563,7 +563,7 @@ static enum ast_bridge_write_result softmix_bridge_write(struct ast_bridge *brid
- 
- 	/* If a frame is ready to be written out, do so */
- 	if (sc->have_frame) {
--		ast_write(bridge_channel->chan, &sc->write_frame);
-+		ast_bridge_handle_channel_write(bridge, bridge_channel, &sc->write_frame);
- 		sc->have_frame = 0;
- 	}
- 
-@@ -582,7 +582,7 @@ bridge_write_cleanup:
- 	 * the conference to the channel. */
- 	ast_mutex_lock(&sc->lock);
- 	if (sc->have_frame) {
--		ast_write(bridge_channel->chan, &sc->write_frame);
-+		ast_bridge_handle_channel_write(bridge, bridge_channel, &sc->write_frame);
- 		sc->have_frame = 0;
- 	}
- 	ast_mutex_unlock(&sc->lock);
-@@ -598,7 +598,7 @@ static int softmix_bridge_poke(struct ast_bridge *bridge, struct ast_bridge_chan
- 	ast_mutex_lock(&sc->lock);
- 
- 	if (sc->have_frame) {
--		ast_write(bridge_channel->chan, &sc->write_frame);
-+		ast_bridge_handle_channel_write(bridge, bridge_channel, &sc->write_frame);
- 		sc->have_frame = 0;
- 	}
- 
-@@ -850,16 +850,24 @@ static int softmix_bridge_thread(struct ast_bridge *bridge)
+ /*! \brief Looks to see if sound file is stored in bridge profile sounds, if not
+  *  default sound is provided.*/
+diff -ru asterisk-12.1.0.orig/bridges/bridge_softmix.c asterisk-12.1.0/bridges/bridge_softmix.c
+--- asterisk-12.1.0.orig/bridges/bridge_softmix.c	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/bridges/bridge_softmix.c	2014-03-04 12:38:29.791808091 +0000
+@@ -923,16 +923,23 @@
  
  			ast_mutex_lock(&sc->lock);
  
 -			/* Make SLINEAR write frame from local buffer */
 -			if (sc->write_frame.subclass.format.id != cur_slin_id) {
 -				ast_format_set(&sc->write_frame.subclass.format, cur_slin_id, 0);
-+			if (bridge->features.deaf ||
-+			    (bridge_channel->features && bridge_channel->features->deaf)) {
+-			}
+-			sc->write_frame.datalen = softmix_datalen;
+-			sc->write_frame.samples = softmix_samples;
+-			memcpy(sc->final_buf, buf, softmix_datalen);
++			if (bridge_channel->features && bridge_channel->features->deaf) {
 +				/* For deaf channels post a null frame */
 +				sc->write_frame.frametype = AST_FRAME_NULL;
 +			} else {
@@ -603,25 +686,20 @@ index 52e5551..5754e41 100644
 +				sc->write_frame.datalen = softmix_datalen;
 +				sc->write_frame.samples = softmix_samples;
 +				memcpy(sc->final_buf, buf, softmix_datalen);
-+
+ 
+-			/* process the softmix channel's new write audio */
+-			softmix_process_write_audio(&trans_helper, ast_channel_rawwriteformat(bridge_channel->chan), sc);
 +				/* process the softmix channel's new write audio */
 +				softmix_process_write_audio(&trans_helper,
 +					ast_channel_rawwriteformat(bridge_channel->chan), sc);
- 			}
--			sc->write_frame.datalen = softmix_datalen;
--			sc->write_frame.samples = softmix_samples;
--			memcpy(sc->final_buf, buf, softmix_datalen);
--
--			/* process the softmix channel's new write audio */
--			softmix_process_write_audio(&trans_helper, ast_channel_rawwriteformat(bridge_channel->chan), sc);
++			}
+ 
+ 			ast_mutex_unlock(&sc->lock);
  
- 			/* The frame is now ready for use... */
- 			sc->have_frame = 1;
-diff --git a/configs/confbridge.conf.sample b/configs/confbridge.conf.sample
-index 7484b28..3b0ce85 100644
---- a/configs/confbridge.conf.sample
-+++ b/configs/confbridge.conf.sample
-@@ -16,6 +16,7 @@ type=user
+diff -ru asterisk-12.1.0.orig/configs/confbridge.conf.sample asterisk-12.1.0/configs/confbridge.conf.sample
+--- asterisk-12.1.0.orig/configs/confbridge.conf.sample	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/configs/confbridge.conf.sample	2014-03-04 12:25:54.998135400 +0000
+@@ -20,6 +20,7 @@
  ;admin=yes     ; Sets if the user is an admin or not. Off by default.
  ;marked=yes    ; Sets if this is a marked user or not. Off by default.
  ;startmuted=yes; Sets if all users should start out muted. Off by default
@@ -629,7 +707,7 @@ index 7484b28..3b0ce85 100644
  ;music_on_hold_when_empty=yes  ; Sets whether MOH should be played when only
                                 ; one person is in the conference or when the
                                 ; the user is waiting on a marked user to enter
-@@ -210,6 +211,8 @@ type=bridge
+@@ -217,6 +218,8 @@
  ;sound_kicked ; The sound played to a user who has been kicked from the conference.
  ;sound_muted  ; The sound played when the mute option it toggled on.
  ;sound_unmuted  ; The sound played when the mute option it toggled off.
@@ -638,87 +716,50 @@ index 7484b28..3b0ce85 100644
  ;sound_only_person ; The sound played when the user is the only person in the conference.
  ;sound_only_one ; The sound played to a user when there is only one other
                  ; person is in the conference.
-@@ -264,6 +267,8 @@ type=bridge
+@@ -275,6 +278,8 @@
+                                        ; using the '&' character as a delimiter.
  ; toggle_mute      ; Toggle turning on and off mute.  Mute will make the user silent
                     ; to everyone else, but the user will still be able to listen in.
-                    ; continue to collect the dtmf sequence.
 +; toggle_deaf      ; Toggle turning on and off deaf.  Deaf will make the user to hear
 +                   ; only silence, but the user will still be able to talk.
+ 
  ; no_op ; This action does nothing (No Operation). Its only real purpose exists for
          ; being able to reserve a sequence in the config as a menu exit sequence.
- ; decrease_listening_volume ; Decreases the channel's listening volume.
-diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridging_features.h
-index e377ca6..5ce3d56 100644
---- a/include/asterisk/bridging_features.h
-+++ b/include/asterisk/bridging_features.h
-@@ -127,6 +127,8 @@ struct ast_bridge_features {
+diff -ru asterisk-12.1.0.orig/include/asterisk/bridge_features.h asterisk-12.1.0/include/asterisk/bridge_features.h
+--- asterisk-12.1.0.orig/include/asterisk/bridge_features.h	2014-03-04 12:28:27.970906507 +0000
++++ asterisk-12.1.0/include/asterisk/bridge_features.h	2014-03-04 12:25:54.998135400 +0000
+@@ -253,6 +253,8 @@
  	unsigned int usable:1;
- 	/*! Bit to indicate whether the channel/bridge is muted or not */
+ 	/*! TRUE if the channel/bridge is muted. */
  	unsigned int mute:1;
-+	/*! Bit to indicate whether the channel/bridge is deaf or not */
++	/*! TRUE if the channel/bridge is deaf. */
 +	unsigned int deaf:1;
- 	/*! Bit to indicate whether DTMF should be passed into the bridge tech or not.  */
+ 	/*! TRUE if DTMF should be passed into the bridge tech.  */
  	unsigned int dtmf_passthrough:1;
+ };
+diff -ru asterisk-12.1.0.orig/main/bridge_channel.c asterisk-12.1.0/main/bridge_channel.c
+--- asterisk-12.1.0.orig/main/bridge_channel.c	2014-03-04 12:28:27.974239900 +0000
++++ asterisk-12.1.0/main/bridge_channel.c	2014-03-04 12:40:23.980543471 +0000
+@@ -549,7 +549,21 @@
+ 		return 0;
+ 	}
  
-diff --git a/include/asterisk/bridging_technology.h b/include/asterisk/bridging_technology.h
-index 3d2e870..1ecb4c1 100644
---- a/include/asterisk/bridging_technology.h
-+++ b/include/asterisk/bridging_technology.h
-@@ -143,6 +143,21 @@ int ast_bridge_technology_unregister(struct ast_bridge_technology *technology);
-  */
- void ast_bridge_handle_trip(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_channel *chan, int outfd);
- 
-+/*! \brief Used by bridging technologies to hand off a frame to be written to a bridge_channel.
-+ *
-+ * \param bridge The bridge that the channel is part of.
-+ * \param bridge_channel The bridge channel to which the frame is written to.
-+ * \param frame The frame to write.
-+ *
-+ * \retval 0 on success
-+ * \retval -1 on failure
-+ *
-+ * \note This function is essentially a wrapper for ast_write(). The bridging core has some features associated with it
-+ * that requires it to have control over how frames are written into a channel.  For these features to be available, the bridging
-+ * technology must use this wrapper function over ast_write when pushing a frame out a channel.
-+ */
-+int ast_bridge_handle_channel_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame);
-+
- /*! \brief Lets the bridging indicate when a bridge channel has stopped or started talking.
-  *
-  * \note All DSP functionality on the bridge has been pushed down to the lowest possible
-diff --git a/main/bridging.c b/main/bridging.c
-index 465d033..4f67e90 100644
---- a/main/bridging.c
-+++ b/main/bridging.c
-@@ -337,6 +337,28 @@ void ast_bridge_handle_trip(struct ast_bridge *bridge, struct ast_bridge_channel
- 	return;
- }
- 
-+int ast_bridge_handle_channel_write(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel, struct ast_frame *frame)
-+{
-+	if (frame->frametype == AST_FRAME_VOICE &&
-+	    (bridge->features.deaf ||
-+	     (bridge_channel->features && bridge_channel->features->deaf))) {
-+		short buf[frame->samples];
+-	dup = ast_frdup(fr);
++	if (fr->frametype == AST_FRAME_VOICE &&
++	    (bridge_channel->features && bridge_channel->features->deaf)) {
++		short buf[fr->samples];
 +		struct ast_frame sframe = {
 +			.frametype = AST_FRAME_VOICE,
 +			.data.ptr = buf,
-+			.samples = frame->samples,
++			.samples = fr->samples,
 +			.datalen = sizeof(buf),
 +		};
 +		ast_format_set(&sframe.subclass.format, AST_FORMAT_SLINEAR, 0);
 +		memset(buf, 0, sizeof(buf));
-+
-+		return ast_write(bridge_channel->chan, &sframe);
++		dup = ast_frdup(&sframe);
++	} else {
++		dup = ast_frdup(fr);
 +	}
-+
-+	return ast_write(bridge_channel->chan, frame);
-+}
-+
-+
- /*! \brief Generic thread loop, TODO: Rethink this/improve it */
- static int generic_thread_loop(struct ast_bridge *bridge)
- {
--- 
-1.7.12
-
+ 	if (!dup) {
+ 		return -1;
+ 	}
diff --git a/main/asterisk/ASTERISK-19499.patch b/main/asterisk/ASTERISK-19499.patch
new file mode 100644
index 000000000..9346b8800
--- /dev/null
+++ b/main/asterisk/ASTERISK-19499.patch
@@ -0,0 +1,77 @@
+From d025bba965381549a5411cf008b0a519a8a1937f Mon Sep 17 00:00:00 2001
+From: kharwell <kharwell@f38db490-d61c-443f-a65b-d21fe96a405b>
+Date: Fri, 21 Feb 2014 15:44:55 +0000
+Subject: [PATCH] channel.c: MOH is not working for transferee after attended
+ transfer
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Updated the code to check to see if MOH is playing on the transferor and if
+so then start it on the channel that replaces it during a masquerade.
+
+Example scenario of the problem:
+Alice calls Bob and then Bob begins the attended transfer process into a queue.
+Upon going on hold Alice hears music and so does Bob once he is in the queue.
+Bob then transfers Alice into the queue and then music for Alice stops even
+though she should be hearing it since has now replaced Bob in the queue.
+
+The problem that was occurring is that once the channel was masqueraded the app
+(queues, confbridge, etc...) had no way of knowing that the channel had just
+been swapped out thus it did not start music for the present channel.
+
+Credit to Olle Johansson for pointing me in the right direction on this issue.
+
+(closes issue ASTERISK-19499)
+Reported by: Timo Teräs
+Review: https://reviewboard.asterisk.org/r/3226/
+........
+
+Merged revisions 408642 from http://svn.asterisk.org/svn/asterisk/branches/1.8
+........
+
+Merged revisions 408643 from http://svn.asterisk.org/svn/asterisk/branches/11
+
+
+git-svn-id: http://svn.digium.com/svn/asterisk/branches/12@408644 f38db490-d61c-443f-a65b-d21fe96a405b
+---
+ main/channel.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/main/channel.c b/main/channel.c
+index a9f0fbb..da4f794 100644
+--- a/main/channel.c
++++ b/main/channel.c
+@@ -6406,6 +6406,7 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
+ 	unsigned int clone_disablestatecache;
+ 	int visible_indication;
+ 	int clone_hold_state;
++	int moh_is_playing;
+ 	struct ast_frame *current;
+ 	const struct ast_channel_tech *t;
+ 	void *t_pvt;
+@@ -6452,6 +6453,8 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
+ 	ao2_unlink(channels, original);
+ 	ao2_unlink(channels, clonechan);
+ 
++	moh_is_playing = ast_test_flag(ast_channel_flags(original), AST_FLAG_MOH);
++
+ 	/*
+ 	 * Stop any visible indication on the original channel so we can
+ 	 * transfer it to the clonechan taking the original's place.
+@@ -6753,6 +6756,12 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
+ 		}
+ 	}
+ 
++	/* if moh is playing on the original channel then it needs to be
++	   maintained on the channel that is replacing it. */
++	if (moh_is_playing) {
++		ast_moh_start(original, NULL, NULL);
++	}
++
+ 	ast_channel_lock(original);
+ 
+ 	/* Signal any blocker */
+-- 
+1.9.0
+
diff --git a/main/asterisk/musl-cdefs.patch b/main/asterisk/musl-cdefs.patch
deleted file mode 100644
index 94f07ae8e..000000000
--- a/main/asterisk/musl-cdefs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- asterisk-11.7.0.orig/main/ast_expr2.c
-+++ asterisk-11.7.0/main/ast_expr2.c
-@@ -93,6 +93,7 @@
- 
- #include "asterisk.h"
- 
-+#include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdio.h>
- 
---- asterisk-11.7.0.orig/main/ast_expr2.y
-+++ asterisk-11.7.0/main/ast_expr2.y
-@@ -14,6 +14,7 @@
- 
- #include "asterisk.h"
- 
-+#include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdio.h>
- 
diff --git a/main/asterisk/musl-includes.patch b/main/asterisk/musl-includes.patch
new file mode 100644
index 000000000..810602607
--- /dev/null
+++ b/main/asterisk/musl-includes.patch
@@ -0,0 +1,42 @@
+--- asterisk-11.7.0.orig/main/ast_expr2.c
++++ asterisk-11.7.0/main/ast_expr2.c
+@@ -93,6 +93,7 @@
+ 
+ #include "asterisk.h"
+ 
++#include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+ 
+--- asterisk-11.7.0.orig/main/ast_expr2.y
++++ asterisk-11.7.0/main/ast_expr2.y
+@@ -14,6 +14,7 @@
+ 
+ #include "asterisk.h"
+ 
++#include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdio.h>
+ 
+--- asterisk-12.1.0.orig/include/asterisk/compat.h
++++ asterisk-12.1.0/include/asterisk/compat.h
+@@ -68,7 +68,7 @@
+ #endif
+ 
+ #ifndef AST_POLL_COMPAT
+-#include <sys/poll.h>
++#include <poll.h>
+ #else
+ #include "asterisk/poll-compat.h"
+ #endif
+--- asterisk-12.1.0.orig/include/asterisk/poll-compat.h
++++ asterisk-12.1.0/include/asterisk/poll-compat.h
+@@ -83,7 +83,7 @@
+ 
+ #ifndef AST_POLL_COMPAT
+ 
+-#include <sys/poll.h>
++#include <poll.h>
+ 
+ #define ast_poll(a, b, c) poll(a, b, c)
+ 
diff --git a/main/asterisk/musl-outofmem-handling.patch b/main/asterisk/musl-outofmem-handling.patch
new file mode 100644
index 000000000..24b1a9ec7
--- /dev/null
+++ b/main/asterisk/musl-outofmem-handling.patch
@@ -0,0 +1,52 @@
+--- asterisk-12.1.0.orig/include/asterisk/utils.h
++++ asterisk-12.1.0/include/asterisk/utils.h
+@@ -25,7 +25,6 @@
+ 
+ #include "asterisk/network.h"
+ 
+-#include <execinfo.h>
+ #include <time.h>	/* we want to override localtime_r */
+ #include <unistd.h>
+ #include <string.h>
+@@ -480,25 +479,13 @@
+ #define ast_free free
+ #define ast_free_ptr ast_free
+ 
+-/*
+- * This buffer is in static memory. We never intend to read it,
+- * nor do we care about multiple threads writing to it at the
+- * same time. We only want to know if we're recursing too deep
+- * already. 60 entries should be more than enough.  Function
+- * call depth rarely exceeds 20 or so.
+- */
+-#define _AST_MEM_BACKTRACE_BUFLEN 60
+-extern void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
+-
+-/*
+- * Ok, this sucks. But if we're already out of mem, we don't
+- * want the logger to create infinite recursion (and a crash).
+- */
+ #define MALLOC_FAILURE_MSG \
+ 	do { \
+-		if (backtrace(_ast_mem_backtrace_buffer, _AST_MEM_BACKTRACE_BUFLEN) < _AST_MEM_BACKTRACE_BUFLEN) { \
+-			ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
+-		} \
++		extern int __thread _ast_out_of_memory; \
++		if (_ast_out_of_memory) break; \
++		_ast_out_of_memory = 1; \
++		ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
++		_ast_out_of_memory = 0; \
+ 	} while (0)
+ 
+ /*!
+--- asterisk-12.1.0.orig/main/hashtab.c
++++ asterisk-12.1.0/main/hashtab.c
+@@ -44,7 +44,7 @@
+ 
+ 
+ #ifndef __AST_DEBUG_MALLOC
+-void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
++int __thread _ast_out_of_memory;
+ #endif
+ 
+ #if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
diff --git a/main/asterisk/musl-pjsip-mutex.patch b/main/asterisk/musl-pjsip-mutex.patch
deleted file mode 100644
index b73d93f7e..000000000
--- a/main/asterisk/musl-pjsip-mutex.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- asterisk-11.7.0.orig/res/pjproject/pjlib/src/pj/os_core_unix.c
-+++ asterisk-11.7.0/res/pjproject/pjlib/src/pj/os_core_unix.c
-@@ -1091,8 +1091,7 @@
- 	return PJ_RETURN_OS_ERROR(rc);
- 
-     if (type == PJ_MUTEX_SIMPLE) {
--#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
--    defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-+#if defined(PJ_LINUX) && PJ_LINUX!=0 && defined(__GLIBC__)
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_FAST_NP);
- #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
-        defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)
-@@ -1101,8 +1100,7 @@
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
- #endif
-     } else {
--#if (defined(PJ_LINUX) && PJ_LINUX!=0) || \
--     defined(PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE)
-+#if (defined(PJ_LINUX) && PJ_LINUX!=0) && defined(__GLIBC__)
- 	rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
- #elif (defined(PJ_RTEMS) && PJ_RTEMS!=0) || \
-        defined(PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE)