From: Jason Parker <jparker@digium.com>
Date: Tue, 7 Sep 2010 21:21:49 +0000 (+0000)
Subject: Merged revisions 285369 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b6fac435b75988037b8756fd0a1a2b0d15b14e6;p=thirdparty%2Fasterisk.git

Merged revisions 285369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285369 | qwell | 2010-09-07 15:58:34 -0500 (Tue, 07 Sep 2010) | 7 lines

  Add note to 'sip show settings' regarding dual-stack support, and a :: bindaddress.

  (closes issue #17831)
  Reported by: oej
  Patches:
        17831-v6wildcardbind.diff uploaded by qwell (license 4)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e56f55126a..658462a250 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16813,6 +16813,10 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_
 	ast_cli(a->fd, "\n\nGlobal Settings:\n");
 	ast_cli(a->fd, "----------------\n");
 	ast_cli(a->fd, "  UDP Bindaddress:        %s\n", ast_sockaddr_stringify(&bindaddr));
+	if (ast_sockaddr_is_ipv6(&bindaddr) && ast_sockaddr_is_any(&bindaddr)) {
+		ast_cli(a->fd, "  ** Additional Info:\n");
+		ast_cli(a->fd, "     [::] may include IPv4 in addition to IPv6, if such a feature is enabled in the OS.\n");
+	}
 	ast_cli(a->fd, "  TCP SIP Bindaddress:    %s\n",
 		sip_cfg.tcp_enabled != FALSE ?
 				ast_sockaddr_stringify(&sip_tcp_desc.local_address) :