[asterisk-commits] oej: trunk r51933 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Jan 24 03:42:31 2007
New Revision: 51933

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51933
Log:
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!)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=51933&r1=51932&r2=51933
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jan 24 03:42:31 2007
@@ -10438,6 +10438,7 @@
 {
 	int realtimepeers;
 	int realtimeusers;
+	char codec_buf[BUFSIZ];
 
 	realtimepeers = ast_check_realtime("sippeers");
 	realtimeusers = ast_check_realtime("sipusers");
@@ -10492,6 +10493,9 @@
 	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);