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 abd473b71d09c5fbba7d112a4e7f9b5b17c70e84..7fe149132729f956a7b3a186819dc3d33a03f155 100644 (file)
--- 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);