[asterisk-commits] irroot: trunk r338996 - in /trunk: ./ addons/chan_ooh323.c funcs/func_channel.c

[SVN commits to the Asterisk project]

Author: irroot
Date: Mon Oct  3 09:24:45 2011
New Revision: 338996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=338996
Log:
Merged revisions 338995 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338995 | irroot | 2011-10-03 16:21:40 +0200 (Mon, 03 Oct 2011) | 6 lines
  
  Remove the channel function OOH323() and place its options into
  CHANNEL()
  
  channel drivers should not have there own dialplan functions.
........

Modified:
    trunk/   (props changed)
    trunk/addons/chan_ooh323.c
    trunk/funcs/func_channel.c

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

Modified: trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/chan_ooh323.c?view=diff&rev=338996&r1=338995&r2=338996
==============================================================================
--- trunk/addons/chan_ooh323.c (original)
+++ trunk/addons/chan_ooh323.c Mon Oct  3 09:24:45 2011
@@ -25,42 +25,6 @@
 #include "chan_ooh323.h"
 #include <math.h>
 
-/*** DOCUMENTATION
-	<function name="OOH323" language="en_US">
-		<synopsis>
-			Allow Setting / Reading OOH323 Settings
-		</synopsis>
-		<syntax>
-			<parameter name="name" required="true">
-				<enumlist>
-					<enum name="faxdetect">
-						<para>Fax Detect [R/W]</para>
-						<para>Returns 0 or 1</para>
-						<para>Write yes or no</para>
-					</enum>
-				</enumlist>
-				<enumlist>
-					<enum name="t38support">
-						<para>t38support [R/W]</para>
-						<para>Returns 0 or 1</para>
-						<para>Write yes or no</para>
-					</enum>
-				</enumlist>
-				<enumlist>
-					<enum name="h323id">
-						<para>Returns h323id [R]</para>
-					</enum>
-				</enumlist>
-			</parameter>
-		</syntax>
-		<description>
-			<para>Read and set channel parameters in the dialplan.
-			<replaceable>name</replaceable> is one of the above only those with a [W] can be writen to.
-			</para>
-		</description>
-	</function>
-***/
-
 #define FORMAT_STRING_SIZE	512
 
 /* Defaults */
@@ -118,6 +82,8 @@
 static int ooh323_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
 static int ooh323_queryoption(struct ast_channel *ast, int option, void *data, int *datalen);
 static int ooh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
+static int function_ooh323_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len);
+static int function_ooh323_write(struct ast_channel *chan, const char *cmd, char *data, const char *value);
 
 static enum ast_rtp_glue_result ooh323_get_rtp_peer(struct ast_channel *chan, struct ast_rtp_instance **rtp);
 static enum ast_rtp_glue_result ooh323_get_vrtp_peer(struct ast_channel *chan, struct ast_rtp_instance **rtp);
@@ -151,7 +117,8 @@
 	.queryoption = ooh323_queryoption,
 	.bridge = ast_rtp_instance_bridge,		/* XXX chan unlocked ? */
 	.early_bridge = ast_rtp_instance_early_bridge,
-
+	.func_channel_read = function_ooh323_read,
+	.func_channel_write = function_ooh323_write,
 };
 
 static struct ast_rtp_glue ooh323_rtp = {
@@ -3518,13 +3485,6 @@
 	return res;
 }
 
-/*! \brief Structure to declare a dialplan function: OOH323 */
-static struct ast_custom_function ooh323_function = {
-        .name = "OOH323",
-        .read = function_ooh323_read,
-        .write = function_ooh323_write,
-};
-
 static int load_module(void)
 {
 	int res;
@@ -3692,9 +3652,6 @@
 		/* And start the monitor for the first time */
 		restart_monitor();
 	}
-
-	/* Register dialplan functions */
-	ast_custom_function_register(&ooh323_function);
 
 	return 0;
 }
@@ -4085,9 +4042,6 @@
 		ast_verbose("	unload_module- destroying OOH323 endpoint \n");
 	}
 	ooH323EpDestroy();
-
-	/* Unregister dial plan functions */
-	ast_custom_function_unregister(&ooh323_function);
 
 	if (gH323Debug) {
 		ast_verbose("+++ ooh323  unload_module \n");

Modified: trunk/funcs/func_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_channel.c?view=diff&rev=338996&r1=338995&r2=338996
==============================================================================
--- trunk/funcs/func_channel.c (original)
+++ trunk/funcs/func_channel.c Mon Oct  3 09:24:45 2011
@@ -254,6 +254,22 @@
 						The channel is either on hold or a call waiting call.</para>
 					</enum>
 				</enumlist>
+				<para><emphasis>chan_ooh323</emphasis> provides the following additional options:</para>
+				<enumlist>
+					<enum name="faxdetect">
+						<para>Fax Detect [R/W]</para>
+						<para>Returns 0 or 1</para>
+						<para>Write yes or no</para>
+					</enum>
+					<enum name="t38support">
+						<para>t38support [R/W]</para>
+						<para>Returns 0 or 1</para>
+						<para>Write yes or no</para>
+					</enum>
+					<enum name="h323id">
+						<para>Returns h323id [R]</para>
+					</enum>
+				</enumlist>
 			</parameter>
 		</syntax>
 		<description>