[svn-commits] dlee: branch dlee/ari-event-remodel2 r392138 - in /team/dlee/ari-event-remode...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jun 18 11:01:18 CDT 2013
Author: dlee
Date: Tue Jun 18 11:01:16 2013
New Revision: 392138
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392138
Log:
Fix bridge snapshot conversion to JSON
This makes ast_bridge_snapshot_to_json conform to the swagger Bridge
model by adding the two fields it required.
Review: https://reviewboard.asterisk.org/r/2583/
........
Merged revisions 392116 from http://svn.asterisk.org/svn/asterisk/trunk
........
Merged revisions 392137 from http://svn.asterisk.org/svn/asterisk/team/dlee/ari-url-shuffle
Modified:
team/dlee/ari-event-remodel2/ (props changed)
team/dlee/ari-event-remodel2/include/asterisk/stasis_bridging.h
team/dlee/ari-event-remodel2/main/stasis_bridging.c
team/dlee/ari-event-remodel2/rest-api/api-docs/bridges.json
Propchange: team/dlee/ari-event-remodel2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 18 11:01:16 2013
@@ -1,1 +1,1 @@
-/team/dlee/ari-url-shuffle:1-392110 /trunk:1-392109
+/team/dlee/ari-url-shuffle:1-392137 /trunk:1-392136
Modified: team/dlee/ari-event-remodel2/include/asterisk/stasis_bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/include/asterisk/stasis_bridging.h?view=diff&rev=392138&r1=392137&r2=392138
==============================================================================
--- team/dlee/ari-event-remodel2/include/asterisk/stasis_bridging.h (original)
+++ team/dlee/ari-event-remodel2/include/asterisk/stasis_bridging.h Tue Jun 18 11:01:16 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: team/dlee/ari-event-remodel2/main/stasis_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/main/stasis_bridging.c?view=diff&rev=392138&r1=392137&r2=392138
==============================================================================
--- team/dlee/ari-event-remodel2/main/stasis_bridging.c (original)
+++ team/dlee/ari-event-remodel2/main/stasis_bridging.c Tue Jun 18 11:01:16 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,64 @@
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: o}",
+ "bridgeUniqueid", snapshot->uniqueid,
+ "bridgeTechnology", snapshot->technology,
+ "bridgeType", capability2str(snapshot->capabilities),
+ "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: team/dlee/ari-event-remodel2/rest-api/api-docs/bridges.json
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-event-remodel2/rest-api/api-docs/bridges.json?view=diff&rev=392138&r1=392137&r2=392138
==============================================================================
--- team/dlee/ari-event-remodel2/rest-api/api-docs/bridges.json (original)
+++ team/dlee/ari-event-remodel2/rest-api/api-docs/bridges.json Tue Jun 18 11:01:16 2013
@@ -34,8 +34,7 @@
"allowedValues": {
"type": "LIST",
"values": [
- "two-party",
- "multi-party",
+ "mixing",
"holding"
]
}
@@ -241,8 +240,7 @@
"allowedValues": {
"type": "LIST",
"values": [
- "two-party",
- "multi-party",
+ "mixing",
"holding"
]
}
More information about the svn-commits
mailing list