[svn-commits] mmichelson: branch mmichelson/atxfer_features r394102 - /team/mmichelson/atxf...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Jul 11 11:21:12 2013
New Revision: 394102

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394102
Log:
Ensure transfers are only executed on basic bridges.


Modified:
    team/mmichelson/atxfer_features/main/bridging_basic.c

Modified: team/mmichelson/atxfer_features/main/bridging_basic.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/atxfer_features/main/bridging_basic.c?view=diff&rev=394102&r1=394101&r2=394102
==============================================================================
--- team/mmichelson/atxfer_features/main/bridging_basic.c (original)
+++ team/mmichelson/atxfer_features/main/bridging_basic.c Thu Jul 11 11:21:12 2013
@@ -2470,6 +2470,11 @@
 	char exten[AST_MAX_EXTENSION] = "";
 	pthread_t thread;
 
+	if (strcmp(bridge->v_table->name, "basic")) {
+		ast_log(LOG_ERROR, "Attended transfer attempted on unsupported bridge type '%s'\n", bridge->v_table->name);
+		return 0;
+	}
+
 	if (bridge->inhibit_merge) {
 		ast_log(LOG_ERROR, "Unable to perform attended transfer since bridge '%s' does not permit merging.\n", bridge->uniqueid);
 		return 0;
@@ -2602,6 +2607,11 @@
 	const char *context;
 	char *goto_on_blindxfr;
 
+	if (strcmp(bridge->v_table->name, "basic")) {
+		ast_log(LOG_ERROR, "Blind transfer attempted on unsupported bridge type '%s'\n", bridge->v_table->name);
+		return 0;
+	}
+
 	ast_bridge_channel_write_hold(bridge_channel, NULL);
 
 	ast_channel_lock(bridge_channel->chan);