<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/7771">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Add AMI action 'PJSIPShowAors'<br><br>Add an AMI action which provides information on all<br>configured AORs.<br><br>ASTERISK-27537<br><br>Change-Id: If8b990a00909e5b6c0f04a3b8dccd9903dc445eb<br>---<br>M CHANGES<br>M res/res_pjsip.c<br>M res/res_pjsip/location.c<br>3 files changed, 142 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/CHANGES b/CHANGES<br>index bd11c6c..abf121e 100644<br>--- a/CHANGES<br>+++ b/CHANGES<br>@@ -43,6 +43,11 @@<br> When set the wrapuptime on the member is used instead of the wrapuptime<br> defined for the queue itself.<br> <br>+res_pjsip<br>+------------------<br>+ * A new AMI action, PJSIPShowAors, has been added which displays information<br>+ about all configured PJSIP AORs.<br>+<br> ------------------------------------------------------------------------------<br> --- Functionality changes from Asterisk 15.1.0 to Asterisk 15.2.0 ------------<br> ------------------------------------------------------------------------------<br>diff --git a/res/res_pjsip.c b/res/res_pjsip.c<br>index c08e15b..c3deb98 100644<br>--- a/res/res_pjsip.c<br>+++ b/res/res_pjsip.c<br>@@ -2267,6 +2267,49 @@<br> </syntax><br> </managerEventInstance><br> </managerEvent><br>+ <managerEvent language="en_US" name="AorList"><br>+ <managerEventInstance class="EVENT_FLAG_COMMAND"><br>+ <synopsis>Provide details about an Address of Record (AoR) section.</synopsis><br>+ <syntax><br>+ <parameter name="ObjectType"><br>+ <para>The object's type. This will always be 'aor'.</para><br>+ </parameter><br>+ <parameter name="ObjectName"><br>+ <para>The name of this object.</para><br>+ </parameter><br>+ <parameter name="MinimumExpiration"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='minimum_expiration']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="MaximumExpiration"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='maximum_expiration']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="DefaultExpiration"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='default_expiration']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="QualifyFrequency"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='qualify_frequency']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="AuthenticateQualify"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='authenticate_qualify']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="MaxContacts"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='max_contacts']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="RemoveExisting"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='remove_existing']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="Mailboxes"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='mailboxes']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="OutboundProxy"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='outbound_proxy']/synopsis/node())"/></para><br>+ </parameter><br>+ <parameter name="SupportPath"><br>+ <para><xi:include xpointer="xpointer(/docs/configInfo[@name='res_pjsip']/configFile[@name='pjsip.conf']/configObject[@name='aor']/configOption[@name='support_path']/synopsis/node())"/></para><br>+ </parameter><br>+ </syntax><br>+ </managerEventInstance><br>+ </managerEvent><br> <managerEvent language="en_US" name="ContactStatusDetail"><br> <managerEventInstance class="EVENT_FLAG_COMMAND"><br> <synopsis>Provide details about a contact's status.</synopsis><br>@@ -2426,6 +2469,34 @@<br> </managerEvent><br> </responses><br> </manager><br>+ <manager name="PJSIPShowAors" language="en_US"><br>+ <synopsis><br>+ Lists PJSIP AORs.<br>+ </synopsis><br>+ <syntax /><br>+ <description><br>+ <para><br>+ Provides a listing of all AORs. For each AOR an <literal>AorList</literal> event<br>+ is raised that contains relevant attributes and status information. Once all<br>+ aors have been listed an <literal>AorListComplete</literal> event is issued.<br>+ </para><br>+ </description><br>+ <responses><br>+ <list-elements><br>+ <xi:include xpointer="xpointer(/docs/managerEvent[@name='AorList'])" /><br>+ </list-elements><br>+ <managerEvent language="en_US" name="AorListComplete"><br>+ <managerEventInstance class="EVENT_FLAG_COMMAND"><br>+ <synopsis>Provide final information about an aor list.</synopsis><br>+ <syntax><br>+ <parameter name="EventList"/><br>+ <parameter name="ListItems"/><br>+ </syntax><br>+ </managerEventInstance><br>+ </managerEvent><br>+ </responses><br>+ </manager><br>+<br> ***/<br> <br> #define MOD_DATA_CONTACT "contact"<br>diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c<br>index 7483a5b..eb9e588 100644<br>--- a/res/res_pjsip/location.c<br>+++ b/res/res_pjsip/location.c<br>@@ -1179,6 +1179,67 @@<br> return 0;<br> }<br> <br>+static struct ao2_container *cli_get_aors(void)<br>+{<br>+ struct ao2_container *aors;<br>+<br>+ aors = ast_sorcery_retrieve_by_fields(ast_sip_get_sorcery(), "aor",<br>+ AST_RETRIEVE_FLAG_MULTIPLE | AST_RETRIEVE_FLAG_ALL, NULL);<br>+<br>+ return aors;<br>+}<br>+<br>+static int format_ami_aorlist_handler(void *obj, void *arg, int flags)<br>+{<br>+ struct ast_sip_aor *aor = obj;<br>+ struct ast_sip_ami *ami = arg;<br>+ struct ast_str *buf;<br>+<br>+ buf = ast_sip_create_ami_event("AorList", ami);<br>+ if (!buf) {<br>+ return -1;<br>+ }<br>+<br>+ sip_aor_to_ami(aor, &buf);<br>+<br>+ astman_append(ami->s, "%s\r\n", ast_str_buffer(buf));<br>+ ami->count++;<br>+<br>+ ast_free(buf);<br>+<br>+ return 0;<br>+}<br>+<br>+static int ami_show_aors(struct mansession *s, const struct message *m)<br>+{<br>+ struct ast_sip_ami ami = { .s = s, .m = m, .action_id = astman_get_header(m, "ActionID"), };<br>+ struct ao2_container *aors;<br>+<br>+ aors = cli_get_aors();<br>+ if (!aors) {<br>+ astman_send_error(s, m, "Could not get AORs\n");<br>+ return 0;<br>+ }<br>+<br>+ if (!ao2_container_count(aors)) {<br>+ astman_send_error(s, m, "No AORs found\n");<br>+ ao2_ref(aors, -1);<br>+ return 0;<br>+ }<br>+<br>+ astman_send_listack(s, m, "A listing of AORs follows, presented as AorList events",<br>+ "start");<br>+<br>+ ao2_callback(aors, OBJ_NODATA, format_ami_aorlist_handler, &ami);<br>+<br>+ astman_send_list_complete_start(s, m, "AorListComplete", ami.count);<br>+ astman_send_list_complete_end(s);<br>+<br>+ ao2_ref(aors, -1);<br>+<br>+ return 0;<br>+}<br>+<br> static struct ast_cli_entry cli_commands[] = {<br> AST_CLI_DEFINE(ast_sip_cli_traverse_objects, "List PJSIP Aors",<br> .command = "pjsip list aors",<br>@@ -1317,6 +1378,10 @@<br> ast_sip_register_cli_formatter(aor_formatter);<br> ast_cli_register_multiple(cli_commands, ARRAY_LEN(cli_commands));<br> <br>+ if (ast_manager_register_xml("PJSIPShowAors", EVENT_FLAG_SYSTEM, ami_show_aors)) {<br>+ return -1;<br>+ }<br>+<br> /*<br> * Reset StatsD gauges in case we didn't shut down cleanly.<br> * Note that this must done here, as contacts will create the contact_status<br>@@ -1335,6 +1400,7 @@<br> ast_cli_unregister_multiple(cli_commands, ARRAY_LEN(cli_commands));<br> ast_sip_unregister_cli_formatter(contact_formatter);<br> ast_sip_unregister_cli_formatter(aor_formatter);<br>+ ast_manager_unregister("PJSIPShowAors");<br> <br> internal_sip_unregister_endpoint_formatter(&endpoint_aor_formatter);<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/7771">change 7771</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/7771"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: If8b990a00909e5b6c0f04a3b8dccd9903dc445eb </div>
<div style="display:none"> Gerrit-Change-Number: 7771 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>