diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/ari/resource_bridges.h | 4 | ||||
| -rw-r--r-- | res/res_stasis.c | 28 |
2 files changed, 21 insertions, 11 deletions
diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h index 1b8782310..5dca82781 100644 --- a/res/ari/resource_bridges.h +++ b/res/ari/resource_bridges.h @@ -52,7 +52,7 @@ struct ast_ari_bridges_list_args { void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response); /*! \brief Argument struct for ast_ari_bridges_create() */ struct ast_ari_bridges_create_args { - /*! \brief Type of bridge to create. */ + /*! \brief Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media). */ const char *type; /*! \brief Unique ID to give to the bridge being created. */ const char *bridge_id; @@ -82,7 +82,7 @@ int ast_ari_bridges_create_parse_body( void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response); /*! \brief Argument struct for ast_ari_bridges_create_or_update_with_id() */ struct ast_ari_bridges_create_or_update_with_id_args { - /*! \brief Set the type of bridge. */ + /*! \brief Comma separated list of bridge type attributes (mixing, holding, dtmf_events, proxy_media) to set. */ const char *type; /*! \brief Unique ID to give to the bridge being created. */ const char *bridge_id; diff --git a/res/res_stasis.c b/res/res_stasis.c index e7a8d983a..cfb1a7af1 100644 --- a/res/res_stasis.c +++ b/res/res_stasis.c @@ -588,19 +588,29 @@ static void control_unlink(struct stasis_app_control *control) struct ast_bridge *stasis_app_bridge_create(const char *type, const char *name, const char *id) { struct ast_bridge *bridge; - int capabilities; + char *requested_type, *requested_types = ast_strdupa(type); + int capabilities = 0; int flags = AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM | AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_SWAP_INHIBIT_FROM | AST_BRIDGE_FLAG_SWAP_INHIBIT_TO | AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY; - if (ast_strlen_zero(type) || !strcmp(type, "mixing")) { - capabilities = AST_BRIDGE_CAPABILITY_1TO1MIX | - AST_BRIDGE_CAPABILITY_MULTIMIX | - AST_BRIDGE_CAPABILITY_NATIVE; - flags |= AST_BRIDGE_FLAG_SMART; - } else if (!strcmp(type, "holding")) { - capabilities = AST_BRIDGE_CAPABILITY_HOLDING; - } else { + while ((requested_type = strsep(&requested_types, ","))) { + requested_type = ast_strip(requested_type); + + if (!strcmp(requested_type, "mixing")) { + capabilities |= AST_BRIDGE_CAPABILITY_1TO1MIX | + AST_BRIDGE_CAPABILITY_MULTIMIX | + AST_BRIDGE_CAPABILITY_NATIVE; + flags |= AST_BRIDGE_FLAG_SMART; + } else if (!strcmp(requested_type, "holding")) { + capabilities |= AST_BRIDGE_CAPABILITY_HOLDING; + } else if (!strcmp(requested_type, "dtmf_events") || + !strcmp(requested_type, "proxy_media")) { + capabilities &= ~AST_BRIDGE_CAPABILITY_NATIVE; + } + } + + if (!capabilities) { return NULL; } |