sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "ARI: Add duplicate channel ID checking for channel creation."

This commit is contained in:
Joshua Colp 2016-10-24 20:01:47 -05:00 committed by Gerrit Code Review
parent 51ae1046d0 3bd76dd679
commit 0af69e4454
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/ari/resource_channels.c
View File

@ -1828,7 +1828,12 @@ void ast_ari_channels_create(struct ast_variable *headers,
ao2_cleanup(request_cap);
if (!chan_data->chan) {
ast_ari_response_alloc_failed(response);
if (ast_channel_errno() == AST_CHANNEL_ERROR_ID_EXISTS) {
ast_ari_response_error(response, 409, "Conflict",
"Channel with given unique ID already exists");
} else {
ast_ari_response_alloc_failed(response);
}
ast_channel_cleanup(originator);
chan_data_destroy(chan_data);
return;

1
res/res_ari_channels.c
View File

@ -386,6 +386,7 @@ static void ast_ari_channels_create_cb(
break;
case 500: /* Internal Server Error */
case 501: /* Not Implemented */
case 409: /* Channel with given unique ID already exists. */
is_valid = 1;
break;
default:

6
rest-api/api-docs/channels.json
View File

@ -217,6 +217,12 @@
"allowMultiple": false,
"dataType": "string"
}
],
"errorResponses": [
{
"code": 409,
"reason": "Channel with given unique ID already exists."
}
]
}
]