kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 18:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: ami: Fix error in AMI output when an endpoint has no transport

Browse Source 
When no transport is associated to an endpoint, the AMI output for
PJSIPShowEndpoint indicates an error instead of silently ignoring the
missing transport.

This patch causes the error to appear only if a transport was specified
on the endpoint and the transport doesn't exist.  It also fixes an issue
with counting the objects that were actually found.

ASTERISK-24161 #close
ASTERISK-24331 #close
Tested by: George Joseph
Review: https://reviewboard.asterisk.org/r/3998/
........

Merged revisions 423282 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@423284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
George Joseph
2014-09-18 15:13:29 +00:00
parent 27df9b73e2
commit a2482acdce
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_pjsip/config_transport.c
View File

@@ -39,16 +39,20 @@ static int sip_transport_to_ami(const struct ast_sip_transport *transport,
static int format_ami_endpoint_transport(const struct ast_sip_endpoint *endpoint,
struct ast_sip_ami *ami)
{
RAII_VAR(struct ast_str *, buf,
ast_sip_create_ami_event("TransportDetail", ami), ast_free);
RAII_VAR(struct ast_sip_transport *,
transport, ast_sorcery_retrieve_by_id(
ast_sip_get_sorcery(), "transport",
endpoint->transport), ao2_cleanup);
RAII_VAR(struct ast_str *, buf, NULL, ast_free);
RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
if (ast_strlen_zero(endpoint->transport)) {
return 0;
}
buf = ast_sip_create_ami_event("TransportDetail", ami);
if (!buf) {
return -1;
}
transport = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), "transport",
endpoint->transport);
if (!transport) {
astman_send_error_va(ami->s, ami->m, "Unable to retrieve "
"transport %s\n", endpoint->transport);
@@ -61,6 +65,8 @@ static int format_ami_endpoint_transport(const struct ast_sip_endpoint *endpoint
ast_sorcery_object_get_id(endpoint));
astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));
ami->count++;
return 0;
}