diff options
| -rw-r--r-- | include/asterisk/res_pjsip.h | 4 | ||||
| -rw-r--r-- | res/res_pjsip/pjsip_configuration.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_sdp_rtp.c | 4 | ||||
| -rw-r--r-- | res/res_pjsip_t38.c | 4 |
4 files changed, 7 insertions, 7 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 */ diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c index 14b122c22..c0a6acc4a 100644 --- a/res/res_pjsip/pjsip_configuration.c +++ b/res/res_pjsip/pjsip_configuration.c @@ -656,7 +656,7 @@ int ast_res_pjsip_initialize_configuration(void) ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "auth", "", inbound_auth_handler, NULL, 0, 0); ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "outbound_auth", "", outbound_auth_handler, NULL, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "aors", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, aors)); - ast_sorcery_object_field_register(sip_sorcery, "endpoint", "external_media_address", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.external_address)); + ast_sorcery_object_field_register(sip_sorcery, "endpoint", "media_address", "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct ast_sip_endpoint, media.address)); ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "identify_by", "username", ident_handler, NULL, 0, 0); ast_sorcery_object_field_register(sip_sorcery, "endpoint", "direct_media", "yes", OPT_BOOL_T, 1, FLDSET(struct ast_sip_endpoint, media.direct_media.enabled)); ast_sorcery_object_field_register_custom(sip_sorcery, "endpoint", "direct_media_method", "invite", direct_media_method_handler, NULL, 0, 0); diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index be5d59f06..4b0862114 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -889,7 +889,7 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as /* Add connection level details */ if (direct_media_enabled) { ast_copy_string(hostip, ast_sockaddr_stringify_fmt(&session_media->direct_media_addr, AST_SOCKADDR_STR_ADDR), sizeof(hostip)); - } else if (ast_strlen_zero(session->endpoint->media.external_address)) { + } else if (ast_strlen_zero(session->endpoint->media.address)) { pj_sockaddr localaddr; if (pj_gethostip(session->endpoint->media.rtp.ipv6 ? pj_AF_INET6() : pj_AF_INET(), &localaddr)) { @@ -897,7 +897,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; 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; |