[asterisk-commits] junky: branch junky/cli-tls r213042 - in /team/junky/cli-tls: channels/ main/

[SVN commits to the Asterisk project]

Author: junky
Date: Tue Aug 18 19:28:57 2009
New Revision: 213042

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213042
Log:
Adjust the documentation from the AMI for all Filter* commands.


Modified:
    team/junky/cli-tls/channels/chan_oss.c
    team/junky/cli-tls/main/logger.c
    team/junky/cli-tls/main/manager.c

Modified: team/junky/cli-tls/channels/chan_oss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/junky/cli-tls/channels/chan_oss.c?view=diff&rev=213042&r1=213041&r2=213042
==============================================================================
--- team/junky/cli-tls/channels/chan_oss.c (original)
+++ team/junky/cli-tls/channels/chan_oss.c Tue Aug 18 19:28:57 2009
@@ -823,7 +823,7 @@
 			ast_hangup(c);
 			o->owner = c = NULL;
 		}
-		ast_channel_threadassoc_del(c);
+		//ast_channel_threadassoc_del(c);
 	}
 	console_video_start(get_video_desc(c), c); /* XXX cleanup */
 

Modified: team/junky/cli-tls/main/logger.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/junky/cli-tls/main/logger.c?view=diff&rev=213042&r1=213041&r2=213042
==============================================================================
--- team/junky/cli-tls/main/logger.c (original)
+++ team/junky/cli-tls/main/logger.c Tue Aug 18 19:28:57 2009
@@ -61,6 +61,61 @@
 #if defined(__linux__) && !defined(__NR_gettid)
 #include <asm/unistd.h>
 #endif
+
+/*** DOCUMENTATION
+	<manager name="FilterAdd" language="en_US">
+		<synopsis>
+			Add a CLI Filter to the current list of active filters.
+		</synopsis>
+		<syntax>
+			<parameter name="Name" required="true">
+				<para>Name of the filter</para>
+			</parameter>
+			<parameter name="Type" required="true">
+				<para>Type of the filter
+				This can be: name, cid_num, accountcode</para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>Add a CLI filter. Will return Success/Failure.
+			For success returns, that filter is successfully added to the list.
+			For false returns, that filter is not added to the list</para>
+		</description>
+	</manager>
+	<manager name="FilterRemove" language="en_US">
+		<synopsis>
+			Remove a CLI filter from the current list of active filters
+		</synopsis>
+		<syntax>
+			<parameter name="Name" required="true">
+				<para>CLI filter name to remove.</para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>Remove a CLI filter. Will return Success/Failure.
+			For success returns, taht filter is sucessfully removed from the list
+			For false returns, that filter is not removed from the list</para>
+		</description>
+	</manager>
+	<manager name="FilterShow" language="en_US">
+		<synopsis>
+			List all active filters
+		</synopsis>
+		<syntax></syntax>
+		<description>
+			<para>List all CLI filters.</para>
+		</description>
+	</manager>
+	<manager name="FilterReset" language="en_US">
+		<synopsis>
+			Delete all active filters and return to normal mode.
+		</synopsis>
+		<syntax></syntax>
+		<description>
+			<para></para>
+		</description>
+	</manager>
+ ***/
 
 #if defined(__linux__) && defined(__NR_gettid)
 #define GETTID() syscall(__NR_gettid)
@@ -207,6 +262,7 @@
 AST_THREADSTORAGE(log_buf);
 #define LOG_BUF_INIT_SIZE       256
 
+
 struct ast_channels *channels;
 
 
@@ -1299,10 +1355,10 @@
 		ast_queue_log("NONE", "NONE", "NONE", "QUEUESTART", "%s", "");
 	}
 
-	res |= ast_manager_register_xml("FilterAdd", EVENT_FLAG_SYSTEM, action_filter_add);
-	res |= ast_manager_register_xml("FilterRemove", EVENT_FLAG_SYSTEM, action_filter_remove);
-	res |= ast_manager_register_xml("FilterShow", EVENT_FLAG_SYSTEM, action_filter_show);
-	res |= ast_manager_register_xml("FilterReset", EVENT_FLAG_SYSTEM, action_filter_reset);
+	res |= ast_manager_register_xml("FilterAdd",EVENT_FLAG_COMMAND, action_filter_add);
+	res |= ast_manager_register_xml("FilterRemove", EVENT_FLAG_COMMAND, action_filter_remove);
+	res |= ast_manager_register_xml("FilterShow", EVENT_FLAG_COMMAND, action_filter_show);
+	res |= ast_manager_register_xml("FilterReset", EVENT_FLAG_COMMAND, action_filter_reset);
 
 	return res;
 }

Modified: team/junky/cli-tls/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/junky/cli-tls/main/manager.c?view=diff&rev=213042&r1=213041&r2=213042
==============================================================================
--- team/junky/cli-tls/main/manager.c (original)
+++ team/junky/cli-tls/main/manager.c Tue Aug 18 19:28:57 2009
@@ -684,58 +684,6 @@
 		<description>
 			<para>Checks if Asterisk module is loaded. Will return Success/Failure.
 			For success returns, the module revision number is included.</para>
-		</description>
-	</manager>
-	<manager name="FilterAdd" language="en_US">
-		<synopsis>
-			Add a CLI Filter to the current list of active filters.
-		</synopsis>
-		<syntax>
-			<parameter name="Module" required="true">
-				<para>Asterisk module name (not including extension).</para>
-			</parameter>
-		</syntax>
-		<description>
-			<para></para>
-		</description>
-	</manager>
-	<manager name="FilterRemove" language="en_US">
-		<synopsis>
-			Check if module is loaded.
-		</synopsis>
-		<syntax>
-			<parameter name="Module" required="true">
-				<para>Asterisk module name (not including extension).</para>
-			</parameter>
-		</syntax>
-		<description>
-			<para></para>
-		</description>
-	</manager>
-	<manager name="FilterShow" language="en_US">
-		<synopsis>
-			List all active filters
-		</synopsis>
-		<syntax>
-			<parameter name="Module" required="true">
-				<para>Asterisk module name (not including extension).</para>
-			</parameter>
-		</syntax>
-		<description>
-			<para></para>
-		</description>
-	</manager>
-	<manager name="FilterReset" language="en_US">
-		<synopsis>
-			Delete all active filters and return to normal mode.
-		</synopsis>
-		<syntax>
-			<parameter name="Module" required="true">
-				<para>Asterisk module name (not including extension).</para>
-			</parameter>
-		</syntax>
-		<description>
-			<para></para>
 		</description>
 	</manager>
  ***/