[svn-commits] mmichelson: branch 1.6.1 r153225 - in /branches/1.6.1: include/asterisk/ main/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Oct 31 15:10:40 2008
New Revision: 153225

URL: http://svn.digium.com/view/asterisk?view=rev&rev=153225
Log:
This commit contains the bug fixes and documentation updates
which were committed to trunk in revision 153223. I blocked that
commit from 1.6.1 since it also contained a new feature.

Note to self: Separate commits so that you don't end up with
a situation where part of a commit should be merged but part
should be blocked from stable branches.


Modified:
    branches/1.6.1/include/asterisk/dial.h
    branches/1.6.1/main/dial.c

Modified: branches/1.6.1/include/asterisk/dial.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/include/asterisk/dial.h?view=diff&rev=153225&r1=153224&r2=153225
==============================================================================
--- branches/1.6.1/include/asterisk/dial.h (original)
+++ branches/1.6.1/include/asterisk/dial.h Fri Oct 31 15:10:40 2008
@@ -154,7 +154,7 @@
 
 /*! \brief Set the maximum time (globally) allowed for trying to ring phones
  * \param dial The dial structure to apply the time limit to
- * \param timeout Maximum time allowed
+ * \param timeout Maximum time allowed in milliseconds
  * \return nothing
  */
 void ast_dial_set_global_timeout(struct ast_dial *dial, int timeout);
@@ -162,7 +162,7 @@
 /*! \brief Set the maximum time (per channel) allowed for trying to ring the phone
  * \param dial The dial structure the channel belongs to
  * \param num Channel number to set timeout on
- * \param timeout Maximum time allowed
+ * \param timeout Maximum time allowed in milliseconds
  * \return nothing
  */
 void ast_dial_set_timeout(struct ast_dial *dial, int num, int timeout);

Modified: branches/1.6.1/main/dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/dial.c?view=diff&rev=153225&r1=153224&r2=153225
==============================================================================
--- branches/1.6.1/main/dial.c (original)
+++ branches/1.6.1/main/dial.c Fri Oct 31 15:10:40 2008
@@ -1037,7 +1037,7 @@
 {
 	dial->timeout = timeout;
 
-	if (dial->timeout > 0 && dial->actual_timeout > dial->timeout)
+	if (dial->timeout > 0 && (dial->actual_timeout > dial->timeout || dial->actual_timeout == -1))
 		dial->actual_timeout = dial->timeout;
 
 	return;
@@ -1058,7 +1058,7 @@
 
 	channel->timeout = timeout;
 
-	if (channel->timeout > 0 && dial->actual_timeout > channel->timeout)
+	if (channel->timeout > 0 && (dial->actual_timeout > channel->timeout || dial->actual_timeout == -1))
 		dial->actual_timeout = channel->timeout;
 
 	return;