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

chan_pjsip: AMI action PJSIPShowEndpoint closes AMI connection on error.

Browse Source 
Also fixed similar problem with AMI action PJSIPShowEndpoints.

ASTERISK-24872 #close
Reported by: Dmitriy Serov

Review: https://reviewboard.asterisk.org/r/4487/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@432894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-03-13 17:04:43 +00:00
parent 34aa0214eb
commit a3292230b8
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/res_pjsip/pjsip_configuration.c
View File

@@ -1159,7 +1159,7 @@ static int ami_show_endpoint(struct mansession *s, const struct message *m)
ast_sip_get_sorcery(), "endpoint", endpoint_name))) { ast_sip_get_sorcery(), "endpoint", endpoint_name))) {
astman_send_error_va(s, m, "Unable to retrieve endpoint %s\n", astman_send_error_va(s, m, "Unable to retrieve endpoint %s\n",
endpoint_name); endpoint_name);
return -1; return 0;
} }
astman_send_listack(s, m, "Following are Events for each object " astman_send_listack(s, m, "Following are Events for each object "
@@ -1199,7 +1199,7 @@ static int format_ami_endpoints(void *obj, void *arg, int flags)
ast_sip_create_ami_event("EndpointList", ami), ast_free); ast_sip_create_ami_event("EndpointList", ami), ast_free);
if (!buf) { if (!buf) {
return -1; return CMP_STOP;
} }
sip_sorcery_object_ami_set_type_name(endpoint, &buf); sip_sorcery_object_ami_set_type_name(endpoint, &buf);
@@ -1238,7 +1238,8 @@ static int ami_show_endpoints(struct mansession *s, const struct message *m)
endpoints = ast_sip_get_endpoints(); endpoints = ast_sip_get_endpoints();
if (!endpoints) { if (!endpoints) {
return -1; astman_send_error(s, m, "Could not get endpoints\n");
return 0;
} }
if (!(num = ao2_container_count(endpoints))) { if (!(num = ao2_container_count(endpoints))) {