From: Olle Johansson <oej@edvina.net>
Date: Wed, 24 Jan 2007 09:42:31 +0000 (+0000)
Subject: Merged revisions 51931 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3371
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=273f1d78c7dce90f3c2551fe0421e878a66681eb;p=thirdparty%2Fasterisk.git

Merged revisions 51931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r51931 | oej | 2007-01-24 10:30:21 +0100 (Wed, 24 Jan 2007) | 3 lines

Show capabilities *and* preference in general settings in "sip show settings"
(reported by Clona/Telio - Thanks!)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index abd473b71d..7fe1491327 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10438,6 +10438,7 @@ static int sip_show_settings(int fd, int argc, char *argv[])
 {
 	int realtimepeers;
 	int realtimeusers;
+	char codec_buf[BUFSIZ];
 
 	realtimepeers = ast_check_realtime("sippeers");
 	realtimeusers = ast_check_realtime("sipusers");
@@ -10492,6 +10493,9 @@ static int sip_show_settings(int fd, int argc, char *argv[])
 	ast_cli(fd, "\nGlobal Signalling Settings:\n");
 	ast_cli(fd, "---------------------------\n");
 	ast_cli(fd, "  Codecs:                 ");
+	ast_getformatname_multiple(codec_buf, sizeof(codec_buf) -1, global_capability);
+	ast_cli(fd, "%s\n", codec_buf);
+	ast_cli(fd, "  Codec Order:            ");
 	print_codec_to_cli(fd, &default_prefs);
 	ast_cli(fd, "\n");
 	ast_cli(fd, "  T1 minimum:             %d\n", global_t1min);