diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip.c | 30 | ||||
| -rw-r--r-- | res/res_rtp_asterisk.c | 3 |
2 files changed, 22 insertions, 11 deletions
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> diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index b010f6c51..c87e6fb77 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -5525,10 +5525,11 @@ static struct ast_frame *ast_rtcp_interpret(struct ast_rtp_instance *instance, c f = &transport_rtp->f; break; case RTCP_PT_FUR: - /* Handle RTCP FUR as FIR by setting the format to 4 */ + /* Handle RTCP FUR as FIR by setting the format to 4 */ rc = AST_RTP_RTCP_FMT_FIR; case RTCP_PT_PSFB: switch (rc) { + case AST_RTP_RTCP_FMT_PLI: case AST_RTP_RTCP_FMT_FIR: if (rtcp_debug_test_addr(addr)) { ast_verbose("Received an RTCP Fast Update Request\n"); |