[Asterisk-code-review] res_pjsip: Adjust outgoing offer call pref. (asterisk[18])

[Joshua Colp]

Joshua Colp has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/15040 )


Change subject: res_pjsip: Adjust outgoing offer call pref.
......................................................................

res_pjsip: Adjust outgoing offer call pref.

This changes the outgoing offer call preference
default option to match the behavior of previous
versions of Asterisk.

ASTERISK-29109

Change-Id: Iad19347bd5f3d89900c15ecddfebf5e20950a1c2
---
M configs/samples/pjsip.conf.sample
M res/res_pjsip.c
M res/res_pjsip/pjsip_configuration.c
3 files changed, 4 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/40/15040/1

diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 506583e..881a037 100644
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -836,11 +836,11 @@
                            ; local list.
                            ; remote - Include all codecs in the remote list that
                            ; are also in the local list preserving remote list
-                           ; order. (default)
+                           ; order.
                            ; remote_merge - Include all codecs in BOTH lists
                            ; preserving the remote list order.  Codes in the
                            ; local list not in the remote list will be placed
-                           ; at the end of the joint list.
+                           ; at the end of the joint list. (default)
                            ; remote_first - Include only the first codec in
                            ; the remote list.
 ;codec_prefs_incoming_offer=; This is a string that describes how the codecs
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 9d3a6c2..c09d068 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -1214,7 +1214,7 @@
 						</enumlist>
 					</description>
 				</configOption>
-				<configOption name="outgoing_call_offer_pref" default="local">
+				<configOption name="outgoing_call_offer_pref" default="remote_merge">
 					<synopsis>Preferences for selecting codecs for an outgoing call.</synopsis>
 					<description>
 						<para>Based on this setting, a joint list of preferred codecs between
diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 344f319..80bad02 100644
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -2138,7 +2138,7 @@
 	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));
 	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "incoming_call_offer_pref", "local",
 		call_offer_pref_handler, incoming_call_offer_pref_to_str, NULL, 0, 0);
-	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "outgoing_call_offer_pref", "remote",
+	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "outgoing_call_offer_pref", "remote_merge",
 		call_offer_pref_handler, outgoing_call_offer_pref_to_str, NULL, 0, 0);
 	ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "codec_prefs_incoming_offer",
 		"prefer: pending, operation: intersect, keep: all, transcode: allow",

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15040
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: Iad19347bd5f3d89900c15ecddfebf5e20950a1c2
Gerrit-Change-Number: 15040
Gerrit-PatchSet: 1
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201006/91ea9017/attachment.html>