kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDP: Add interface_address to specify our address to use.

Browse Source 
When we optionally set the interface_address we are forcing the media to
go out a specific interface address.  This allows us to optionally have
the media go out the interface that SIP signalling came in on or if we are
configured to have the media always go out a specific address.

Change-Id: I160d9fac322a075bd2557b430632544178196189
This commit is contained in:
Richard Mudgett
2017-05-05 14:30:40 -05:00
parent 3dae4279be
commit 16785c0908
4 changed files with 40 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
include/asterisk/sdp_options.h
View File

@@ -124,6 +124,26 @@ void ast_sdp_options_set_media_address(struct ast_sdp_options *options,
*/
const char *ast_sdp_options_get_media_address(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Set SDP Options interface_address
*
* \param options SDP Options
* \param interface_address
*/
void ast_sdp_options_set_interface_address(struct ast_sdp_options *options,
const char *interface_address);
/*!
* \since 15.0.0
* \brief Get SDP Options interface_address
*
* \param options SDP Options
*
* \returns interface_address
*/
const char *ast_sdp_options_get_interface_address(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Set SDP Options sdpowner
@@ -184,26 +204,6 @@ void ast_sdp_options_set_rtp_engine(struct ast_sdp_options *options,
*/
const char *ast_sdp_options_get_rtp_engine(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Set SDP Options bind_rtp_to_media_address
*
* \param options SDP Options
* \param bind_rtp_to_media_address
*/
void ast_sdp_options_set_bind_rtp_to_media_address(struct ast_sdp_options *options,
unsigned int bind_rtp_to_media_address);
/*!
* \since 15.0.0
* \brief Get SDP Options bind_rtp_to_media_address
*
* \param options SDP Options
*
* \returns bind_rtp_to_media_address
*/
unsigned int ast_sdp_options_get_bind_rtp_to_media_address(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Set SDP Options rtp_symmetric
@@ -503,26 +503,6 @@ void ast_sdp_options_set_udptl_far_max_datagram(struct ast_sdp_options *options,
*/
unsigned int ast_sdp_options_get_udptl_far_max_datagram(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Set SDP Options bind_udptl_to_media_address
*
* \param options SDP Options
* \param bind_udptl_to_media_address
*/
void ast_sdp_options_set_bind_udptl_to_media_address(struct ast_sdp_options *options,
unsigned int bind_udptl_to_media_address);
/*!
* \since 15.0.0
* \brief Get SDP Options bind_udptl_to_media_address
*
* \param options SDP Options
*
* \returns bind_udptl_to_media_address
*/
unsigned int ast_sdp_options_get_bind_udptl_to_media_address(const struct ast_sdp_options *options);
/*!
* \since 15.0.0
* \brief Enable setting SSRC level attributes on SDPs

3
main/sdp_options.c
View File

@@ -55,12 +55,11 @@ type ast_sdp_options_get_##field(const struct ast_sdp_options *options) \
} \
DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(media_address, 0);
DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(interface_address, 0);
DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(sdpowner, 0);
DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(sdpsession, 0);
DEFINE_STRINGFIELD_GETTERS_SETTERS_FOR(rtp_engine, 0);
DEFINE_GETTERS_SETTERS_FOR(unsigned int, bind_rtp_to_media_address);
DEFINE_GETTERS_SETTERS_FOR(unsigned int, bind_udptl_to_media_address);
DEFINE_GETTERS_SETTERS_FOR(unsigned int, rtp_symmetric);
DEFINE_GETTERS_SETTERS_FOR(unsigned int, udptl_symmetric);
DEFINE_GETTERS_SETTERS_FOR(enum ast_t38_ec_modes, udptl_error_correction);

6
main/sdp_private.h
View File

@@ -24,8 +24,10 @@
struct ast_sdp_options {
AST_DECLARE_STRING_FIELDS(
/*! Optional media address to use in SDP */
/*! Media address to use in SDP */
AST_STRING_FIELD(media_address);
/*! Optional address of the interface media should use. */
AST_STRING_FIELD(interface_address);
/*! SDP origin username */
AST_STRING_FIELD(sdpowner);
/*! SDP session name */
@@ -34,8 +36,6 @@ struct ast_sdp_options {
AST_STRING_FIELD(rtp_engine);
);
struct {
unsigned int bind_rtp_to_media_address:1;
unsigned int bind_udptl_to_media_address:1;
unsigned int rtp_symmetric:1;
unsigned int udptl_symmetric:1;
unsigned int rtp_ipv6:1;

23
main/sdp_state.c
View File

@@ -150,13 +150,15 @@ static struct ast_rtp_instance *create_rtp(const struct ast_sdp_options *options
{
struct ast_rtp_instance *rtp;
struct ast_rtp_engine_ice *ice;
struct ast_sockaddr temp_media_address;
static struct ast_sockaddr address_rtp;
struct ast_sockaddr *media_address = &address_rtp;
if (options->bind_rtp_to_media_address && !ast_strlen_zero(options->media_address)) {
ast_sockaddr_parse(&temp_media_address, options->media_address, 0);
media_address = &temp_media_address;
if (!ast_strlen_zero(options->interface_address)) {
if (!ast_sockaddr_parse(&address_rtp, options->interface_address, 0)) {
ast_log(LOG_ERROR, "Attempted to bind RTP to invalid media address: %s\n",
options->interface_address);
return NULL;
}
} else {
if (ast_check_ipv6()) {
ast_sockaddr_parse(&address_rtp, "::", 0);
@@ -165,7 +167,8 @@ static struct ast_rtp_instance *create_rtp(const struct ast_sdp_options *options
}
}
if (!(rtp = ast_rtp_instance_new(options->rtp_engine, sched, media_address, NULL))) {
rtp = ast_rtp_instance_new(options->rtp_engine, sched, media_address, NULL);
if (!rtp) {
ast_log(LOG_ERROR, "Unable to create RTP instance using RTP engine '%s'\n",
options->rtp_engine);
return NULL;
@@ -204,13 +207,15 @@ static struct ast_rtp_instance *create_rtp(const struct ast_sdp_options *options
static struct sdp_state_udptl *create_udptl(const struct ast_sdp_options *options)
{
struct sdp_state_udptl *udptl;
struct ast_sockaddr temp_media_address;
static struct ast_sockaddr address_udptl;
struct ast_sockaddr *media_address = &address_udptl;
if (options->bind_udptl_to_media_address && !ast_strlen_zero(options->media_address)) {
ast_sockaddr_parse(&temp_media_address, options->media_address, 0);
media_address = &temp_media_address;
if (!ast_strlen_zero(options->interface_address)) {
if (!ast_sockaddr_parse(&address_udptl, options->interface_address, 0)) {
ast_log(LOG_ERROR, "Attempted to bind UDPTL to invalid media address: %s\n",
options->interface_address);
return NULL;
}
} else {
if (ast_check_ipv6()) {
ast_sockaddr_parse(&address_udptl, "::", 0);