<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14689">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
Kevin Harwell: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ACN: Configuration renaming for pjsip endpoint<br><br>This change renames the codec preference endpoint options.<br>incoming_offer_codec_prefs becomes codec_prefs_incoming_offer<br>to keep the options together when showing an endpoint.<br><br>Change-Id: I6202965b4723777f22a83afcbbafcdafb1d11c8d<br>---<br>M configs/samples/pjsip.conf.sample<br>M contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py<br>M include/asterisk/res_pjsip.h<br>M res/res_pjsip.c<br>M res/res_pjsip/pjsip_configuration.c<br>5 files changed, 32 insertions(+), 32 deletions(-)<br><br></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 2636f63..3c91664 100644</span><br><span>--- a/configs/samples/pjsip.conf.sample</span><br><span>+++ b/configs/samples/pjsip.conf.sample</span><br><span>@@ -843,7 +843,7 @@</span><br><span> ; at the end of the joint list.</span><br><span> ; remote_first - Include only the first codec in</span><br><span> ; the remote list.</span><br><span style="color: hsl(0, 100%, 40%);">-;incoming_offer_codec_prefs=; This is a string that describes how the codecs</span><br><span style="color: hsl(120, 100%, 40%);">+;codec_prefs_incoming_offer=; This is a string that describes how the codecs</span><br><span> ; specified on an incoming SDP offer (pending) are</span><br><span> ; reconciled with the codecs specified on an endpoint</span><br><span> ; (configured) before being sent to the Asterisk core.</span><br><span>@@ -855,7 +855,7 @@</span><br><span> ; | only_nonpreferred>,</span><br><span> ; keep: <first | all>,</span><br><span> ; transcode: <allow | prevent></span><br><span style="color: hsl(0, 100%, 40%);">-;outgoing_offer_codec_prefs=; This is a string that describes how the codecs</span><br><span style="color: hsl(120, 100%, 40%);">+;codec_prefs_outgoing_offer=; This is a string that describes how the codecs</span><br><span> ; specified in the topology that comes from the</span><br><span> ; Asterisk core (pending) are reconciled with the</span><br><span> ; codecs specified on an endpoint (configured)</span><br><span>@@ -868,7 +868,7 @@</span><br><span> ; | only_preferred | only_nonpreferred>,</span><br><span> ; keep: <first | all>,</span><br><span> ; transcode: <allow | prevent></span><br><span style="color: hsl(0, 100%, 40%);">-;incoming_answer_codec_prefs=; This is a string that describes how the codecs</span><br><span style="color: hsl(120, 100%, 40%);">+;codec_prefs_incoming_answer=; This is a string that describes how the codecs</span><br><span> ; specified in an incoming SDP answer (pending)</span><br><span> ; are reconciled with the codecs specified on an</span><br><span> ; endpoint (configured) when receiving an SDP</span><br><span>@@ -880,7 +880,7 @@</span><br><span> ; operation: <intersect | union</span><br><span> ; | only_preferred | only_nonpreferred>,</span><br><span> ; keep: <first | all></span><br><span style="color: hsl(0, 100%, 40%);">-;outgoing_answer_codec_prefs=; This is a string that describes how the codecs</span><br><span style="color: hsl(120, 100%, 40%);">+;codec_prefs_outgoing_answer=; This is a string that describes how the codecs</span><br><span> ; that come from the core (pending) are reconciled</span><br><span> ; with the codecs specified on an endpoint</span><br><span> ; (configured) when sending an SDP answer.</span><br><span>diff --git a/contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py b/contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py</span><br><span>index 241185a..5e01204 100644</span><br><span>--- a/contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py</span><br><span>+++ b/contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py</span><br><span>@@ -16,14 +16,14 @@</span><br><span> max_value_length = 128</span><br><span> </span><br><span> def upgrade():</span><br><span style="color: hsl(0, 100%, 40%);">- op.add_column('ps_endpoints', sa.Column('incoming_offer_codec_prefs', sa.String(max_value_length)))</span><br><span style="color: hsl(0, 100%, 40%);">- op.add_column('ps_endpoints', sa.Column('outgoing_offer_codec_prefs', sa.String(max_value_length)))</span><br><span style="color: hsl(0, 100%, 40%);">- op.add_column('ps_endpoints', sa.Column('incoming_answer_codec_prefs', sa.String(max_value_length)))</span><br><span style="color: hsl(0, 100%, 40%);">- op.add_column('ps_endpoints', sa.Column('outgoing_answer_codec_prefs', sa.String(max_value_length)))</span><br><span style="color: hsl(120, 100%, 40%);">+ op.add_column('ps_endpoints', sa.Column('codec_prefs_incoming_offer', sa.String(max_value_length)))</span><br><span style="color: hsl(120, 100%, 40%);">+ op.add_column('ps_endpoints', sa.Column('codec_prefs_outgoing_offer', sa.String(max_value_length)))</span><br><span style="color: hsl(120, 100%, 40%);">+ op.add_column('ps_endpoints', sa.Column('codec_prefs_incoming_answer', sa.String(max_value_length)))</span><br><span style="color: hsl(120, 100%, 40%);">+ op.add_column('ps_endpoints', sa.Column('codec_prefs_outgoing_answer', sa.String(max_value_length)))</span><br><span> </span><br><span> </span><br><span> def downgrade():</span><br><span style="color: hsl(0, 100%, 40%);">- op.drop_column('ps_endpoints', 'incoming_offer_codecs_prefs')</span><br><span style="color: hsl(0, 100%, 40%);">- op.drop_column('ps_endpoints', 'outgoing_offer_codecs_prefs')</span><br><span style="color: hsl(0, 100%, 40%);">- op.drop_column('ps_endpoints', 'incoming_answer_codecs_prefs')</span><br><span style="color: hsl(0, 100%, 40%);">- op.drop_column('ps_endpoints', 'outgoing_answer_codecs_prefs')</span><br><span style="color: hsl(120, 100%, 40%);">+ op.drop_column('ps_endpoints', 'codec_prefs_incoming_offer')</span><br><span style="color: hsl(120, 100%, 40%);">+ op.drop_column('ps_endpoints', 'codec_prefs_outgoing_offer')</span><br><span style="color: hsl(120, 100%, 40%);">+ op.drop_column('ps_endpoints', 'codec_prefs_incoming_answer')</span><br><span style="color: hsl(120, 100%, 40%);">+ op.drop_column('ps_endpoints', 'codec_prefs_outgoing_answer')</span><br><span>diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h</span><br><span>index eaa9b21..48da005 100644</span><br><span>--- a/include/asterisk/res_pjsip.h</span><br><span>+++ b/include/asterisk/res_pjsip.h</span><br><span>@@ -804,13 +804,13 @@</span><br><span> /*! Codec preference for an outgoing offer */</span><br><span> struct ast_flags outgoing_call_offer_pref;</span><br><span> /*! Codec negotiation prefs for incoming offers */</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_stream_codec_negotiation_prefs incoming_offer_codec_prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_stream_codec_negotiation_prefs codec_prefs_incoming_offer;</span><br><span> /*! Codec negotiation prefs for outgoing offers */</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_stream_codec_negotiation_prefs outgoing_offer_codec_prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_stream_codec_negotiation_prefs codec_prefs_outgoing_offer;</span><br><span> /*! Codec negotiation prefs for incoming answers */</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_stream_codec_negotiation_prefs incoming_answer_codec_prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_stream_codec_negotiation_prefs codec_prefs_incoming_answer;</span><br><span> /*! Codec negotiation prefs for outgoing answers */</span><br><span style="color: hsl(0, 100%, 40%);">- struct ast_stream_codec_negotiation_prefs outgoing_answer_codec_prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ast_stream_codec_negotiation_prefs codec_prefs_outgoing_answer;</span><br><span> };</span><br><span> </span><br><span> /*!</span><br><span>diff --git a/res/res_pjsip.c b/res/res_pjsip.c</span><br><span>index bb77e54..d7655ad 100644</span><br><span>--- a/res/res_pjsip.c</span><br><span>+++ b/res/res_pjsip.c</span><br><span>@@ -102,7 +102,7 @@</span><br><span> <configOption name="allow"></span><br><span> <synopsis>Media Codec(s) to allow</synopsis></span><br><span> </configOption></span><br><span style="color: hsl(0, 100%, 40%);">- <configOption name="incoming_offer_codec_prefs"></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="codec_prefs_incoming_offer"></span><br><span> <synopsis>Codec negotiation prefs for incoming offers.</synopsis></span><br><span> <description></span><br><span> <para></span><br><span>@@ -154,7 +154,7 @@</span><br><span> <para></span><br><span> </para></span><br><span> <example></span><br><span style="color: hsl(0, 100%, 40%);">- incoming_offer_codec_prefs = prefer: pending, operation: intersect, keep: all, transcode: allow</span><br><span style="color: hsl(120, 100%, 40%);">+ codec_prefs_incoming_offer = prefer: pending, operation: intersect, keep: all, transcode: allow</span><br><span> </example></span><br><span> <para></span><br><span> Prefer the codecs coming from the caller. Use only the ones that are common.</span><br><span>@@ -162,7 +162,7 @@</span><br><span> </para></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(0, 100%, 40%);">- <configOption name="outgoing_offer_codec_prefs"></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="codec_prefs_outgoing_offer"></span><br><span> <synopsis>Codec negotiation prefs for outgoing offers.</synopsis></span><br><span> <description></span><br><span> <para></span><br><span>@@ -215,7 +215,7 @@</span><br><span> <para></span><br><span> </para></span><br><span> <example></span><br><span style="color: hsl(0, 100%, 40%);">- outgoing_offer_codec_prefs = prefer: configured, operation: union, keep: first, transcode: prevent</span><br><span style="color: hsl(120, 100%, 40%);">+ codec_prefs_outgoing_offer = prefer: configured, operation: union, keep: first, transcode: prevent</span><br><span> </example></span><br><span> <para></span><br><span> Prefer the codecs coming from the endpoint. Merge them with the codecs from the core</span><br><span>@@ -223,7 +223,7 @@</span><br><span> </para></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(0, 100%, 40%);">- <configOption name="incoming_answer_codec_prefs"></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="codec_prefs_incoming_answer"></span><br><span> <synopsis>Codec negotiation prefs for incoming answers.</synopsis></span><br><span> <description></span><br><span> <para></span><br><span>@@ -272,14 +272,14 @@</span><br><span> <para></span><br><span> </para></span><br><span> <example></span><br><span style="color: hsl(0, 100%, 40%);">- incoming_answer_codec_prefs = keep: first</span><br><span style="color: hsl(120, 100%, 40%);">+ codec_prefs_incoming_answer = keep: first</span><br><span> </example></span><br><span> <para></span><br><span> Use the defaults but keep oinly the first codec.</span><br><span> </para></span><br><span> </description></span><br><span> </configOption></span><br><span style="color: hsl(0, 100%, 40%);">- <configOption name="outgoing_answer_codec_prefs"></span><br><span style="color: hsl(120, 100%, 40%);">+ <configOption name="codec_prefs_outgoing_answer"></span><br><span> <synopsis>Codec negotiation prefs for outgoing answers.</synopsis></span><br><span> <description></span><br><span> <para></span><br><span>@@ -328,7 +328,7 @@</span><br><span> <para></span><br><span> </para></span><br><span> <example></span><br><span style="color: hsl(0, 100%, 40%);">- incoming_answer_codec_prefs = keep: first</span><br><span style="color: hsl(120, 100%, 40%);">+ codec_prefs_incoming_answer = keep: first</span><br><span> </example></span><br><span> <para></span><br><span> Use the defaults but keep oinly the first codec.</span><br><span>diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c</span><br><span>index 89ae3e1..20acdcf 100644</span><br><span>--- a/res/res_pjsip/pjsip_configuration.c</span><br><span>+++ b/res/res_pjsip/pjsip_configuration.c</span><br><span>@@ -1194,19 +1194,19 @@</span><br><span> var->name);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- endpoint->media.incoming_offer_codec_prefs = prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint->media.codec_prefs_incoming_offer = prefs;</span><br><span> default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;</span><br><span> default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;</span><br><span> } else if (strcmp(var->name, "outgoing_offer_codec_prefs") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- endpoint->media.outgoing_offer_codec_prefs = prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint->media.codec_prefs_outgoing_offer = prefs;</span><br><span> default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;</span><br><span> default_operation = CODEC_NEGOTIATION_OPERATION_UNION;</span><br><span> } else if (strcmp(var->name, "incoming_answer_codec_prefs") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- endpoint->media.incoming_answer_codec_prefs = prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint->media.codec_prefs_incoming_answer = prefs;</span><br><span> default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;</span><br><span> default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;</span><br><span> } else if (strcmp(var->name, "outgoing_answer_codec_prefs") == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- endpoint->media.outgoing_answer_codec_prefs = prefs;</span><br><span style="color: hsl(120, 100%, 40%);">+ endpoint->media.codec_prefs_outgoing_answer = prefs;</span><br><span> default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;</span><br><span> default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;</span><br><span> }</span><br><span>@@ -1248,25 +1248,25 @@</span><br><span> static int incoming_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct ast_sip_endpoint *endpoint = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return codec_prefs_to_str(&endpoint->media.incoming_offer_codec_prefs, obj, args, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return codec_prefs_to_str(&endpoint->media.codec_prefs_incoming_offer, obj, args, buf);</span><br><span> }</span><br><span> </span><br><span> static int outgoing_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct ast_sip_endpoint *endpoint = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return codec_prefs_to_str(&endpoint->media.outgoing_offer_codec_prefs, obj, args, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return codec_prefs_to_str(&endpoint->media.codec_prefs_outgoing_offer, obj, args, buf);</span><br><span> }</span><br><span> </span><br><span> static int incoming_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct ast_sip_endpoint *endpoint = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return codec_prefs_to_str(&endpoint->media.incoming_answer_codec_prefs, obj, args, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return codec_prefs_to_str(&endpoint->media.codec_prefs_incoming_answer, obj, args, buf);</span><br><span> }</span><br><span> </span><br><span> static int outgoing_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)</span><br><span> {</span><br><span> const struct ast_sip_endpoint *endpoint = obj;</span><br><span style="color: hsl(0, 100%, 40%);">- return codec_prefs_to_str(&endpoint->media.outgoing_answer_codec_prefs, obj, args, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ return codec_prefs_to_str(&endpoint->media.codec_prefs_outgoing_answer, obj, args, buf);</span><br><span> }</span><br><span> </span><br><span> static void *sip_nat_hook_alloc(const char *name)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14689">change 14689</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/+/14689"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6202965b4723777f22a83afcbbafcdafb1d11c8d </div>
<div style="display:none"> Gerrit-Change-Number: 14689 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>