[asterisk-commits] mjordan: trunk r408503 - in /trunk: ./ res/res_pjsip.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Feb 20 13:02:43 2014
New Revision: 408503

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=408503
Log:
res_pjsip: Update documentation for 'use_avpf' option

When 'use_avpf' is set to True, inbound offers must use the AVPF/SAVPF RTP
profile. However, when 'use_avpf' is set to False, Asterisk will accept
both AVP/SAVP or AVPF/SAVPF RTP profiles in inbound offers. The documentation
previously implied that Asterisk would reject AVPF/SAVPF if 'use_avpf' was
set to False and a UA offered said profile in an INVITE request.
........

Merged revisions 408502 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=408503&r1=408502&r2=408503
==============================================================================
--- trunk/res/res_pjsip.c (original)
+++ trunk/res/res_pjsip.c Thu Feb 20 13:02:43 2014
@@ -380,13 +380,14 @@
 					<synopsis>Determines whether res_pjsip will use and enforce usage of AVPF for this
 					endpoint.</synopsis>
 					<description><para>
-						If set to <literal>yes</literal>, res_pjsip will use use the AVPF or SAVPF RTP
+						If set to <literal>yes</literal>, res_pjsip will use the AVPF or SAVPF RTP
 						profile for all media offers on outbound calls and media updates and will
 						decline media offers not using the AVPF or SAVPF profile.
 					</para><para>
-						If set to <literal>no</literal>, res_pjsip will use use the AVP or SAVP RTP
-						profile for all media offers on outbound calls and media updates and will
-						decline media offers not using the AVP or SAVP profile.
+						If set to <literal>no</literal>, res_pjsip will use the AVP or SAVP RTP
+						profile for all media offers on outbound calls and media updates, but will
+						accept either the AVP/AVPF or SAVP/SAVPF RTP profile for all inbound
+						media offers.
 					</para></description>
 				</configOption>
 				<configOption name="media_encryption" default="no">