diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-03 19:19:40 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-03 19:19:40 +0000 |
| commit | f824b845ce70b8f74bf18b2e04a092230da7f64b (patch) | |
| tree | 826aca407d9b8758d3c5c73a02edb72c47dd679b /main | |
| parent | 06b4ef83179ddc1160330df5bfb19c476d8f399a (diff) | |
Merged revisions 378458,378460 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r378458 | rmudgett | 2013-01-03 12:47:29 -0600 (Thu, 03 Jan 2013) | 18 lines
chan_agent: Misc code cleanup.
* Fix off-nominal path resource cleanup in agent_request().
* Create agent_pvt_destroy() to eliminate inlined versions in many places.
* Pull invariant code out of loop in add_agent().
* Remove redundant module user references in login_exec().
* Remove unused struct agent_pvt logincallerid[] member.
........
Merged revisions 378456 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378457 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r378460 | kmoore | 2013-01-03 12:51:43 -0600 (Thu, 03 Jan 2013) | 13 lines
Add missing test event
This test event was missing from channel.c causing the dial_LS_options
test to fail intermittently because of a race condition where most code
paths emitted the test event but this one did not. The dial_LS_options
test should stop bouncing now.
........
Merged revisions 378455 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378459 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378467 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index d1d4d095d..5f2234a0f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -605,6 +605,7 @@ int ast_check_hangup(struct ast_channel *chan) if (ast_tvdiff_ms(*ast_channel_whentohangup(chan), ast_tvnow()) > 0) /* no if hangup time has not come yet. */ return 0; ast_debug(4, "Hangup time has come: %" PRIi64 "\n", ast_tvdiff_ms(*ast_channel_whentohangup(chan), ast_tvnow())); + ast_test_suite_event_notify("HANGUP_TIME", "Channel: %s", ast_channel_name(chan)); ast_channel_softhangup_internal_flag_add(chan, AST_SOFTHANGUP_TIMEOUT); /* record event */ return 1; } |