[svn-commits] mmichelson: trunk r419888 - in /trunk: CHANGES res/res_pjsip/pjsip_options.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Aug  1 09:48:35 2014
New Revision: 419888

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419888
Log:
Add ContactStatusDetail to PJSIPShowEndpoint AMI output.

Now when running PJSIPShowEndpoint, you will receive a
ContactStatusDetail for each bound contact that Asterisk
is qualifying. This information includes the URI of the
contact, current reachability, and roundtrip time.

AFS-91 #close
Reported by Mark Michelson

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


Modified:
    trunk/CHANGES
    trunk/res/res_pjsip/pjsip_options.c

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=419888&r1=419887&r2=419888
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri Aug  1 09:48:35 2014
@@ -78,6 +78,9 @@
  * AMI action PJSIPNotify may now send to a URI instead of only to a PJSIP
    endpoint as long as a default outbound endpoint is set. This also applies
    to the equivalent CLI command (pjsip send notify)
+ 
+ * The AMI action PJSIPShowEndpoint now includes ContactStatusDetail sections
+   that give information on Asterisk's attempts to qualify the endpoint.
 
 cdr_sqlite
 -----------------

Modified: trunk/res/res_pjsip/pjsip_options.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_options.c?view=diff&rev=419888&r1=419887&r2=419888
==============================================================================
--- trunk/res/res_pjsip/pjsip_options.c (original)
+++ trunk/res/res_pjsip/pjsip_options.c Fri Aug  1 09:48:35 2014
@@ -916,6 +916,65 @@
 	ao2_ref(endpoints, -1);
 }
 
+static const char *status_map [] = {
+	[UNAVAILABLE] = "Unreachable",
+	[AVAILABLE] = "Reachable",
+};
+
+static int format_contact_status(void *obj, void *arg, int flags)
+{
+	struct ast_sip_contact_wrapper *wrapper = obj;
+	struct ast_sip_contact *contact = wrapper->contact;
+	struct ast_sip_ami *ami = arg;
+	struct ast_sip_contact_status *status;
+	struct ast_str *buf;
+	const struct ast_sip_endpoint *endpoint = ami->arg;
+
+	buf = ast_sip_create_ami_event("ContactStatusDetail", ami);
+	if (!buf) {
+		return -1;
+	}
+
+	status = ast_sorcery_retrieve_by_id(
+		ast_sip_get_sorcery(), CONTACT_STATUS,
+		ast_sorcery_object_get_id(contact));
+
+	ast_str_append(&buf, 0, "AOR: %s\r\n", wrapper->aor_id);
+	ast_str_append(&buf, 0, "URI: %s\r\n", contact->uri);
+	if (status) {
+		ast_str_append(&buf, 0, "Status: %s\r\n", status_map[status->status]);
+		ast_str_append(&buf, 0, "RoundtripUsec: %" PRId64 "\r\n", status->rtt);
+	} else {
+		ast_str_append(&buf, 0, "Status: Unknown\r\n");
+		ast_str_append(&buf, 0, "RoundtripUsec: N/A\r\n");
+	}
+	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));
+
+	ast_free(buf);
+	ao2_cleanup(status);
+	return 0;
+}
+
+static int format_contact_status_for_aor(void *obj, void *arg, int flags)
+{
+	struct ast_sip_aor *aor = obj;
+
+	return ast_sip_for_each_contact(aor, format_contact_status, arg);
+}
+
+static int format_ami_contact_status(const struct ast_sip_endpoint *endpoint,
+		struct ast_sip_ami *ami)
+{
+	ami->arg = (void *)endpoint;
+	return ast_sip_for_each_aor(endpoint->aors, format_contact_status_for_aor, ami);
+}
+
+static struct ast_sip_endpoint_formatter contact_status_formatter = {
+	.format_ami = format_ami_contact_status
+};
+
 int ast_res_pjsip_init_options_handling(int reload)
 {
 	const pj_str_t STR_OPTIONS = { "OPTIONS", 7 };
@@ -946,6 +1005,8 @@
 		return -1;
 	}
 
+	ast_sip_register_endpoint_formatter(&contact_status_formatter);
+
 	qualify_and_schedule_all();
 	ast_cli_register_multiple(cli_options, ARRAY_LEN(cli_options));
 	ast_manager_register2("PJSIPQualify", EVENT_FLAG_SYSTEM | EVENT_FLAG_REPORTING, ami_sip_qualify, NULL, NULL, NULL);
@@ -957,4 +1018,5 @@
 {
 	ast_cli_unregister_multiple(cli_options, ARRAY_LEN(cli_options));
 	ast_manager_unregister("PJSIPQualify");
-}
+	ast_sip_unregister_endpoint_formatter(&contact_status_formatter);
+}