kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACN: Configuration renaming for pjsip endpoint

Browse Source 
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
This commit is contained in:
George Joseph
2020-07-21 08:17:54 -06:00
committed by Joshua Colp
parent deaa3742dc
commit a15e64aaf5
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configs/samples/pjsip.conf.sample
View File

@@ -843,7 +843,7 @@
; at the end of the joint list. ; at the end of the joint list.
; remote_first - Include only the first codec in ; remote_first - Include only the first codec in
; the remote list. ; 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 ; specified on an incoming SDP offer (pending) are
; reconciled with the codecs specified on an endpoint ; reconciled with the codecs specified on an endpoint
; (configured) before being sent to the Asterisk core. ; (configured) before being sent to the Asterisk core.
@@ -855,7 +855,7 @@
; | only_nonpreferred>, ; | only_nonpreferred>,
; keep: <first | all>, ; keep: <first | all>,
; transcode: <allow | prevent> ; 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 ; specified in the topology that comes from the
; Asterisk core (pending) are reconciled with the ; Asterisk core (pending) are reconciled with the
; codecs specified on an endpoint (configured) ; codecs specified on an endpoint (configured)
@@ -868,7 +868,7 @@
; | only_preferred | only_nonpreferred>, ; | only_preferred | only_nonpreferred>,
; keep: <first | all>, ; keep: <first | all>,
; transcode: <allow | prevent> ; 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) ; specified in an incoming SDP answer (pending)
; are reconciled with the codecs specified on an ; are reconciled with the codecs specified on an
; endpoint (configured) when receiving an SDP ; endpoint (configured) when receiving an SDP
@@ -880,7 +880,7 @@
; operation: <intersect | union ; operation: <intersect | union
; | only_preferred | only_nonpreferred>, ; | only_preferred | only_nonpreferred>,
; keep: <first | all> ; 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 ; that come from the core (pending) are reconciled
; with the codecs specified on an endpoint ; with the codecs specified on an endpoint
; (configured) when sending an SDP answer. ; (configured) when sending an SDP answer.

16
contrib/ast-db-manage/config/versions/b80485ff4dd0_add_pjsip_endpoint_acn_options.py
View File

