<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8727">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Update authenticate_qualify documentation.<br><br>Change-Id: I3811de0014b1ffe96d4a3b49cddd5d4ca02ee5d4<br>---<br>M include/asterisk/res_pjsip.h<br>M res/res_pjsip.c<br>2 files changed, 22 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h<br>index 1a9076b..8cb428f 100644<br>--- a/include/asterisk/res_pjsip.h<br>+++ b/include/asterisk/res_pjsip.h<br>@@ -261,7 +261,7 @@<br> struct timeval expiration_time;<br> /*! Frequency to send OPTIONS requests to contact. 0 is disabled. */<br> unsigned int qualify_frequency;<br>- /*! If true authenticate the qualify if needed */<br>+ /*! If true authenticate the qualify challenge response if needed */<br> int authenticate_qualify;<br> /*! Qualify timeout. 0 is diabled. */<br> double qualify_timeout;<br>@@ -340,7 +340,7 @@<br> unsigned int default_expiration;<br> /*! Frequency to send OPTIONS requests to AOR contacts. 0 is disabled. */<br> unsigned int qualify_frequency;<br>- /*! If true authenticate the qualify if needed */<br>+ /*! If true authenticate the qualify challenge response if needed */<br> int authenticate_qualify;<br> /*! Maximum number of external contacts, 0 to disable */<br> unsigned int max_contacts;<br>diff --git a/res/res_pjsip.c b/res/res_pjsip.c<br>index 7f4a7c9..368eb34 100644<br>--- a/res/res_pjsip.c<br>+++ b/res/res_pjsip.c<br>@@ -1313,12 +1313,17 @@<br> If <literal>0</literal> no timeout. Time in fractional seconds.<br> </para></description><br> </configOption><br>- <configOption name="authenticate_qualify" default="no"><br>- <synopsis>Authenticates a qualify request if needed</synopsis><br>- <description><para><br>- If true and a qualify request receives a challenge or authenticate response<br>+ <configOption name="authenticate_qualify"><br>+ <synopsis>Authenticates a qualify challenge response if needed</synopsis><br>+ <description><br>+ <para>If true and a qualify request receives a challenge response then<br> authentication is attempted before declaring the contact available.<br>- </para></description><br>+ </para><br>+ <note><para>This option does nothing as we will always complete<br>+ the challenge response authentication if the qualify request is<br>+ challenged.<br>+ </para></note><br>+ </description><br> </configOption><br> <configOption name="outbound_proxy"><br> <synopsis>Outbound proxy used when sending OPTIONS request</synopsis><br>@@ -1512,12 +1517,17 @@<br> If <literal>0</literal> no timeout. Time in fractional seconds.<br> </para></description><br> </configOption><br>- <configOption name="authenticate_qualify" default="no"><br>- <synopsis>Authenticates a qualify request if needed</synopsis><br>- <description><para><br>- If true and a qualify request receives a challenge or authenticate response<br>+ <configOption name="authenticate_qualify"><br>+ <synopsis>Authenticates a qualify challenge response if needed</synopsis><br>+ <description><br>+ <para>If true and a qualify request receives a challenge response then<br> authentication is attempted before declaring the contact available.<br>- </para></description><br>+ </para><br>+ <note><para>This option does nothing as we will always complete<br>+ the challenge response authentication if the qualify request is<br>+ challenged.<br>+ </para></note><br>+ </description><br> </configOption><br> <configOption name="outbound_proxy"><br> <synopsis>Outbound proxy used when sending OPTIONS request</synopsis><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8727">change 8727</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/8727"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3811de0014b1ffe96d4a3b49cddd5d4ca02ee5d4 </div>
<div style="display:none"> Gerrit-Change-Number: 8727 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.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: Sean Bright <sean.bright@gmail.com> </div>