kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

This commit contains the bug fixes and documentation updates

Browse Source 
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.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153225 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-10-31 20:10:40 +00:00
parent e15b6301dd
commit 4d4e20eb54
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/dial.h
View File

@@ -154,7 +154,7 @@ void ast_dial_set_state_callback(struct ast_dial *dial, ast_dial_state_callback
/*! \brief Set the maximum time (globally) allowed for trying to ring phones /*! \brief Set the maximum time (globally) allowed for trying to ring phones
* \param dial The dial structure to apply the time limit to * \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 * \return nothing
*/ */
void ast_dial_set_global_timeout(struct ast_dial *dial, int timeout); void ast_dial_set_global_timeout(struct ast_dial *dial, int timeout);
@@ -162,7 +162,7 @@ void ast_dial_set_global_timeout(struct ast_dial *dial, int timeout);
/*! \brief Set the maximum time (per channel) allowed for trying to ring the phone /*! \brief Set the maximum time (per channel) allowed for trying to ring the phone
* \param dial The dial structure the channel belongs to * \param dial The dial structure the channel belongs to
* \param num Channel number to set timeout on * \param num Channel number to set timeout on
* \param timeout Maximum time allowed * \param timeout Maximum time allowed in milliseconds
* \return nothing * \return nothing
*/ */
void ast_dial_set_timeout(struct ast_dial *dial, int num, int timeout); void ast_dial_set_timeout(struct ast_dial *dial, int num, int timeout);

4
main/dial.c
View File

@@ -1037,7 +1037,7 @@ void ast_dial_set_global_timeout(struct ast_dial *dial, int timeout)
{ {
dial->timeout = timeout; 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; dial->actual_timeout = dial->timeout;
return; return;
@@ -1058,7 +1058,7 @@ void ast_dial_set_timeout(struct ast_dial *dial, int num, int timeout)
channel->timeout = timeout; 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; dial->actual_timeout = channel->timeout;
return; return;