diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-03 20:58:48 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-03 20:58:48 +0000 |
| commit | 538f4ca207028ee047ffadc741278584c2ca43bc (patch) | |
| tree | 80d368e550777a4a58bfd45fded1fad152c9b5fc /channels/chan_skinny.c | |
| parent | b78e0c85c91f64adf0a9f023e302e9e38038d7b7 (diff) | |
Merged revisions 210190 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r210190 | kpfleming | 2009-08-03 15:48:48 -0500 (Mon, 03 Aug 2009) | 11 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@210191 f38db490-d61c-443f-a65b-d21fe96a405b
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 5f72ff310..864d52a92 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1182,7 +1182,7 @@ struct skinny_subchannel { int immediate; \ int hookstate; \ int nat; \ - int canreinvite; \ + int directmedia; \ int prune; struct skinny_line { @@ -1208,7 +1208,7 @@ 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, @@ -2593,7 +2593,7 @@ static enum ast_rtp_get_result skinny_get_rtp_peer(struct ast_channel *c, struct l = sub->parent; - if (!l->canreinvite || l->nat){ + if (!l->directmedia || l->nat){ res = AST_RTP_TRY_PARTIAL; if (skinnydebug) ast_verb(1, "skinny_get_rtp_peer() Using AST_RTP_TRY_PARTIAL \n"); @@ -2653,7 +2653,7 @@ static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp *rtp, struc 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_get_us(rtp, &us); req->data.startmedia.remoteIp = htolel(d->ourip.s_addr); req->data.startmedia.remotePort = htolel(ntohs(us.sin_port)); @@ -6631,9 +6631,9 @@ static struct ast_channel *skinny_request(const char *type, int format, void *da 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")) { |