diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-08-08 19:16:33 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-08-08 19:16:33 +0000 |
| commit | 3f724fa493f327329b10d2ab768e6dd683fa846a (patch) | |
| tree | 5c7972a4a71be7586fb51209f8a605e80861097b /main/stasis_bridges.c | |
| parent | 16fd65bb73b3cac8df5fc3fe9836b34bfd1fd541 (diff) | |
Make bridge snapshots use prefixes.
* Changed ast_manager_build_bridge_state_string() to assume an empty
prefix string just like ast_manager_build_channel_state_string().
* Created ast_manager_build_bridge_state_string_prefix() to work just like
ast_manager_build_channel_state_string_prefix().
* Made BridgeMerge AMI event use To/From prefixes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396417 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/stasis_bridges.c')
| -rw-r--r-- | main/stasis_bridges.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c index 865134a83..29cc783b9 100644 --- a/main/stasis_bridges.c +++ b/main/stasis_bridges.c @@ -537,8 +537,7 @@ static struct ast_manager_event_blob *blind_transfer_to_ami(struct stasis_messag } channel_state = ast_manager_build_channel_state_string_prefix(blob->channel, "Transferer"); - bridge_state = ast_manager_build_bridge_state_string(blob->bridge, ""); - + bridge_state = ast_manager_build_bridge_state_string(blob->bridge); if (!channel_state || !bridge_state) { return NULL; } @@ -605,20 +604,21 @@ static struct ast_manager_event_blob *attended_transfer_to_ami(struct stasis_mes transferer1_state = ast_manager_build_channel_state_string_prefix(transfer_msg->to_transferee.channel_snapshot, "OrigTransferer"); transferer2_state = ast_manager_build_channel_state_string_prefix(transfer_msg->to_transfer_target.channel_snapshot, "SecondTransferer"); - if (!transferer1_state || !transferer2_state) { return NULL; } if (transfer_msg->to_transferee.bridge_snapshot) { - bridge1_state = ast_manager_build_bridge_state_string(transfer_msg->to_transferee.bridge_snapshot, "Orig"); + bridge1_state = ast_manager_build_bridge_state_string_prefix( + transfer_msg->to_transferee.bridge_snapshot, "Orig"); if (!bridge1_state) { return NULL; } } if (transfer_msg->to_transfer_target.bridge_snapshot) { - bridge2_state = ast_manager_build_bridge_state_string(transfer_msg->to_transfer_target.bridge_snapshot, "Second"); + bridge2_state = ast_manager_build_bridge_state_string_prefix( + transfer_msg->to_transfer_target.bridge_snapshot, "Second"); if (!bridge2_state) { return NULL; } |