From 4d4e20eb54690d0123bd0f05079c0b343a19ca6e Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 31 Oct 2008 20:10:40 +0000 Subject: [PATCH] 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. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@153225 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/dial.h | 4 ++-- main/dial.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/asterisk/dial.h b/include/asterisk/dial.h index fe4b63e93b..e023fb342c 100644 --- a/include/asterisk/dial.h +++ b/include/asterisk/dial.h @@ -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 * \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 @@ 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 * \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); diff --git a/main/dial.c b/main/dial.c index 199d05c2f8..2a9fdacecc 100644 --- a/main/dial.c +++ b/main/dial.c @@ -1037,7 +1037,7 @@ void ast_dial_set_global_timeout(struct ast_dial *dial, int 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; return; @@ -1058,7 +1058,7 @@ void ast_dial_set_timeout(struct ast_dial *dial, int num, int 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; return;