kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change chan_unistim to use core transfer API.

Browse Source 
Review: https://reviewboard.asterisk.org/r/2553

(closes issue ASTERISK-21527)
Reported by Matt Jordan



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392436 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-06-21 18:05:56 +00:00
parent cd6e2538f2
commit e3a89a0a18
1 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
channels/chan_unistim.c
View File

@@ -77,6 +77,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/astobj2.h" #include "asterisk/astobj2.h"
#include "asterisk/astdb.h" #include "asterisk/astdb.h"
#include "asterisk/features_config.h" #include "asterisk/features_config.h"
#include "asterisk/bridging.h"
#define DEFAULTCONTEXT "default" #define DEFAULTCONTEXT "default"
@@ -2305,72 +2306,36 @@ static int write_history(struct unistimsession *pte, char way, char ismissed)
return 0; return 0;
} }
static void unistim_quiet_chan(struct ast_channel *chan)
{
if (chan && ast_channel_state(chan) == AST_STATE_UP) {
if (ast_test_flag(ast_channel_flags(chan), AST_FLAG_MOH)) {
ast_moh_stop(chan);
} else if (ast_channel_generatordata(chan)) {
ast_deactivate_generator(chan);
}
}
}
static int attempt_transfer(struct unistim_subchannel *p1, struct unistim_subchannel *p2) static int attempt_transfer(struct unistim_subchannel *p1, struct unistim_subchannel *p2)
{ {
int res = 0; RAII_VAR(struct ast_channel *, chana, NULL, ast_channel_unref);
struct ast_channel RAII_VAR(struct ast_channel *, chanb, NULL, ast_channel_unref);
*chana = NULL, *chanb = NULL, *bridgea = NULL, *bridgeb = NULL, *peera =
NULL, *peerb = NULL, *peerc = NULL, *peerd = NULL;
if (!p1->owner || !p2->owner) { if (!p1->owner || !p2->owner) {
ast_log(LOG_WARNING, "Transfer attempted without dual ownership?\n"); ast_log(LOG_WARNING, "Transfer attempted without dual ownership?\n");
return -1; return -1;
} }
chana = p1->owner; chana = ast_channel_ref(p1->owner);
chanb = p2->owner; chanb = ast_channel_ref(p2->owner);
bridgea = ast_bridged_channel(chana);
bridgeb = ast_bridged_channel(chanb);
if (bridgea) { switch (ast_bridge_transfer_attended(chana, chanb)) {
peera = chana; case AST_BRIDGE_TRANSFER_INVALID:
peerb = chanb; ast_log(LOG_WARNING, "Transfer failed. Invalid bridge setup\n");
peerc = bridgea; break;
peerd = bridgeb; case AST_BRIDGE_TRANSFER_NOT_PERMITTED:
} else if (bridgeb) { ast_log(LOG_WARNING, "Transfer not permitted\n");
peera = chanb; break;
peerb = chana; case AST_BRIDGE_TRANSFER_FAIL:
peerc = bridgeb; ast_log(LOG_WARNING, "Transfer encountered internal error\n");
peerd = bridgea; break;
} case AST_BRIDGE_TRANSFER_SUCCESS:
if (peera && peerb && peerc && (peerb != peerc)) {
unistim_quiet_chan(peera);
unistim_quiet_chan(peerb);
unistim_quiet_chan(peerc);
if (peerd) {
unistim_quiet_chan(peerd);
}
ast_log(LOG_NOTICE, "UNISTIM transfer: trying to masquerade %s into %s\n", ast_channel_name(peerc), ast_channel_name(peerb));
if (ast_channel_masquerade(peerb, peerc)) {
ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", ast_channel_name(peerb),
ast_channel_name(peerc));
res = -1;
}
return res;
} else {
ast_log(LOG_NOTICE,
"Transfer attempted with no appropriate bridged calls to transfer\n");
if (chana) {
ast_softhangup_nolock(chana, AST_SOFTHANGUP_DEV);
}
if (chanb) {
ast_softhangup_nolock(chanb, AST_SOFTHANGUP_DEV);
}
return -1;
}
return 0; return 0;
}
/* Control only reaches this point if transfer has failed */
ast_softhangup_nolock(chana, AST_SOFTHANGUP_DEV);
ast_softhangup_nolock(chanb, AST_SOFTHANGUP_DEV);
return -1;
} }
void change_callerid(struct unistimsession *pte, int type, char *callerid) void change_callerid(struct unistimsession *pte, int type, char *callerid)