summaryrefslogtreecommitdiff
path: root/main/features.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-04-08 14:26:37 +0000
committerMatthew Jordan <mjordan@digium.com>2013-04-08 14:26:37 +0000
commitb8d4e573f1292688d07063542d263490536c2bc9 (patch)
tree938b0732a2311aa3c424597283aff95c85f9a98e /main/features.c
parenta2a53cc306ea5fec65daf3630716a7c6ee13adad (diff)
Add multi-channel Stasis messages; refactor Dial AMI events to Stasis
This patch does the following: * A new Stasis payload has been defined for multi-channel messages. This payload can store multiple ast_channel_snapshot objects along with a single JSON blob. The payload object itself is opaque; the snapshots are stored in a container keyed by roles. APIs have been provided to query for and retrieve the snapshots from the payload object. * The Dial AMI events have been refactored onto Stasis. This includes dial messages in app_dial, as well as the core dialing framework. The AMI events have been modified to send out a DialBegin/DialEnd events, as opposed to the subevent type that was previously used. * Stasis messages, types, and other objects related to channels have been placed in their own file, stasis_channels. Unit tests for some of these objects/messages have also been written. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/main/features.c b/main/features.c
index 0f05fadf3..a7206e77d 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3626,9 +3626,7 @@ static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel
ast_rwlock_unlock(&features_lock);
- ast_assert(dynamic_features_buf != NULL);
-
- if (!ast_str_strlen(dynamic_features_buf) || feature_detected) {
+ if (!dynamic_features_buf || !ast_str_strlen(dynamic_features_buf) || feature_detected) {
return res;
}
@@ -3745,7 +3743,6 @@ static int feature_interpret(struct ast_channel *chan, struct ast_channel *peer,
int ast_feature_detect(struct ast_channel *chan, struct ast_flags *features, const char *code, struct ast_call_feature *feature) {
-
return feature_interpret_helper(chan, NULL, NULL, code, 0, NULL, features, FEATURE_INTERPRET_DETECT, feature);
}