[asterisk-commits] pabelanger: branch pabelanger/gtalk_show_settings r292701 - /team/pabelanger/...

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Thu Oct 21 18:19:34 2010
New Revision: 292701

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292701
Log:
Reorder output, add codecs.


Modified:
    team/pabelanger/gtalk_show_settings/channels/chan_gtalk.c

Modified: team/pabelanger/gtalk_show_settings/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/gtalk_show_settings/channels/chan_gtalk.c?view=diff&rev=292701&r1=292700&r2=292701
==============================================================================
--- team/pabelanger/gtalk_show_settings/channels/chan_gtalk.c (original)
+++ team/pabelanger/gtalk_show_settings/channels/chan_gtalk.c Thu Oct 21 18:19:34 2010
@@ -36,7 +36,6 @@
 	<depend>res_jabber</depend>
 	<use>openssl</use>
  ***/
-
 
 #include "asterisk.h"
 
@@ -1923,6 +1922,7 @@
 /*! \brief List global settings for the GoogleTalk channel */
 static char *gtalk_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
+	char codec_buf[BUFSIZ];
 	switch (cmd) {
 	case CLI_INIT:
 		e->command = "gtalk show settings";
@@ -1938,16 +1938,17 @@
 		return CLI_SHOWUSAGE;
 	}
 
-#define FORMAT "  %-25.25s  %-15.15s\n"
+#define FORMAT "  %-25.20s  %-15.30s\n"
 
 	ast_cli(a->fd, "\nGlobal Settings:\n");
 	ast_cli(a->fd, "----------------\n");
 	ast_cli(a->fd, FORMAT, "UDP Bindaddress:", ast_inet_ntoa(bindaddr.sin_addr));
-	ast_cli(a->fd, FORMAT, "Default Context:", default_context);
+	ast_cli(a->fd, FORMAT, "Stun Address:", ast_inet_ntoa(stunaddr.sin_addr)); 
 	ast_cli(a->fd, FORMAT, "External IP:", externip);
+	ast_cli(a->fd, FORMAT, "Context:", default_context);
+	ast_cli(a->fd, FORMAT, "Codecs:", ast_getformatname_multiple(codec_buf, sizeof(codec_buf) - 1, global_capability));
+	ast_cli(a->fd, FORMAT, "Parking Lot:", default_parkinglot);
 	ast_cli(a->fd, FORMAT, "Allow Guest:", AST_CLI_YESNO(default_allowguest));
-	ast_cli(a->fd, FORMAT, "Parking Lot:", default_parkinglot);
-	ast_cli(a->fd, FORMAT, "Stun Address:", ast_inet_ntoa(stunaddr.sin_addr)); 
 	ast_cli(a->fd, "\n----\n");
 
 	return CLI_SUCCESS;