[asterisk-commits] kmoore: trunk r391855 - in /trunk: include/asterisk/ main/ rest-api/api-docs/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jun 14 13:46:02 CDT 2013
Author: kmoore
Date: Fri Jun 14 13:46:00 2013
New Revision: 391855
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391855
Log:
Fix two more possible crashes in CEL
These are locations that should return valid snapshots, but need to be
handled if not.
Modified:
trunk/include/asterisk/stasis_bridging.h
trunk/main/cel.c
trunk/main/stasis_bridging.c
trunk/rest-api/api-docs/bridges.json
Modified: trunk/include/asterisk/stasis_bridging.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/stasis_bridging.h?view=diff&rev=391855&r1=391854&r2=391855
==============================================================================
--- trunk/include/asterisk/stasis_bridging.h (original)
+++ trunk/include/asterisk/stasis_bridging.h Fri Jun 14 13:46:00 2013
@@ -39,6 +39,8 @@
AST_STRING_FIELD(uniqueid);
/*! Bridge technology that is handling the bridge */
AST_STRING_FIELD(technology);
+ /*! Bridge subclass that is handling the bridge */
+ AST_STRING_FIELD(subclass);
);
/*! AO2 container of bare channel uniqueid strings participating in the bridge.
* Allocated from ast_str_container_alloc() */
Modified: trunk/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cel.c?view=diff&rev=391855&r1=391854&r2=391855
==============================================================================
--- trunk/main/cel.c (original)
+++ trunk/main/cel.c Fri Jun 14 13:46:00 2013
@@ -1283,6 +1283,10 @@
/* create a bridge_assoc for this bridge and mark it as being tracked appropriately */
chan_snapshot = ast_channel_snapshot_get_latest(channel_id);
+ if (!chan_snapshot) {
+ return;
+ }
+
ast_assert(chan_snapshot != NULL);
assoc = bridge_assoc_alloc(chan_snapshot, new_snapshot->uniqueid, chan_snapshot->name);
if (!assoc) {
@@ -1329,6 +1333,10 @@
ao2_iterator_destroy(&i);
latest_primary = ast_channel_snapshot_get_latest(channel_id);
+ if (!latest_primary) {
+ return;
+ }
+
add_bridge_primary(latest_primary, snapshot->uniqueid, chan_snapshot->name);
report_event_snapshot(latest_primary, AST_CEL_BRIDGE_START, NULL, NULL, chan_snapshot->name);
}
Modified: trunk/main/stasis_bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_bridging.c?view=diff&rev=391855&r1=391854&r2=391855
==============================================================================
--- trunk/main/stasis_bridging.c (original)
+++ trunk/main/stasis_bridging.c Fri Jun 14 13:46:00 2013
@@ -92,6 +92,7 @@
ast_string_field_set(snapshot, uniqueid, bridge->uniqueid);
ast_string_field_set(snapshot, technology, bridge->technology->name);
+ ast_string_field_set(snapshot, subclass, bridge->v_table->name);
snapshot->feature_flags = bridge->feature_flags;
snapshot->capabilities = bridge->technology->capabilities;
@@ -291,24 +292,68 @@
stasis_publish(ast_bridge_topic(bridge), msg);
}
+typedef struct ast_json *(*json_item_serializer_cb)(void *obj);
+
+static struct ast_json *container_to_json_array(struct ao2_container *items, json_item_serializer_cb item_cb)
+{
+ RAII_VAR(struct ast_json *, json_items, ast_json_array_create(), ast_json_unref);
+ void *item;
+ struct ao2_iterator it;
+ if (!json_items) {
+ return NULL;
+ }
+
+ it = ao2_iterator_init(items, 0);
+ while ((item = ao2_iterator_next(&it))) {
+ if (ast_json_array_append(json_items, item_cb(item))) {
+ ao2_iterator_destroy(&it);
+ return NULL;
+ }
+ }
+ ao2_iterator_destroy(&it);
+
+ return ast_json_ref(json_items);
+}
+
+static const char *capability2str(uint32_t capabilities)
+{
+ if (capabilities & AST_BRIDGE_CAPABILITY_HOLDING) {
+ return "holding";
+ } else {
+ return "mixing";
+ }
+}
+
struct ast_json *ast_bridge_snapshot_to_json(const struct ast_bridge_snapshot *snapshot)
{
- RAII_VAR(struct ast_json *, json_chan, NULL, ast_json_unref);
- int r = 0;
+ RAII_VAR(struct ast_json *, json_bridge, NULL, ast_json_unref);
+ struct ast_json *json_channels;
if (snapshot == NULL) {
return NULL;
}
- json_chan = ast_json_object_create();
- if (!json_chan) { ast_log(LOG_ERROR, "Error creating channel json object\n"); return NULL; }
-
- r = ast_json_object_set(json_chan, "bridge-uniqueid", ast_json_string_create(snapshot->uniqueid));
- if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
- r = ast_json_object_set(json_chan, "bridge-technology", ast_json_string_create(snapshot->technology));
- if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
-
- return ast_json_ref(json_chan);
+ json_channels = container_to_json_array(snapshot->channels,
+ (json_item_serializer_cb)ast_json_string_create);
+ if (!json_channels) {
+ return NULL;
+ }
+
+ json_bridge = ast_json_pack("{s: s, s: s, s: s, s: s, s: s, s: s, s: s, s: s, s: o}",
+ "bridgeUniqueid", snapshot->uniqueid,
+ "bridgeTechnology", snapshot->technology,
+ "bridgeType", capability2str(snapshot->capabilities),
+ "one_to_one", (snapshot->capabilities & AST_BRIDGE_CAPABILITY_1TO1MIX) ? "yes" : "no",
+ "multimix", (snapshot->capabilities & AST_BRIDGE_CAPABILITY_MULTIMIX) ? "yes" : "no",
+ "native", (snapshot->capabilities & AST_BRIDGE_CAPABILITY_NATIVE) ? "yes" : "no",
+ "holding", (snapshot->capabilities & AST_BRIDGE_CAPABILITY_HOLDING) ? "yes" : "no",
+ "bridgeClass", snapshot->subclass,
+ "channels", json_channels);
+ if (!json_bridge) {
+ return NULL;
+ }
+
+ return ast_json_ref(json_bridge);
}
struct ast_bridge_snapshot *ast_bridge_snapshot_get_latest(const char *uniqueid)
Modified: trunk/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api/api-docs/bridges.json?view=diff&rev=391855&r1=391854&r2=391855
==============================================================================
--- trunk/rest-api/api-docs/bridges.json (original)
+++ trunk/rest-api/api-docs/bridges.json Fri Jun 14 13:46:00 2013
@@ -34,8 +34,7 @@
"allowedValues": {
"type": "LIST",
"values": [
- "two-party",
- "multi-party",
+ "mixing",
"holding"
]
}
@@ -240,8 +239,7 @@
"allowedValues": {
"type": "LIST",
"values": [
- "two-party",
- "multi-party",
+ "mixing",
"holding"
]
}
More information about the asterisk-commits
mailing list