diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_dial.c | 6 | ||||
-rw-r--r-- | apps/app_followme.c | 2 | ||||
-rw-r--r-- | apps/app_queue.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index df9b72aaf..b48a226c7 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -956,7 +956,7 @@ static void do_forward(struct chanlist *o, struct cause_args *num, ast_connected_line_copy_from_caller(ast_channel_connected(c), ast_channel_caller(in)); } - ast_channel_accountcode_set(c, ast_channel_accountcode(in)); + ast_channel_req_accountcodes(c, in, AST_CHANNEL_REQUESTOR_BRIDGE_PEER); ast_channel_appl_set(c, "AppDial"); ast_channel_data_set(c, "(Outgoing Line)"); @@ -2524,9 +2524,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast ast_channel_dialed(tc)->transit_network_select = ast_channel_dialed(chan)->transit_network_select; - if (!ast_strlen_zero(ast_channel_accountcode(chan))) { - ast_channel_accountcode_set(tc, ast_channel_accountcode(chan)); - } + ast_channel_req_accountcodes(tc, chan, AST_CHANNEL_REQUESTOR_BRIDGE_PEER); if (ast_strlen_zero(ast_channel_musicclass(tc))) { ast_channel_musicclass_set(tc, ast_channel_musicclass(chan)); } diff --git a/apps/app_followme.c b/apps/app_followme.c index 1fb22b185..1355361e2 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -1070,7 +1070,7 @@ static struct ast_channel *findmeexec(struct fm_args *tpargs, struct ast_channel ast_channel_inherit_variables(caller, outbound); ast_channel_datastore_inherit(caller, outbound); ast_channel_language_set(outbound, ast_channel_language(caller)); - ast_channel_accountcode_set(outbound, ast_channel_accountcode(caller)); + ast_channel_req_accountcodes(outbound, caller, AST_CHANNEL_REQUESTOR_BRIDGE_PEER); ast_channel_musicclass_set(outbound, ast_channel_musicclass(caller)); ast_channel_unlock(outbound); ast_channel_unlock(caller); diff --git a/apps/app_queue.c b/apps/app_queue.c index fe6b00ab0..0b53ea619 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4125,6 +4125,8 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies ast_channel_lock_both(tmp->chan, qe->chan); + ast_channel_req_accountcodes_precious(tmp->chan, qe->chan, + AST_CHANNEL_REQUESTOR_BRIDGE_PEER); if (qe->cancel_answered_elsewhere) { ast_channel_hangupcause_set(tmp->chan, AST_CAUSE_ANSWERED_ELSEWHERE); } @@ -4663,7 +4665,7 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte ast_party_connected_line_copy(&o->connected, ast_channel_connected(in)); } - ast_channel_accountcode_set(o->chan, ast_channel_accountcode(in)); + ast_channel_req_accountcodes(o->chan, in, AST_CHANNEL_REQUESTOR_BRIDGE_PEER); if (!ast_channel_redirecting(o->chan)->from.number.valid || ast_strlen_zero(ast_channel_redirecting(o->chan)->from.number.str)) { |