diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 20:05:46 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-31 20:05:46 +0000 |
| commit | 9bc20020f1e99162aca248e3f071ee5b5fea35d0 (patch) | |
| tree | e8f75f4ce91647652c8eaec16c7afe3c7b0bcc5f /main | |
| parent | b417a0a687cc0c5ed9bac14430cfa70281274657 (diff) | |
* Fixed timeout logic in the dialing API as setting timeouts
had no effect
* Updated dialing API documentation to indicate that timeouts
are specified in milliseconds
* Added a new timeout argument to the Page application. If time
expires, any endpoints which have not answered will be hung up.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@153223 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/dial.c b/main/dial.c index 54654a94a..e8c9ca221 100644 --- a/main/dial.c +++ b/main/dial.c @@ -1038,7 +1038,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; @@ -1059,7 +1059,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; |