diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-03 20:48:48 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2009-08-03 20:48:48 +0000 |
| commit | e9d22f802e5a3cbda4bc7ed868388ac189a75785 (patch) | |
| tree | b60a24dd99f31bac080dce420ea3d9242799ab0e /channels/chan_skinny.c | |
| parent | 070de85e5674e31000b332df63effb1251b9b65b (diff) | |
Rename 'canreinvite' option to 'directmedia', with backwards compatibility.
It is clear from multiple mailing list, forum, wiki and other sorts of posts
that users don't really understand the effects that the 'canreinvite' config
option actually has, and that in some cases they think that setting it to 'no'
will actually cause various other features (T.38, MOH, etc.) to not work properly,
when in fact this is not the case. This patch changes the proper name of the
option to what it should have been from the beginning ('directmedia'), but
preserves backwards compatibility for existing configurations.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@210190 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 6a82c74e5..edaf148d8 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1239,7 +1239,7 @@ struct skinny_subchannel { int immediate; \ int hookstate; \ int nat; \ - int canreinvite; \ + int directmedia; \ int prune; struct skinny_line { @@ -1265,7 +1265,7 @@ static struct skinny_line_options{ .hidecallerid = 0, .amaflags = 0, .instance = 0, - .canreinvite = 0, + .directmedia = 0, .nat = 0, .confcapability = AST_FORMAT_ULAW | AST_FORMAT_ALAW, .capability = 0, @@ -2689,7 +2689,7 @@ static enum ast_rtp_glue_result skinny_get_rtp_peer(struct ast_channel *c, struc l = sub->parent; - if (!l->canreinvite || l->nat){ + if (!l->directmedia || l->nat){ res = AST_RTP_GLUE_RESULT_LOCAL; if (skinnydebug) ast_verb(1, "skinny_get_rtp_peer() Using AST_RTP_GLUE_RESULT_LOCAL \n"); @@ -2749,7 +2749,7 @@ static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp_instance *r req->data.startmedia.conferenceId = htolel(sub->callid); req->data.startmedia.passThruPartyId = htolel(sub->callid); - if (!(l->canreinvite) || (l->nat)){ + if (!(l->directmedia) || (l->nat)){ ast_rtp_instance_get_local_address(rtp, &us); req->data.startmedia.remoteIp = htolel(d->ourip.s_addr); req->data.startmedia.remotePort = htolel(ntohs(us.sin_port)); @@ -6717,9 +6717,9 @@ static struct ast_channel *skinny_request(const char *type, int format, const st CLINE_OPTS->callwaiting = ast_true(v->value); continue; } - } else if (!strcasecmp(v->name, "canreinvite")) { + } else if (!strcasecmp(v->name, "directmedia") || !strcasecmp(v->name, "canreinvite")) { if (type & (TYPE_DEF_LINE | TYPE_LINE)) { - CLINE_OPTS->canreinvite = ast_true(v->value); + CLINE_OPTS->directmedia = ast_true(v->value); continue; } } else if (!strcasecmp(v->name, "nat")) { |