kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip.c: Add 'rtpbindaddr' setting

Browse Source 
Users now have the ability to bind the rtpengine instance to a specific IP
address.  For example, you want chan_sip (call control) on eth0 but rtp (media)
on eth1.

ASTERISK-24280 #close
Reported by: Paul Belanger
Tested by: Paul Belanger
Review: https://reviewboard.asterisk.org/r/3952/
Patches:
    rtpengine.diff uploaded by Paul Belanger


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@422241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2014-08-28 16:06:55 +00:00
parent 327d67270f
commit ef28cc0d43
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@@ -12,7 +12,14 @@
--- Functionality changes from Asterisk 13 to Asterisk 14 --------------------
------------------------------------------------------------------------------
Channel Drivers
------------------
chan_sip
------------------
* New 'rtpbindaddr' global setting. This allows a user to define which
ipaddress to bind the rtpengine too. For example, chan_sip might bind
to eth0 (10.0.0.2) but rtpengine to eth1 (192.168.1.10).
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 12 to Asterisk 13 --------------------

17
channels/chan_sip.c
View File

@@ -1076,6 +1076,7 @@ static struct ast_sockaddr internip;
*/
static struct ast_sockaddr externaddr; /*!< External IP address if we are behind NAT */
static struct ast_sockaddr media_address; /*!< External RTP IP address if we are behind NAT */
static struct ast_sockaddr rtpbindaddr; /*!< RTP: The address we bind to */
static char externhost[MAXHOSTNAMELEN]; /*!< External host name */
static time_t externexpire; /*!< Expiration counter for re-resolving external host name in dynamic DNS */
@@ -5783,7 +5784,12 @@ static int dialog_initialize_rtp(struct sip_pvt *dialog)
return 0;
}
ast_sockaddr_copy(&bindaddr_tmp, &bindaddr);
if (!ast_sockaddr_isnull(&rtpbindaddr)) {
ast_sockaddr_copy(&bindaddr_tmp, &rtpbindaddr);
} else {
ast_sockaddr_copy(&bindaddr_tmp, &bindaddr);
}
if (!(dialog->rtp = ast_rtp_instance_new(dialog->engine, sched, &bindaddr_tmp, NULL))) {
return -1;
}
@@ -20858,6 +20864,10 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
default_tls_cfg.enabled != FALSE ?
ast_sockaddr_stringify(&sip_tls_desc.local_address) :
"Disabled");
ast_cli(a->fd, " RTP Bindaddress: %s\n",
!ast_sockaddr_isnull(&rtpbindaddr) ?
ast_sockaddr_stringify_addr(&rtpbindaddr) :
"Disabled");
ast_cli(a->fd, " Videosupport: %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[1], SIP_PAGE2_VIDEOSUPPORT)));
ast_cli(a->fd, " Textsupport: %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[1], SIP_PAGE2_TEXTSUPPORT)));
ast_cli(a->fd, " Ignore SDP sess. ver.: %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[1], SIP_PAGE2_IGNORESDPVERSION)));
@@ -31183,6 +31193,7 @@ static int reload_config(enum channelreloadreason reason)
memset(&localaddr, 0, sizeof(localaddr));
memset(&externaddr, 0, sizeof(externaddr));
memset(&media_address, 0, sizeof(media_address));
memset(&rtpbindaddr, 0, sizeof(rtpbindaddr));
memset(&sip_cfg.outboundproxy, 0, sizeof(struct sip_proxy));
sip_cfg.outboundproxy.force = FALSE; /*!< Don't force proxy usage, use route: headers */
default_transports = AST_TRANSPORT_UDP;
@@ -31646,6 +31657,10 @@ static int reload_config(enum channelreloadreason reason)
} else if (!strcasecmp(v->name, "media_address")) {
if (ast_parse_arg(v->value, PARSE_ADDR, &media_address))
ast_log(LOG_WARNING, "Invalid address for media_address keyword: %s\n", v->value);
} else if (!strcasecmp(v->name, "rtpbindaddr")) {
if (ast_parse_arg(v->value, PARSE_ADDR, &rtpbindaddr)) {
ast_log(LOG_WARNING, "Invalid address for rtpbindaddr keyword: %s\n", v->value);
}
} else if (!strcasecmp(v->name, "externaddr") || !strcasecmp(v->name, "externip")) {
if (ast_parse_arg(v->value, PARSE_ADDR, &externaddr)) {
ast_log(LOG_WARNING,

3
configs/samples/sip.conf.sample
View File

@@ -180,6 +180,9 @@ allowoverlap=no ; Disable overlap dialing support. (Default is y
udpbindaddr=0.0.0.0 ; IP address to bind UDP listen socket to (0.0.0.0 binds to all)
; Optionally add a port number, 192.168.1.1:5062 (default is port 5060)
;rtpbindaddr=172.16.42.1 ; IP address to bind RTP listen sock to (default is disabled). When
; disabled the udpbindaddr is used.
; When a dialog is started with another SIP endpoint, the other endpoint
; should include an Allow header telling us what SIP methods the endpoint
; implements. However, some endpoints either do not include an Allow header