[svn-commits] junky: branch junky/cli-tls r201681 - /team/junky/cli-tls/main/pbx.c

[SVN commits to the Digium repositories]

Author: junky
Date: Thu Jun 18 11:54:45 2009
New Revision: 201681

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201681
Log:
playing around list, need to commit for my svnmerge init


Modified:
    team/junky/cli-tls/main/pbx.c

Modified: team/junky/cli-tls/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/junky/cli-tls/main/pbx.c?view=diff&rev=201681&r1=201680&r2=201681
==============================================================================
--- team/junky/cli-tls/main/pbx.c (original)
+++ team/junky/cli-tls/main/pbx.c Thu Jun 18 11:54:45 2009
@@ -783,12 +783,23 @@
 
 /* List of channels used for filtering */
 //AST_LIST_HEAD_NOLOCK(ast_channels, ast_channel);
-AST_LIST_HEAD_NOLOCK_STATIC(ast_channels, ast_channel);
+//AST_LIST_HEAD_NOLOCK_STATIC(ast_channels, ast_channel);
+
+AST_LIST_HEAD_NOLOCK(ast_channels, logger_filter_list_item);
+
+struct logger_filter_list_item {
+       struct ast_channel *channel;
+       AST_LIST_ENTRY(logger_filter_list_item) next;
+};
+
+
 AST_LIST_HEAD_NOLOCK_STATIC(ast_cli_filters, ast_channel);
 
+/*
 struct ast_logger_channels {
         struct ast_channels list;
 };
+*/
 
 
 /*!
@@ -3155,7 +3166,7 @@
                 return CLI_SHOWUSAGE;
         }
 
-        ast_cli(a->fd, "CLI Filters:\n--------------------------------------------------------------------------------\n");
+        ast_cli(a->fd, "Active CLI Filters:\n---------------------------------------------------------------------\n");
 
         AST_LIST_TRAVERSE(&ast_cli_filters, c, chan_list) {
 	//AST_LIST_TRAVERSE(&channels->list, c, chan_list) {
@@ -4997,16 +5008,18 @@
 	   PBX has finished running on the channel
 	 */
 	struct ast_channel *c = data;
-	struct ast_logger_channels *channels;
-
+	//struct ast_logger_channels *channels;
+	
 	ast_log(LOG_WARNING, "New thread started. (channel name=%s)\n", c->name);
+	/*
 	if ((channels = ast_threadstorage_get(&logger_channel, sizeof(*c)))) {
 		ast_log(LOG_WARNING, "Adding channel(%s) to channels_list\n", c->name);
-		AST_LIST_INSERT_HEAD(&channels->list, c, chan_list);
-		AST_RWLIST_INSERT_HEAD(&ast_channels, c, chan_list);	
+		//AST_LIST_INSERT_HEAD(&channels->list, c, chan_list);
+		//AST_RWLIST_INSERT_HEAD(&ast_channels, c, chan_list);	
 	} else {
 		ast_log(LOG_WARNING, "obj already exists\n");
 	}
+	*/
 
 	__ast_pbx_run(c, NULL);
 	decrease_call_count();