mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-29 18:19:30 +00:00
Revert formatting changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -214,13 +214,11 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast_bridge_config *config)
|
||||
{
|
||||
/* Copy voice back and forth between the two channels. Give the peer
|
||||
the ability to transfer calls with '#<extension' syntax. */
|
||||
|
||||
int len;
|
||||
int len;
|
||||
struct ast_frame *f;
|
||||
struct ast_channel *who;
|
||||
char newext[256], *ptr;
|
||||
@@ -228,8 +226,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
|
||||
struct ast_option_header *aoh;
|
||||
struct ast_channel *transferer;
|
||||
struct ast_channel *transferee;
|
||||
char *transferer_real_context;
|
||||
int allowdisconnect,allowredirect_in,allowredirect_out;
|
||||
char *transferer_real_context;
|
||||
int allowdisconnect,allowredirect_in,allowredirect_out;
|
||||
|
||||
allowdisconnect = config->allowdisconnect;
|
||||
allowredirect_in = config->allowredirect_in;
|
||||
@@ -586,14 +584,14 @@ static int park_exec(struct ast_channel *chan, void *data)
|
||||
ast_verbose(VERBOSE_PREFIX_3 "Channel %s connected to parked call %d\n", chan->name, park);
|
||||
|
||||
memset(&config,0,sizeof(struct ast_bridge_config));
|
||||
config.allowredirect_in = 1;
|
||||
config.allowredirect_out = 1;
|
||||
config.allowdisconnect = 0;
|
||||
config.timelimit = 0;
|
||||
config.play_warning = 0;
|
||||
config.warning_freq = 0;
|
||||
config.warning_sound=NULL;
|
||||
res = ast_bridge_call(chan,peer,&config);
|
||||
config.allowredirect_in = 1;
|
||||
config.allowredirect_out = 1;
|
||||
config.allowdisconnect = 0;
|
||||
config.timelimit = 0;
|
||||
config.play_warning = 0;
|
||||
config.warning_freq = 0;
|
||||
config.warning_sound=NULL;
|
||||
res = ast_bridge_call(chan,peer,&config);
|
||||
|
||||
/* Simulate the PBX hanging up */
|
||||
if (res != AST_PBX_NO_HANGUP_PEER)
|
||||
|
Reference in New Issue
Block a user