res_pjsip: ami: Fix error in AMI output when an endpoint has no transport
authorGeorge Joseph <george.joseph@fairview5.com>
Thu, 18 Sep 2014 15:14:38 +0000 (15:14 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Thu, 18 Sep 2014 15:14:38 +0000 (15:14 +0000)
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
........

Merged revisions 423284 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@423285 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/res_pjsip.h
res/res_pjsip/config_auth.c
res/res_pjsip/config_transport.c
res/res_pjsip/location.c
res/res_pjsip/pjsip_configuration.c
res/res_pjsip/pjsip_options.c
res/res_pjsip_endpoint_identifier_ip.c

index 45d9325..fdb2105 100644 (file)
@@ -1727,6 +1727,8 @@ struct ast_sip_ami {
        const char *action_id;
        /*! user specified argument data */
        void *arg;
+       /*! count of objects */
+       int count;
 };
 
 /*!
index cd4b959..b8c9bc9 100644 (file)
@@ -175,6 +175,8 @@ static int format_ami_auth_handler(void *obj, void *arg, int flags)
        }
 
        astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));
+       ami->count++;
+
        return 0;
 }
 
index 785fcc5..0a56b92 100644 (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;
 }
 
index b0a49cd..d6015c7 100644 (file)
@@ -506,6 +506,8 @@ static int format_ami_aor_handler(void *obj, void *arg, int flags)
                       ast_sorcery_object_get_id(endpoint));
 
        astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));
+       ami->count++;
+
        return 0;
 }
 
index 5483728..9166d3f 100644 (file)
@@ -1107,7 +1107,8 @@ static int format_ami_endpoint(const struct ast_sip_endpoint *endpoint,
 
 static int ami_show_endpoint(struct mansession *s, const struct message *m)
 {
-       struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), };
+       struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"),
+               .count = 0, };
        RAII_VAR(struct ast_sip_endpoint *, endpoint, NULL, ao2_cleanup);
        const char *endpoint_name = astman_get_header(m, "Endpoint");
        int count = 0;
@@ -1144,7 +1145,8 @@ static int ami_show_endpoint(struct mansession *s, const struct message *m)
                astman_append(s, "ActionID: %s\r\n", ami.action_id);
        }
        astman_append(s, "EventList: Complete\r\n"
-                     "ListItems: %d\r\n\r\n", count + 1);
+                     "ListItems: %d\r\n\r\n", ami.count + 1);
+
        return 0;
 }
 
index c9b4f8c..1c26251 100644 (file)
@@ -995,7 +995,8 @@ static int format_contact_status(void *obj, void *arg, int flags)
        ast_str_append(&buf, 0, "EndpointName: %s\r\n",
                        ast_sorcery_object_get_id(endpoint));
        astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));
-
+       ami->count++;
+       
        ast_free(buf);
        ao2_cleanup(status);
        return 0;
index 294c445..5d938c0 100644 (file)
@@ -263,6 +263,8 @@ static int format_ami_endpoint_identify(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;
 }