chan_sip.c: Add 'rtpbindaddr' setting

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

diff --git a/CHANGES b/CHANGES
index 456b5ccef588e303a3120907957745f5ec7c02d4..f8deb7bebcdfe1ac3e0fc444ad5fc089b57549ed 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 --------------------

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7a522e81768033e53330284941a21cd9c1254674..8b96f58869a60b5b66386fbfb87c5b5d269ad495 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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,

diff --git a/configs/samples/sip.conf.sample b/configs/samples/sip.conf.sample
index 0d81a6b63cec457778d50927b79a09f4471be893..e9d688ae0b44702a2148b2898052a758ca554f68 100644 (file)
--- a/configs/samples/sip.conf.sample
+++ b/configs/samples/sip.conf.sample
@@ -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