summaryrefslogtreecommitdiff
path: root/include/asterisk
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2013-09-17 23:10:49 +0000
committerMark Michelson <mmichelson@digium.com>2013-09-17 23:10:49 +0000
commit391f0003c424947aba064839a8283160edbb6cd4 (patch)
tree6f2edd2ec343ec068387995b426d872b5701274d /include/asterisk
parent667fa56b1b9490d0aa70d1f9fecc04294eb1a193 (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 'include/asterisk')
-rw-r--r--include/asterisk/res_pjsip.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index df4ba7dec..354e8a7a5 100644
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -490,8 +490,8 @@ struct ast_sip_t38_configuration {
*/
struct ast_sip_endpoint_media_configuration {
AST_DECLARE_STRING_FIELDS(
- /*! Optional external media address to use in SDP */
- AST_STRING_FIELD(external_address);
+ /*! Optional media address to use in SDP */
+ AST_STRING_FIELD(address);
/*! SDP origin username */
AST_STRING_FIELD(sdpowner);
/*! SDP session name */