@@ -16,14 +16,14 @@ import sqlalchemy as sa
max_value_length = 128 max_value_length = 128
def upgrade(): 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('codec_prefs_incoming_offer', 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('codec_prefs_outgoing_offer', 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('codec_prefs_incoming_answer', 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_outgoing_answer', sa.String(max_value_length)))
def downgrade(): def downgrade():
op.drop_column('ps_endpoints', 'incoming_offer_codecs_prefs') op.drop_column('ps_endpoints', 'codec_prefs_incoming_offer')
op.drop_column('ps_endpoints', 'outgoing_offer_codecs_prefs') op.drop_column('ps_endpoints', 'codec_prefs_outgoing_offer')
op.drop_column('ps_endpoints', 'incoming_answer_codecs_prefs') op.drop_column('ps_endpoints', 'codec_prefs_incoming_answer')
op.drop_column('ps_endpoints', 'outgoing_answer_codecs_prefs') op.drop_column('ps_endpoints', 'codec_prefs_outgoing_answer')

8
include/asterisk/res_pjsip.h
View File

@@ -804,13 +804,13 @@ struct ast_sip_endpoint_media_configuration {
/*! Codec preference for an outgoing offer */ /*! Codec preference for an outgoing offer */
struct ast_flags outgoing_call_offer_pref; struct ast_flags outgoing_call_offer_pref;
/*! Codec negotiation prefs for incoming offers */ /*! 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 */ /*! 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 */ /*! 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 */ /*! 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;
}; };
/*! /*!

16
res/res_pjsip.c
View File

@@ -102,7 +102,7 @@
<configOption name="allow"> <configOption name="allow">
<synopsis>Media Codec(s) to allow</synopsis> <synopsis>Media Codec(s) to allow</synopsis>
</configOption> </configOption>
<configOption name="incoming_offer_codec_prefs"> <configOption name="codec_prefs_incoming_offer">
<synopsis>Codec negotiation prefs for incoming offers.</synopsis> <synopsis>Codec negotiation prefs for incoming offers.</synopsis>
<description> <description>
<para> <para>
@@ -154,7 +154,7 @@
<para> <para>
</para> </para>
<example> <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> </example>
<para> <para>
Prefer the codecs coming from the caller. Use only the ones that are common. Prefer the codecs coming from the caller. Use only the ones that are common.
@@ -162,7 +162,7 @@
</para> </para>
</description> </description>
</configOption> </configOption>
<configOption name="outgoing_offer_codec_prefs"> <configOption name="codec_prefs_outgoing_offer">
<synopsis>Codec negotiation prefs for outgoing offers.</synopsis> <synopsis>Codec negotiation prefs for outgoing offers.</synopsis>
<description> <description>
<para> <para>
@@ -215,7 +215,7 @@
<para> <para>
</para> </para>
<example> <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> </example>
<para> <para>
Prefer the codecs coming from the endpoint. Merge them with the codecs from the core Prefer the codecs coming from the endpoint. Merge them with the codecs from the core
@@ -223,7 +223,7 @@
</para> </para>
</description> </description>
</configOption> </configOption>
<configOption name="incoming_answer_codec_prefs"> <configOption name="codec_prefs_incoming_answer">
<synopsis>Codec negotiation prefs for incoming answers.</synopsis> <synopsis>Codec negotiation prefs for incoming answers.</synopsis>
<description> <description>
<para> <para>
@@ -272,14 +272,14 @@
<para> <para>
</para> </para>
<example> <example>
incoming_answer_codec_prefs = keep: first codec_prefs_incoming_answer = keep: first
</example> </example>
<para> <para>
Use the defaults but keep oinly the first codec. Use the defaults but keep oinly the first codec.
</para> </para>
</description> </description>
</configOption> </configOption>
<configOption name="outgoing_answer_codec_prefs"> <configOption name="codec_prefs_outgoing_answer">
<synopsis>Codec negotiation prefs for outgoing answers.</synopsis> <synopsis>Codec negotiation prefs for outgoing answers.</synopsis>
<description> <description>
<para> <para>
@@ -328,7 +328,7 @@
<para> <para>
</para> </para>
<example> <example>
incoming_answer_codec_prefs = keep: first codec_prefs_incoming_answer = keep: first
</example> </example>
<para> <para>
Use the defaults but keep oinly the first codec. Use the defaults but keep oinly the first codec.

16
res/res_pjsip/pjsip_configuration.c
View File

@@ -1194,19 +1194,19 @@ static int codec_prefs_handler(const struct aco_option *opt,
var->name); var->name);
return -1; return -1;
} }
endpoint->media.incoming_offer_codec_prefs = prefs; endpoint->media.codec_prefs_incoming_offer = prefs;
default_prefer = CODEC_NEGOTIATION_PREFER_PENDING; default_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT; default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;
} else if (strcmp(var->name, "outgoing_offer_codec_prefs") == 0) { } 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_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
default_operation = CODEC_NEGOTIATION_OPERATION_UNION; default_operation = CODEC_NEGOTIATION_OPERATION_UNION;
} else if (strcmp(var->name, "incoming_answer_codec_prefs") == 0) { } 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_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT; default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT;
} else if (strcmp(var->name, "outgoing_answer_codec_prefs") == 0) { } 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_prefer = CODEC_NEGOTIATION_PREFER_PENDING;
default_operation = CODEC_NEGOTIATION_OPERATION_INTERSECT; 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) static int incoming_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
{ {
const struct ast_sip_endpoint *endpoint = obj; 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) static int outgoing_offer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
{ {
const struct ast_sip_endpoint *endpoint = obj; 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) static int incoming_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
{ {
const struct ast_sip_endpoint *endpoint = obj; 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) static int outgoing_answer_codec_prefs_to_str(const void *obj, const intptr_t *args, char **buf)
{ {
const struct ast_sip_endpoint *endpoint = obj; 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) static void *sip_nat_hook_alloc(const char *name)