kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-18 07:48:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

introduce a function to set context, extension and priority

Browse Source 
replacing some common blocks of code (there are still a few
instances where it can be used)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-04-16 18:49:46 +00:00
parent 81ed862e67
commit d29f8a677e
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_features.c
View File

@@ -159,6 +159,14 @@ struct ast_bridge_thread_obj
struct ast_channel *peer;
};
/* store context, priority and extension */
static void set_c_e_p(struct ast_channel *chan, const char *ctx, const char *ext, int pri)
{
ast_copy_string(chan->context, ctx, sizeof(chan->context));
ast_copy_string(chan->exten, ext, sizeof(chan->exten));
chan->priority = pri;
}
static void check_goto_on_transfer(struct ast_channel *chan)
{
struct ast_channel *xferchan;
@@ -212,7 +220,7 @@ static void *ast_bridge_call_thread(void *data)
ast_bridge_call(tobj->peer, tobj->chan, &tobj->bconfig);
ast_hangup(tobj->chan);
ast_hangup(tobj->peer);
tobj->chan = tobj->peer = NULL;
bzero(tobj, sizeof(*tobj)); /* XXX for safety */
free(tobj);
return NULL;
}
@@ -372,9 +380,7 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int
ast_channel_masquerade(chan, rchan);
/* Setup the extensions and such */
ast_copy_string(chan->context, rchan->context, sizeof(chan->context));
ast_copy_string(chan->exten, rchan->exten, sizeof(chan->exten));
chan->priority = rchan->priority;
set_c_e_p(chan, rchan->context, rchan->exten, rchan->priority);
/* Make the masq execute */
f = ast_read(chan);
@@ -589,9 +595,7 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p
res = -1;
} else {
/* Set the channel's new extension, since it exists, using transferer context */
ast_copy_string(transferee->exten, newext, sizeof(transferee->exten));
ast_copy_string(transferee->context, transferer_real_context, sizeof(transferee->context));
transferee->priority = 0;
set_c_e_p(transferee, transferer_real_context, newext, 0);
}
check_goto_on_transfer(transferer);
return res;