<p>Joshua Colp has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15040">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_pjsip: Adjust outgoing offer call pref.<br><br>This changes the outgoing offer call preference<br>default option to match the behavior of previous<br>versions of Asterisk.<br><br>ASTERISK-29109<br><br>Change-Id: Iad19347bd5f3d89900c15ecddfebf5e20950a1c2<br>---<br>M configs/samples/pjsip.conf.sample<br>M res/res_pjsip.c<br>M res/res_pjsip/pjsip_configuration.c<br>3 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/40/15040/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample</span><br><span>index 506583e..881a037 100644</span><br><span>--- a/configs/samples/pjsip.conf.sample</span><br><span>+++ b/configs/samples/pjsip.conf.sample</span><br><span>@@ -836,11 +836,11 @@</span><br><span> ; local list.</span><br><span> ; remote - Include all codecs in the remote list that</span><br><span> ; are also in the local list preserving remote list</span><br><span style="color: hsl(0, 100%, 40%);">- ; order. (default)</span><br><span style="color: hsl(120, 100%, 40%);">+ ; order.</span><br><span> ; remote_merge - Include all codecs in BOTH lists</span><br><span> ; preserving the remote list order. Codes in the</span><br><span> ; local list not in the remote list will be placed</span><br><span style="color: hsl(0, 100%, 40%);">- ; at the end of the joint list.</span><br><span style="color: hsl(120, 100%, 40%);">+ ; at the end of the joint list. (default)</span><br><span> ; remote_first - Include only the first codec in</span><br><span> ; the remote list.</span><br><span> ;codec_prefs_incoming_offer=; This is a string that describes how the codecs</span><br><span>diff --git a/res/res_pjsip.c b/res/res_pjsip.c</span><br><span>index 9d3a6c2..c09d068 100644</span><br><span>--- a/res/res_pjsip.c</span><br><span>+++ b/res/res_pjsip.c</span><br><span>@@ -1214,7 +1214,7 @@</span><br><span> </enumlist></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(0, 100%, 40%);">- <configOption name="outgoing_call_offer_pref" default="local"></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="outgoing_call_offer_pref" default="remote_merge"></span><br><span> <synopsis>Preferences for selecting codecs for an outgoing call.</synopsis></span><br><span> <description></span><br><span> <para>Based on this setting, a joint list of preferred codecs between</span><br><span>diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c</span><br><span>index 344f319..80bad02 100644</span><br><span>--- a/res/res_pjsip/pjsip_configuration.c</span><br><span>+++ b/res/res_pjsip/pjsip_configuration.c</span><br><span>@@ -2138,7 +2138,7 @@</span><br><span> ast_sorcery_object_field_register(sip_sorcery, "endpoint", "ignore_183_without_sdp", "no", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, ignore_183_without_sdp));</span><br><span> ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "incoming_call_offer_pref", "local",</span><br><span> call_offer_pref_handler, incoming_call_offer_pref_to_str, NULL, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "outgoing_call_offer_pref", "remote",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "outgoing_call_offer_pref", "remote_merge",</span><br><span> call_offer_pref_handler, outgoing_call_offer_pref_to_str, NULL, 0, 0);</span><br><span> ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "codec_prefs_incoming_offer",</span><br><span> "prefer: pending, operation: intersect, keep: all, transcode: allow",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15040">change 15040</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/+/15040"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 18 </div>
<div style="display:none"> Gerrit-Change-Id: Iad19347bd5f3d89900c15ecddfebf5e20950a1c2 </div>
<div style="display:none"> Gerrit-Change-Number: 15040 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>