diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-09-17 23:10:49 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-09-17 23:10:49 +0000 |
| commit | 391f0003c424947aba064839a8283160edbb6cd4 (patch) | |
| tree | 6f2edd2ec343ec068387995b426d872b5701274d /res/res_pjsip_t38.c | |
| parent | 667fa56b1b9490d0aa70d1f9fecc04294eb1a193 (diff) | |
Change the "external_media_address" PJSIP endpoint option to "media_address".
The endpoint option does not apply to communication with external entities. Rather,
the option is applied to all communications with the endpoint. The external_media_address
transport configuration option may override the endpoint option if it turns out that
we are going to be communicating with an external entity.
Two things of note:
1) I have not updated the XML documentation. This is being taken care of by Rusty as part
of his work on issue ASTERISK-22405
2) This commit is likely to cause testsuite failures since there are tests that use the
external_media_address endpoint option, and they will need to be changed over. Well, I'm
planning to get that updated ASAP after this commit.
(closes issue ASTERISK-22528)
reported by Rusty Newton
........
Merged revisions 399283 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_t38.c')
| -rw-r--r-- | res/res_pjsip_t38.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c index eb5d8eaec..2f36dfffb 100644 --- a/res/res_pjsip_t38.c +++ b/res/res_pjsip_t38.c @@ -671,7 +671,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as media->desc.media = pj_str(session_media->stream_type); media->desc.transport = STR_UDPTL; - if (ast_strlen_zero(session->endpoint->media.external_address)) { + if (ast_strlen_zero(session->endpoint->media.address)) { pj_sockaddr localaddr; if (pj_gethostip(session->endpoint->media.t38.ipv6 ? pj_AF_INET6() : pj_AF_INET(), &localaddr)) { @@ -679,7 +679,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as } pj_sockaddr_print(&localaddr, hostip, sizeof(hostip), 2); } else { - ast_copy_string(hostip, session->endpoint->media.external_address, sizeof(hostip)); + ast_copy_string(hostip, session->endpoint->media.address, sizeof(hostip)); } media->conn->net_type = STR_IN; |