<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18823">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pjsip_config.xml: Fix omissions caused by wrong cherry-pick order<br><br>When cherry-picking geolocation prerequisites to the certified/18.9<br>branch, the commit that moved res_pjsip documentation to separate<br>XML files was cherry-picked after other that assumed it was<br>already there. This caused a few configuration options to be<br>dropped from the XML and prevented res_stir_shaken and some<br>pjsip transports to fail to load.<br><br>Those entries are now in their correct spots in pjsip_config.xml.<br><br>A housekeeping change was also made to both pjsip_config.xml and<br>pjsip_manager.xml to add stylesheet and namespace info.<br><br>Change-Id: I0ea2eb191e006673f4fa3caafb2edbc92b3e1214<br>---<br>M res/res_pjsip/pjsip_config.xml<br>M res/res_pjsip/pjsip_manager.xml<br>2 files changed, 23 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/23/18823/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_pjsip/pjsip_config.xml b/res/res_pjsip/pjsip_config.xml</span><br><span>index 727e3e6..5adf4f3 100644</span><br><span>--- a/res/res_pjsip/pjsip_config.xml</span><br><span>+++ b/res/res_pjsip/pjsip_config.xml</span><br><span>@@ -1,6 +1,7 @@</span><br><span> <?xml version="1.0" encoding="UTF-8"?></span><br><span> <!DOCTYPE docs SYSTEM "appdocsxml.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-<docs></span><br><span style="color: hsl(120, 100%, 40%);">+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?></span><br><span style="color: hsl(120, 100%, 40%);">+<docs xmlns:xi="http://www.w3.org/2001/XInclude"></span><br><span> <configInfo name="res_pjsip" language="en_US"></span><br><span> <synopsis>SIP Resource using PJProject</synopsis></span><br><span> <configFile name="pjsip.conf"></span><br><span>@@ -1423,6 +1424,13 @@</span><br><span> INVITEs, an Identity header will be added.</para></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="stir_shaken_profile" default=""></span><br><span style="color: hsl(120, 100%, 40%);">+ <synopsis>STIR/SHAKEN profile containing additional configuration options</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+ <description><para></span><br><span style="color: hsl(120, 100%, 40%);">+ A STIR/SHAKEN profile that is defined in stir_shaken.conf. Contains</span><br><span style="color: hsl(120, 100%, 40%);">+ several options and rules used for STIR/SHAKEN.</para></span><br><span style="color: hsl(120, 100%, 40%);">+ </description></span><br><span style="color: hsl(120, 100%, 40%);">+ </configOption></span><br><span> <configOption name="allow_unauthenticated_options" default="no"></span><br><span> <synopsis>Skip authentication when receiving OPTIONS requests</synopsis></span><br><span> <description><para></span><br><span>@@ -1773,6 +1781,18 @@</span><br><span> in-progress calls.</para></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="allow_wildcard_certs" default="false"></span><br><span style="color: hsl(120, 100%, 40%);">+ <synopsis>Allow use of wildcards in certificates (TLS ONLY)</synopsis></span><br><span style="color: hsl(120, 100%, 40%);">+ <description></span><br><span style="color: hsl(120, 100%, 40%);">+ <para>In combination with verify_server, when enabled allow use of wildcards,</span><br><span style="color: hsl(120, 100%, 40%);">+ i.e. '*.' in certs for common,and subject alt names of type DNS for TLS</span><br><span style="color: hsl(120, 100%, 40%);">+ transport types. Names must start with the wildcard. Partial wildcards, e.g.</span><br><span style="color: hsl(120, 100%, 40%);">+ 'f*.example.com' and 'foo.*.com' are not allowed. As well, names only match</span><br><span style="color: hsl(120, 100%, 40%);">+ against a single level meaning '*.example.com' matches 'foo.example.com',</span><br><span style="color: hsl(120, 100%, 40%);">+ but not 'foo.bar.example.com'.</span><br><span style="color: hsl(120, 100%, 40%);">+ </para></span><br><span style="color: hsl(120, 100%, 40%);">+ </description></span><br><span style="color: hsl(120, 100%, 40%);">+ </configOption></span><br><span> <configOption name="symmetric_transport" default="no"></span><br><span> <synopsis>Use the same transport for outgoing requests as incoming ones.</synopsis></span><br><span> <description></span><br><span>diff --git a/res/res_pjsip/pjsip_manager.xml b/res/res_pjsip/pjsip_manager.xml</span><br><span>index a0047aa..810a5e3 100644</span><br><span>--- a/res/res_pjsip/pjsip_manager.xml</span><br><span>+++ b/res/res_pjsip/pjsip_manager.xml</span><br><span>@@ -1,6 +1,7 @@</span><br><span> <?xml version="1.0" encoding="UTF-8"?></span><br><span> <!DOCTYPE docs SYSTEM "appdocsxml.dtd"></span><br><span style="color: hsl(0, 100%, 40%);">-<docs></span><br><span style="color: hsl(120, 100%, 40%);">+<?xml-stylesheet type="text/xsl" href="appdocsxml.xslt"?></span><br><span style="color: hsl(120, 100%, 40%);">+<docs xmlns:xi="http://www.w3.org/2001/XInclude"></span><br><span> <manager name="PJSIPQualify" language="en_US"></span><br><span> <synopsis></span><br><span> Qualify a chan_pjsip endpoint.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18823">change 18823</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/18823"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: certified/18.9 </div>
<div style="display:none"> Gerrit-Change-Id: I0ea2eb191e006673f4fa3caafb2edbc92b3e1214 </div>
<div style="display:none"> Gerrit-Change-Number: 18823 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>