[Asterisk-code-review] pjsip_config.xml: Fix omissions caused by wrong cherry-pick order (asterisk[certified/18.9])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/18823 )

Change subject: pjsip_config.xml: Fix omissions caused by wrong cherry-pick order
......................................................................

pjsip_config.xml: Fix omissions caused by wrong cherry-pick order

When cherry-picking geolocation prerequisites to the certified/18.9
branch, the commit that moved res_pjsip documentation to separate
XML files was cherry-picked after other that assumed it was
already there.  This caused a few configuration options to be
dropped from the XML and prevented res_stir_shaken and some
pjsip transports to fail to load.

Those entries are now in their correct spots in pjsip_config.xml.

A housekeeping change was also made to both pjsip_config.xml and
pjsip_manager.xml to add stylesheet and namespace info.

Change-Id: I0ea2eb191e006673f4fa3caafb2edbc92b3e1214
---
M res/res_pjsip/pjsip_config.xml
M res/res_pjsip/pjsip_manager.xml
2 files changed, 23 insertions(+), 2 deletions(-)

Approvals:
  Friendly Automation: Approved for Submit
  Joshua Colp: Looks good to me, but someone else must approve
  Benjamin Keith Ford: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved



diff --git a/res/res_pjsip/pjsip_config.xml b/res/res_pjsip/pjsip_config.xml
index 727e3e6..5adf4f3 100644
--- a/res/res_pjsip/pjsip_config.xml
+++ b/res/res_pjsip/pjsip_config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE docs SYSTEM "appdocsxml.dtd">
-<docs>
+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?>
+<docs xmlns:xi="http://www.w3.org/2001/XInclude">
 	<configInfo name="res_pjsip" language="en_US">
 		<synopsis>SIP Resource using PJProject</synopsis>
 		<configFile name="pjsip.conf">
@@ -1423,6 +1424,13 @@
 						INVITEs, an Identity header will be added.</para>
 					</description>
 				</configOption>
+				<configOption name="stir_shaken_profile" default="">
+				        <synopsis>STIR/SHAKEN profile containing additional configuration options</synopsis>
+				        <description><para>
+				                A STIR/SHAKEN profile that is defined in stir_shaken.conf. Contains
+				                several options and rules used for STIR/SHAKEN.</para>
+				        </description>
+				</configOption>
 				<configOption name="allow_unauthenticated_options" default="no">
 					<synopsis>Skip authentication when receiving OPTIONS requests</synopsis>
 					<description><para>
@@ -1773,6 +1781,18 @@
 						in-progress calls.</para>
 					</description>
 				</configOption>
+				<configOption name="allow_wildcard_certs" default="false">
+					<synopsis>Allow use of wildcards in certificates (TLS ONLY)</synopsis>
+					<description>
+						<para>In combination with verify_server, when enabled allow use of wildcards,
+							i.e. '*.' in certs for common,and subject alt names of type DNS for TLS
+							transport types. Names must start with the wildcard. Partial wildcards, e.g.
+							'f*.example.com' and 'foo.*.com' are not allowed. As well, names only match
+							against a single level meaning '*.example.com' matches 'foo.example.com',
+							but not 'foo.bar.example.com'.
+						</para>
+					</description>
+				</configOption>
 				<configOption name="symmetric_transport" default="no">
 					<synopsis>Use the same transport for outgoing requests as incoming ones.</synopsis>
 					<description>
diff --git a/res/res_pjsip/pjsip_manager.xml b/res/res_pjsip/pjsip_manager.xml
index a0047aa..810a5e3 100644
--- a/res/res_pjsip/pjsip_manager.xml
+++ b/res/res_pjsip/pjsip_manager.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE docs SYSTEM "appdocsxml.dtd">
-<docs>
+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?>
+<docs xmlns:xi="http://www.w3.org/2001/XInclude">
 	<manager name="PJSIPQualify" language="en_US">
 		<synopsis>
 			Qualify a chan_pjsip endpoint.

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/18823
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: certified/18.9
Gerrit-Change-Id: I0ea2eb191e006673f4fa3caafb2edbc92b3e1214
Gerrit-Change-Number: 18823
Gerrit-PatchSet: 1
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Benjamin Keith Ford <bford at digium.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20220714/4d80fbeb/attachment.html>