return;
}
- if (ast_json_integer_get(result_blob) == AST_BRIDGE_TRANSFER_FAIL) {
+ if (ast_json_integer_get(result_blob) != AST_BRIDGE_TRANSFER_SUCCESS) {
return;
}
return;
}
- if (atxfer_msg->result == AST_BRIDGE_TRANSFER_FAIL ||
+ if (atxfer_msg->result != AST_BRIDGE_TRANSFER_SUCCESS ||
atxfer_msg->dest_type == AST_ATTENDED_TRANSFER_DEST_THREEWAY) {
return;
}
struct ast_channel_snapshot *chan_snapshot = obj->channel;
struct ast_bridge_snapshot *bridge_snapshot = obj->bridge;
struct ast_json *blob = obj->blob;
- struct ast_json *json_exten = ast_json_object_get(blob, "exten");
- struct ast_json *json_context = ast_json_object_get(blob, "context");
+ struct ast_json *json_result = ast_json_object_get(blob, "result");
+ struct ast_json *json_exten;
+ struct ast_json *json_context;
RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref);
const char *exten, *context;
+ enum ast_transfer_result result;
+
+ if (!json_result) {
+ return;
+ }
+
+ result = ast_json_integer_get(json_result);
+ if (result != AST_BRIDGE_TRANSFER_SUCCESS) {
+ return;
+ }
+
+ json_exten = ast_json_object_get(blob, "exten");
+ json_context = ast_json_object_get(blob, "context");
if (!json_exten || !json_context) {
return;
if (!exten || !context) {
return;
}
+
extra = ast_json_pack("{s: s, s: s, s: s}",
"extension", exten,
"context", context,
}
channel_state = ast_manager_build_channel_state_string_prefix(blob->channel, "Transferer");
- bridge_state = ast_manager_build_bridge_state_string(blob->bridge);
- if (!channel_state || !bridge_state) {
+ if (!channel_state) {
return NULL;
}
+ if (blob->bridge) {
+ bridge_state = ast_manager_build_bridge_state_string(blob->bridge);
+ if (!bridge_state) {
+ return NULL;
+ }
+ }
+
exten = ast_json_string_get(ast_json_object_get(blob->blob, "exten"));
context = ast_json_string_get(ast_json_object_get(blob->blob, "context"));
result = ast_json_integer_get(ast_json_object_get(blob->blob, "result"));
"Extension: %s\r\n",
result_strs[result],
ast_str_buffer(channel_state),
- ast_str_buffer(bridge_state),
+ bridge_state ? ast_str_buffer(bridge_state) : "",
is_external ? "Yes" : "No",
context,
exten);