[svn-commits] mmichelson: branch group/CCSS r247853 - in /team/group/CCSS: apps/ include/as...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Feb 18 17:18:51 2010
New Revision: 247853

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247853
Log:
* Add doxygen for ast_cc_extension_monitor_add_dialstring
* Call ast_cc_extension_monitor_add_dialstring only if ignore_cc is not set.


Modified:
    team/group/CCSS/apps/app_dial.c
    team/group/CCSS/include/asterisk/ccss.h

Modified: team/group/CCSS/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/apps/app_dial.c?view=diff&rev=247853&r1=247852&r2=247853
==============================================================================
--- team/group/CCSS/apps/app_dial.c (original)
+++ team/group/CCSS/apps/app_dial.c Thu Feb 18 17:18:51 2010
@@ -1954,7 +1954,9 @@
 			continue;
 		}
 		ast_channel_get_device_name(tc, device_name, sizeof(device_name));
-		ast_cc_extension_monitor_add_dialstring(chan, interface, device_name);
+		if (!ignore_cc) {
+			ast_cc_extension_monitor_add_dialstring(chan, interface, device_name);
+		}
 		pbx_builtin_setvar_helper(tc, "DIALEDPEERNUMBER", numsubst);
 
 		ast_channel_lock(tc);

Modified: team/group/CCSS/include/asterisk/ccss.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/include/asterisk/ccss.h?view=diff&rev=247853&r1=247852&r2=247853
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Thu Feb 18 17:18:51 2010
@@ -716,6 +716,21 @@
  */
 int ast_cc_call_init(struct ast_channel *chan, int *ignore_cc);
 
+/*!
+ * \since 1.8
+ *
+ * \brief Add a child dialstring to an extension monitor
+ *
+ * Whenever we request a channel, the parent extension monitor needs
+ * to store the dialstring of the device requested. The reason is so
+ * that we can call the device back during the recall even if we are
+ * not monitoring the device.
+ *
+ * \param incoming The caller's channel
+ * \param dialstring The dialstring used when requesting the outbound channel
+ * \param device_name The device name associated with the requested outbound channel
+ * \retval void
+ */
 void ast_cc_extension_monitor_add_dialstring(struct ast_channel *incoming, const char * const dialstring, const char * const device_name);
 
 /*!