ACN: Configuration renaming for pjsip endpoint

This change renames the codec preference endpoint options.
incoming_offer_codec_prefs becomes codec_prefs_incoming_offer
to keep the options together when showing an endpoint.

Change-Id: I6202965b4723777f22a83afcbbafcdafb1d11c8d

diff --git a/configs/samples/pjsip.conf.sample b/configs/samples/pjsip.conf.sample
index 2636f639d59e34cd054871fceb2b74e134e976c1..3c91664ffc1802850a00230c18851d264acecbf0 100644 (file)
--- a/configs/samples/pjsip.conf.sample
+++ b/configs/samples/pjsip.conf.sample
@@ -843,7 +843,7 @@
                            ; at the end of the joint list.
                            ; remote_first - Include only the first codec in
                            ; the remote list.
-;incoming_offer_codec_prefs=; This is a string that describes how the codecs
+;codec_prefs_incoming_offer=; This is a string that describes how the codecs
                             ; specified on an incoming SDP offer (pending) are
                             ; reconciled with the codecs specified on an endpoint
                             ; (configured) before being sent to the Asterisk core.
@@ -855,7 +855,7 @@
                             ;    | only_nonpreferred>,
                             ; keep: <first | all>,
                             ; transcode: <allow | prevent>
-;outgoing_offer_codec_prefs=; This is a string that describes how the codecs
+;codec_prefs_outgoing_offer=; This is a string that describes how the codecs
                             ; specified in the topology that comes from the
                             ; Asterisk core (pending) are reconciled with the
                             ; codecs specified on an endpoint (configured)
@@ -868,7 +868,7 @@
                             ;    | only_preferred | only_nonpreferred>,
                             ; keep: <first | all>,
                             ; transcode: <allow | prevent>
-;incoming_answer_codec_prefs=; This is a string that describes how the codecs
+;codec_prefs_incoming_answer=; This is a string that describes how the codecs
                              ; specified in an incoming SDP answer (pending)
                              ; are reconciled with the codecs specified on an
                              ; endpoint (configured) when receiving an SDP
@@ -880,7 +880,7 @@
                              ; operation: <intersect | union
                              ;    | only_preferred | only_nonpreferred>,
                              ; keep: <first | all>
-;outgoing_answer_codec_prefs=; This is a string that describes how the codecs
+;codec_prefs_outgoing_answer=; This is a string that describes how the codecs
                              ; that come from the core (pending) are reconciled
                              ; with the codecs specified on an endpoint
                              ; (configured) when sending an SDP answer.

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
index 241185a6a8d18acbf863d353ecf1967bf4ee3f3b..5e01204e011ffd733d2a7368e668fd9ac95a0d7f 100644 (file)
--- 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
@@ -16,14 +16,14 @@ import sqlalchemy as sa
 max_value_length = 128
 
 def upgrade():
-    op.add_column('ps_endpoints', sa.Column('incoming_offer_codec_prefs', sa.String(max_value_length)))
-    op.add_column('ps_endpoints', sa.Column('outgoing_offer_codec_prefs', sa.String(max_value_length)))
-    op.add_column('ps_endpoints', sa.Column('incoming_answer_codec_prefs', sa.String(max_value_length)))
-    op.add_column('ps_endpoints', sa.Column('outgoing_answer_codec_prefs', sa.String(max_value_length)))
+    op.add_column('ps_endpoints', sa.Column('codec_prefs_incoming_offer', sa.String(max_value_length)))
+    op.add_column('ps_endpoints', sa.Column('codec_prefs_outgoing_offer', sa.String(max_value_length)))
+    op.add_column('ps_endpoints', sa.Column('codec_prefs_incoming_answer', sa.String(max_value_length)))
+    op.add_column('ps_endpoints', sa.Column('codec_prefs_outgoing_answer', sa.String(max_value_length)))
 
 
 def downgrade():
-    op.drop_column('ps_endpoints', 'incoming_offer_codecs_prefs')
-    op.drop_column('ps_endpoints', 'outgoing_offer_codecs_prefs')
-    op.drop_column('ps_endpoints', 'incoming_answer_codecs_prefs')
-    op.drop_column('ps_endpoints', 'outgoing_answer_codecs_prefs')
+    op.drop_column('ps_endpoints', 'codec_prefs_incoming_offer')
+    op.drop_column('ps_endpoints', 'codec_prefs_outgoing_offer')
+    op.drop_column('ps_endpoints', 'codec_prefs_incoming_answer')
+    op.drop_column('ps_endpoints', 'codec_prefs_outgoing_answer')

diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index eaa9b210bc5b12e63c52e7d3b1c88626ee381a94..48da005875a889913140fcceae89a20f001a5950 100644 (file)
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -804,13 +804,13 @@ struct ast_sip_endpoint_media_configuration {
        /*! Codec preference for an outgoing offer */
        struct ast_flags outgoing_call_offer_pref;
        /*! Codec negotiation prefs for incoming offers */
-       struct ast_stream_codec_negotiation_prefs incoming_offer_codec_prefs;
+       struct ast_stream_codec_negotiation_prefs codec_prefs_incoming_offer;
        /*! Codec negotiation prefs for outgoing offers */
-       struct ast_stream_codec_negotiation_prefs outgoing_offer_codec_prefs;
+       struct ast_stream_codec_negotiation_prefs codec_prefs_outgoing_offer;
        /*! Codec negotiation prefs for incoming answers */
-       struct ast_stream_codec_negotiation_prefs incoming_answer_codec_prefs;
+       struct ast_stream_codec_negotiation_prefs codec_prefs_incoming_answer;
        /*! Codec negotiation prefs for outgoing answers */
-       struct ast_stream_codec_negotiation_prefs outgoing_answer_codec_prefs;
+       struct ast_stream_codec_negotiation_prefs codec_prefs_outgoing_answer;
 };
 
 /*!

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index bb77e549fa856718c52a4e5426b4f536d7b69346..d7655adde29ce77b65505b9c70ac12b859a761f1 100644 (file)
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -102,7 +102,7 @@
                                <configOption name="allow">
                                        <synopsis>Media Codec(s) to allow</synopsis>
                                </configOption>
-                               <configOption name="incoming_offer_codec_prefs">
+                               <configOption name="codec_prefs_incoming_offer">
                                        <synopsis>Codec negotiation prefs for incoming offers.</synopsis>
                                        <description>
                                                <para>
@@ -154,7 +154,7 @@
                                                <para>
                                                </para>
                                                <example>
-                                                       incoming_offer_codec_prefs = prefer: pending, operation: intersect, keep: all, transcode: allow
+                                                       codec_prefs_incoming_offer = prefer: pending, operation: intersect, keep: all, transcode: allow
                                                </example>
                                                <para>
                                                        Prefer the codecs coming from the caller.  Use only the ones that are common.
@@ -162,7 +162,7 @@
                                                </para>
                                        </description>
                                </configOption>
-                               <configOption name="outgoing_offer_codec_prefs">
+                               <configOption name="codec_prefs_outgoing_offer">
                                        <synopsis>Codec negotiation prefs for outgoing offers.</synopsis>
                                        <description>
                                                <para>
@@ -215,7 +215,7 @@
                                                <para>
                                                </para>
                                                <example>
-                                               outgoing_offer_codec_prefs = prefer: configured, operation: union, keep: first, transcode: prevent
+                                               codec_prefs_outgoing_offer = prefer: configured, operation: union, keep: first, transcode: prevent
                                                </example>
                                                <para>
                                                Prefer the codecs coming from the endpoint.  Merge them with the codecs from the core
@@ -223,7 +223,7 @@
                                                </para>
                                        </description>
                                </configOption>
-                               <configOption name="incoming_answer_codec_prefs">
+                               <configOption name="codec_prefs_incoming_answer">
                                        <synopsis>Codec negotiation prefs for incoming answers.</synopsis>
                                        <description>
                                                <para>
@@ -272,14 +272,14 @@
                                                <para>
                                                </para>
                                                <example>
-                                               incoming_answer_codec_prefs = keep: first
+                                               codec_prefs_incoming_answer = keep: first
                                                </example>
                                                <para>
                                                Use the defaults but keep oinly the first codec.
                                                </para>
                                        </description>
                                </configOption>
-                               <configOption name="outgoing_answer_codec_prefs">
+                               <configOption name="codec_prefs_outgoing_answer">
                                        <synopsis>Codec negotiation prefs for outgoing answers.</synopsis>
                                        <description>
                                                <para>
@@ -328,7 +328,7 @@
                                                <para>
                                                </para>
                                                <example>
-                                               incoming_answer_codec_prefs = keep: first
+                                               codec_prefs_incoming_answer = keep: first
                                                </example>
                                                <para>
                                                Use the defaults but keep oinly the first codec.

diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 89ae3e1a6f36890d53dccde1d547f26fe4f78dd8..20acdcf2c8692efbfa112fa61a71658a1c901223 100644 (file)
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -1194,19 +1194,19 @@ static int codec_prefs_handler(const struct aco_option *opt,
                                var->name);
                        return -1;
                }
-               endpoint->media.incoming_offer_codec_prefs = prefs;
+               endpoint->media.codec_prefs_incoming_offer = prefs;
                default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
                default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;
        } else if (strcmp(var->name, "outgoing_offer_codec_prefs") == 0) {
-               endpoint->media.outgoing_offer_codec_prefs = prefs;
+               endpoint->media.codec_prefs_outgoing_offer = prefs;
                default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
                default_operation = CODEC_NEGOTIATION_OPERATION_UNION;
        } else if (strcmp(var->name, "incoming_answer_codec_prefs") == 0) {
-               endpoint->media.incoming_answer_codec_prefs = prefs;
+               endpoint->media.codec_prefs_incoming_answer = prefs;
                default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
                default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;
        } else if (strcmp(var->name, "outgoing_answer_codec_prefs") == 0) {
-               endpoint->media.outgoing_answer_codec_prefs = prefs;
+               endpoint->media.codec_prefs_outgoing_answer = prefs;
                default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
                default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;
        }
@@ -1248,25 +1248,25 @@ static int codec_prefs_to_str(const struct ast_stream_codec_negotiation_prefs *p
 static int incoming_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
-       return codec_prefs_to_str(&endpoint->media.incoming_offer_codec_prefs, obj, args, buf);
+       return codec_prefs_to_str(&endpoint->media.codec_prefs_incoming_offer, obj, args, buf);
 }
 
 static int outgoing_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
-       return codec_prefs_to_str(&endpoint->media.outgoing_offer_codec_prefs, obj, args, buf);
+       return codec_prefs_to_str(&endpoint->media.codec_prefs_outgoing_offer, obj, args, buf);
 }
 
 static int incoming_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
-       return codec_prefs_to_str(&endpoint->media.incoming_answer_codec_prefs, obj, args, buf);
+       return codec_prefs_to_str(&endpoint->media.codec_prefs_incoming_answer, obj, args, buf);
 }
 
 static int outgoing_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
 {
        const struct ast_sip_endpoint *endpoint = obj;
-       return codec_prefs_to_str(&endpoint->media.outgoing_answer_codec_prefs, obj, args, buf);
+       return codec_prefs_to_str(&endpoint->media.codec_prefs_outgoing_answer, obj, args, buf);
 }
 
 static void *sip_nat_hook_alloc(const char *name)