aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/features.c117
1 files changed, 78 insertions, 39 deletions
diff --git a/main/features.c b/main/features.c
index 8d33a9ac0..dd8aed30b 100644
--- a/main/features.c
+++ b/main/features.c
@@ -820,9 +820,6 @@ static int masq_park_call_announce(struct ast_channel *rchan, struct ast_channel
return masq_park_call(rchan, peer, timeout, extout, 1, NULL);
}
-#define FEATURE_SENSE_CHAN (1 << 0)
-#define FEATURE_SENSE_PEER (1 << 1)
-
/*!
* \brief set caller and callee according to the direction
* \param caller, callee, peer, chan, sense
@@ -1900,53 +1897,42 @@ static int remap_feature(const char *name, const char *value)
}
/*!
- * \brief Check the dynamic features
- * \param chan,peer,config,code,sense
+ * \brief Helper function for feature_interpret and ast_feature_detect
+ * \param chan,peer,config,code,sense,dynamic_features char buf,feature flags,operation,feature
*
* Lock features list, browse for code, unlock list
+ * If a feature is found and the operation variable is set, that feature's
+ * operation is executed. The first feature found is copied to the feature parameter.
* \retval res on success.
* \retval -1 on failure.
*/
-static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense)
+static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel *peer,
+ struct ast_bridge_config *config, char *code, int sense, char *dynamic_features_buf,
+ struct ast_flags *features, int operation, struct ast_call_feature *feature)
{
int x;
- struct ast_flags features;
- struct ast_call_feature *feature;
struct feature_group *fg = NULL;
struct feature_group_exten *fge;
- const char *peer_dynamic_features, *chan_dynamic_features;
- char dynamic_features_buf[128];
+ struct ast_call_feature *tmpfeature;
char *tmp, *tok;
int res = AST_FEATURE_RETURN_PASSDIGITS;
int feature_detected = 0;
- if (sense == FEATURE_SENSE_CHAN) {
- ast_copy_flags(&features, &(config->features_caller), AST_FLAGS_ALL);
- }
- else {
- ast_copy_flags(&features, &(config->features_callee), AST_FLAGS_ALL);
+ if (!(peer && chan && config) && operation) {
+ return -1; /* can not run feature operation */
}
- ast_channel_lock(peer);
- peer_dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(peer, "DYNAMIC_FEATURES"),""));
- ast_channel_unlock(peer);
-
- ast_channel_lock(chan);
- chan_dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),""));
- ast_channel_unlock(chan);
-
- snprintf(dynamic_features_buf, sizeof(dynamic_features_buf), "%s%s%s", S_OR(chan_dynamic_features, ""), chan_dynamic_features && peer_dynamic_features ? "#" : "", S_OR(peer_dynamic_features,""));
-
- ast_debug(3, "Feature interpret: chan=%s, peer=%s, code=%s, sense=%d, features=%d, dynamic=%s\n", chan->name, peer->name, code, sense, features.flags, dynamic_features_buf);
-
ast_rwlock_rdlock(&features_lock);
for (x = 0; x < FEATURES_COUNT; x++) {
- if ((ast_test_flag(&features, builtin_features[x].feature_mask)) &&
+ if ((ast_test_flag(features, builtin_features[x].feature_mask)) &&
!ast_strlen_zero(builtin_features[x].exten)) {
/* Feature is up for consideration */
if (!strcmp(builtin_features[x].exten, code)) {
ast_debug(3, "Feature detected: fname=%s sname=%s exten=%s\n", builtin_features[x].fname, builtin_features[x].sname, builtin_features[x].exten);
- res = builtin_features[x].operation(chan, peer, config, code, sense, NULL);
+ if (operation) {
+ res = builtin_features[x].operation(chan, peer, config, code, sense, NULL);
+ }
+ memcpy(feature, &builtin_features[x], sizeof(feature));
feature_detected = 1;
break;
} else if (!strncmp(builtin_features[x].exten, code, strlen(code))) {
@@ -1957,8 +1943,9 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
}
ast_rwlock_unlock(&features_lock);
- if (ast_strlen_zero(dynamic_features_buf) || feature_detected)
+ if (ast_strlen_zero(dynamic_features_buf) || feature_detected) {
return res;
+ }
tmp = dynamic_features_buf;
@@ -1971,8 +1958,10 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
AST_LIST_TRAVERSE(&fg->features, fge, entry) {
if (strcasecmp(fge->exten, code))
continue;
-
- res = fge->feature->operation(chan, peer, config, code, sense, fge->feature);
+ if (operation) {
+ res = fge->feature->operation(chan, peer, config, code, sense, fge->feature);
+ }
+ memcpy(feature, fge->feature, sizeof(feature));
if (res != AST_FEATURE_RETURN_KEEPTRYING) {
AST_RWLIST_UNLOCK(&feature_groups);
break;
@@ -1987,29 +1976,79 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p
AST_RWLIST_RDLOCK(&feature_list);
- if (!(feature = find_dynamic_feature(tok))) {
+ if (!(tmpfeature = find_dynamic_feature(tok))) {
AST_RWLIST_UNLOCK(&feature_list);
continue;
}
-
+
/* Feature is up for consideration */
- if (!strcmp(feature->exten, code)) {
- ast_verb(3, " Feature Found: %s exten: %s\n",feature->sname, tok);
- res = feature->operation(chan, peer, config, code, sense, feature);
+ if (!strcmp(tmpfeature->exten, code)) {
+ ast_verb(3, " Feature Found: %s exten: %s\n",tmpfeature->sname, tok);
+ if (operation) {
+ res = tmpfeature->operation(chan, peer, config, code, sense, tmpfeature);
+ }
+ memcpy(feature, tmpfeature, sizeof(feature));
if (res != AST_FEATURE_RETURN_KEEPTRYING) {
AST_RWLIST_UNLOCK(&feature_list);
break;
}
res = AST_FEATURE_RETURN_PASSDIGITS;
- } else if (!strncmp(feature->exten, code, strlen(code)))
+ } else if (!strncmp(tmpfeature->exten, code, strlen(code)))
res = AST_FEATURE_RETURN_STOREDIGITS;
AST_RWLIST_UNLOCK(&feature_list);
}
-
+
return res;
}
+/*!
+ * \brief Check the dynamic features
+ * \param chan,peer,config,code,sense
+ *
+ * \retval res on success.
+ * \retval -1 on failure.
+*/
+
+static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, char *code, int sense) {
+
+ char dynamic_features_buf[128];
+ const char *peer_dynamic_features, *chan_dynamic_features;
+ struct ast_flags features;
+ struct ast_call_feature feature;
+ if (sense == FEATURE_SENSE_CHAN) {
+ ast_copy_flags(&features, &(config->features_caller), AST_FLAGS_ALL);
+ }
+ else {
+ ast_copy_flags(&features, &(config->features_callee), AST_FLAGS_ALL);
+ }
+
+ ast_channel_lock(peer);
+ peer_dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(peer, "DYNAMIC_FEATURES"),""));
+ ast_channel_unlock(peer);
+
+ ast_channel_lock(chan);
+ chan_dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),""));
+ ast_channel_unlock(chan);
+
+ snprintf(dynamic_features_buf, sizeof(dynamic_features_buf), "%s%s%s", S_OR(chan_dynamic_features, ""), chan_dynamic_features && peer_dynamic_features ? "#" : "", S_OR(peer_dynamic_features,""));
+
+ ast_debug(3, "Feature interpret: chan=%s, peer=%s, code=%s, sense=%d, features=%d, dynamic=%s\n", chan->name, peer->name, code, sense, features.flags, dynamic_features_buf);
+
+ return feature_interpret_helper(chan, peer, config, code, sense, dynamic_features_buf, &features, 1, &feature);
+}
+
+
+int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, char *code, struct ast_call_feature *feature) {
+
+ char *dynamic_features;
+ ast_channel_lock(chan);
+ dynamic_features = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "DYNAMIC_FEATURES"),""));
+ ast_channel_unlock(chan);
+
+ return feature_interpret_helper(chan, NULL, NULL, code, 0, dynamic_features, features, 0, feature);
+}
+
static void set_config_flags(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config)
{
int x;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-24 08:17:26 +0000