diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 23:12:26 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 23:12:26 +0000 |
| commit | b0fa00d5cf03eb834a2e631f01a61fe79eb61dc8 (patch) | |
| tree | 9045e1b907d62dd081e8338d2b8e027f7916053f /main/dial.c | |
| parent | 34a5d7b0212beb3f6bd643e3bd1cff08ee281a1b (diff) | |
Merged revisions 56277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r56277 | russell | 2007-02-22 17:08:36 -0600 (Thu, 22 Feb 2007) | 18 lines
Merge changes from team/russell/sla_updates.
This batch of changes to the SLA code does a few different things.
* I made the SLA code event driven instead of having to act in a lot of busy
loops while dialing things to wait for state changes. This makes the code
more efficient and readable at the same time.
* I have implemented a couple of new features. The first is inbound trunk
ringing timeouts. This is an option that defines how long to let an incoming
call on a trunk to ring.
* I have also implemented ring timeouts for stations. They may be specified
for the entire station, meaning it is how long to let the station ring before
giving up. You can also specify a ring timeout for a specific trunk on a
station. So, you can say that you only want a specific station to ring 5
seconds if it is line1 ringing, but otherwise, there is no timeout.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@56278 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/dial.c')
| -rw-r--r-- | main/dial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/dial.c b/main/dial.c index af3c5e354..9536629e9 100644 --- a/main/dial.c +++ b/main/dial.c @@ -559,7 +559,7 @@ enum ast_dial_result ast_dial_run(struct ast_dial *dial, struct ast_channel *cha /* If we are running async spawn a thread and send it away... otherwise block here */ if (async) { - set_state(dial, AST_DIAL_RESULT_TRYING); + dial->state = AST_DIAL_RESULT_TRYING; /* Try to create a thread */ if (ast_pthread_create(&dial->thread, NULL, async_dial, dial)) { /* Failed to create the thread - hangup all dialed channels and return failed */ |