[Asterisk-cvs] asterisk/res res_features.c,1.38,1.39

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv7538/res

Modified Files:
	res_features.c 
Log Message:
Merge "show features" (bug #3515)


Index: res_features.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_features.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- res_features.c	26 Jan 2005 06:19:13 -0000	1.38
+++ res_features.c	6 Feb 2005 23:36:35 -0000	1.39
@@ -1353,6 +1353,34 @@
 	return res;
 }
 
+static int handle_showfeatures(int fd, int argc, char *argv[])
+{
+	int i;
+	int fcount;
+	char format[] = "%-25s %-7s %-7s\n";
+
+	ast_cli(fd, format, "Feature", "Default", "Current");
+	ast_cli(fd, format, "-------", "-------", "-------");
+
+	ast_cli(fd, format, "Pickup", "*8", ast_pickup_ext());		/* default hardcoded above, so we'll hardcode it here */
+
+	fcount = sizeof(builtin_features) / sizeof(builtin_features[0]);
+
+	for (i = 0; i < fcount; i++)
+	{
+		ast_cli(fd, format, builtin_features[i].fname, builtin_features[i].default_exten, builtin_features[i].exten);
+	}
+
+	return RESULT_SUCCESS;
+}
+
+static char showfeatures_help[] =
+"Usage: show features\n"
+"       Lists currently configured features.\n";
+
+static struct ast_cli_entry showfeatures =
+{ { "show", "features", NULL }, handle_showfeatures, "Lists configured features", showfeatures_help };
+
 static int handle_parkedcalls(int fd, int argc, char *argv[])
 {
 	struct parkeduser *cur;
@@ -1520,6 +1548,7 @@
 	if ((res = load_config()))
 		return res;
 	ast_cli_register(&showparked);
+	ast_cli_register(&showfeatures);
 	ast_pthread_create(&parking_thread, NULL, do_parking_thread, NULL);
 	res = ast_register_application(parkedcall, park_exec, synopsis, descrip);
 	if (!res)
@@ -1571,6 +1600,7 @@
 	STANDARD_HANGUP_LOCALUSERS;
 
 	ast_manager_unregister( "ParkedCalls" );
+	ast_cli_unregister(&showfeatures);
 	ast_cli_unregister(&showparked);
 	ast_unregister_application(parkcall);
 	return ast_unregister_application(parkedcall);