ast_channel_internal_bridged_channel_set(p->chan, NULL);
/* If they're dead, go ahead and hang up on the agent now */
if (p->dead) {
- ast_channel_lock(p->chan);
ast_softhangup(p->chan, AST_SOFTHANGUP_EXPLICIT);
- ast_channel_unlock(p->chan);
} else if (p->loginstart) {
indicate_chan = ast_channel_ref(p->chan);
tmp_moh = ast_strdupa(p->moh);
ast_mutex_unlock(&p->lock);
if (indicate_chan) {
- ast_channel_lock(indicate_chan);
ast_indicate_data(indicate_chan, AST_CONTROL_HOLD,
S_OR(tmp_moh, NULL),
!ast_strlen_zero(tmp_moh) ? strlen(tmp_moh) + 1 : 0);
- ast_channel_unlock(indicate_chan);
indicate_chan = ast_channel_unref(indicate_chan);
}
ast_party_connected_line_free(&connected);
break;
}
+ ast_channel_unlock(chan);
if (ast_channel_connected_line_sub(NULL, chan, &connected, 0) &&
ast_channel_connected_line_macro(NULL, chan, &connected, 1, 0)) {
ast_indicate_data(chan, AST_CONTROL_CONNECTED_LINE,
read_action_payload->payload_size);
}
ast_party_connected_line_free(&connected);
+ ast_channel_lock(chan);
break;
}
ast_frfree(f);
}
ast_channel_unlock(macro_chan);
- if (!(retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args))) {
+ retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
+ if (!retval) {
+ struct ast_party_connected_line saved_connected;
+
+ ast_party_connected_line_init(&saved_connected);
ast_channel_lock(macro_chan);
- ast_channel_update_connected_line(macro_chan, ast_channel_connected(macro_chan), NULL);
+ ast_party_connected_line_copy(&saved_connected, ast_channel_connected(macro_chan));
ast_channel_unlock(macro_chan);
+ ast_channel_update_connected_line(macro_chan, &saved_connected, NULL);
+ ast_party_connected_line_free(&saved_connected);
}
return retval;
retval = ast_app_run_macro(autoservice_chan, macro_chan, macro, macro_args);
if (!retval) {
+ struct ast_party_redirecting saved_redirecting;
+
+ ast_party_redirecting_init(&saved_redirecting);
ast_channel_lock(macro_chan);
- ast_channel_update_redirecting(macro_chan, ast_channel_redirecting(macro_chan), NULL);
+ ast_party_redirecting_copy(&saved_redirecting, ast_channel_redirecting(macro_chan));
ast_channel_unlock(macro_chan);
+ ast_channel_update_redirecting(macro_chan, &saved_redirecting, NULL);
+ ast_party_redirecting_free(&saved_redirecting);
}
return retval;
}
ast_channel_unlock(sub_chan);
- if (!(retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args))) {
+ retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args);
+ if (!retval) {
+ struct ast_party_connected_line saved_connected;
+
+ ast_party_connected_line_init(&saved_connected);
ast_channel_lock(sub_chan);
- ast_channel_update_connected_line(sub_chan, ast_channel_connected(sub_chan), NULL);
+ ast_party_connected_line_copy(&saved_connected, ast_channel_connected(sub_chan));
ast_channel_unlock(sub_chan);
+ ast_channel_update_connected_line(sub_chan, &saved_connected, NULL);
+ ast_party_connected_line_free(&saved_connected);
}
return retval;
retval = ast_app_run_sub(autoservice_chan, sub_chan, sub, sub_args);
if (!retval) {
+ struct ast_party_redirecting saved_redirecting;
+
+ ast_party_redirecting_init(&saved_redirecting);
ast_channel_lock(sub_chan);
- ast_channel_update_redirecting(sub_chan, ast_channel_redirecting(sub_chan), NULL);
+ ast_party_redirecting_copy(&saved_redirecting, ast_channel_redirecting(sub_chan));
ast_channel_unlock(sub_chan);
+ ast_channel_update_redirecting(sub_chan, &saved_redirecting, NULL);
+ ast_party_redirecting_free(&saved_redirecting);
}
return retval;