diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-04-06 06:53:51 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-04-06 06:53:51 -0500 |
| commit | 72a8e2106ea4f611a755da1a9c20f7bced300cce (patch) | |
| tree | f11a96232728dfc9d2073b9a5983a084b7908526 | |
| parent | 6774913e8235fe821ed2420368bbca4fbe62c51e (diff) | |
| parent | 71a67a98c40f1d1d89a4598d2b56fb348d1915ed (diff) | |
Merge "res_pjsip: Update authenticate_qualify documentation."
| -rw-r--r-- | include/asterisk/res_pjsip.h | 4 | ||||
| -rw-r--r-- | res/res_pjsip.c | 30 |
2 files changed, 22 insertions, 12 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index c017e62db..26439986b 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -263,7 +263,7 @@ struct ast_sip_contact { struct timeval expiration_time; /*! Frequency to send OPTIONS requests to contact. 0 is disabled. */ unsigned int qualify_frequency; - /*! If true authenticate the qualify if needed */ + /*! If true authenticate the qualify challenge response if needed */ int authenticate_qualify; /*! Qualify timeout. 0 is diabled. */ double qualify_timeout; @@ -346,7 +346,7 @@ struct ast_sip_aor { unsigned int default_expiration; /*! Frequency to send OPTIONS requests to AOR contacts. 0 is disabled. */ unsigned int qualify_frequency; - /*! If true authenticate the qualify if needed */ + /*! If true authenticate the qualify challenge response if needed */ int authenticate_qualify; /*! Maximum number of external contacts, 0 to disable */ unsigned int max_contacts; diff --git a/res/res_pjsip.c b/res/res_pjsip.c index 935a5598e..7c9929740 100644 --- a/res/res_pjsip.c +++ b/res/res_pjsip.c @@ -1366,12 +1366,17 @@ If <literal>0</literal> no timeout. Time in fractional seconds. </para></description> </configOption> - <configOption name="authenticate_qualify" default="no"> - <synopsis>Authenticates a qualify request if needed</synopsis> - <description><para> - If true and a qualify request receives a challenge or authenticate response + <configOption name="authenticate_qualify"> + <synopsis>Authenticates a qualify challenge response if needed</synopsis> + <description> + <para>If true and a qualify request receives a challenge response then authentication is attempted before declaring the contact available. - </para></description> + </para> + <note><para>This option does nothing as we will always complete + the challenge response authentication if the qualify request is + challenged. + </para></note> + </description> </configOption> <configOption name="outbound_proxy"> <synopsis>Outbound proxy used when sending OPTIONS request</synopsis> @@ -1565,12 +1570,17 @@ If <literal>0</literal> no timeout. Time in fractional seconds. </para></description> </configOption> - <configOption name="authenticate_qualify" default="no"> - <synopsis>Authenticates a qualify request if needed</synopsis> - <description><para> - If true and a qualify request receives a challenge or authenticate response + <configOption name="authenticate_qualify"> + <synopsis>Authenticates a qualify challenge response if needed</synopsis> + <description> + <para>If true and a qualify request receives a challenge response then authentication is attempted before declaring the contact available. - </para></description> + </para> + <note><para>This option does nothing as we will always complete + the challenge response authentication if the qualify request is + challenged. + </para></note> + </description> </configOption> <configOption name="outbound_proxy"> <synopsis>Outbound proxy used when sending OPTIONS request</synopsis> |