diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-03-01 23:44:09 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-03-01 23:44:09 +0000 |
| commit | 3d6e6e07ef6d20af1d59c58fe86541cf1b82b2ea (patch) | |
| tree | 76b43624a1fb75588685190b618d6f79bef504b3 /include | |
| parent | b3bc6754028ada39dd198911796414da3ee4f4ef (diff) | |
Merged revisions 57364 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57364 | russell | 2007-03-01 17:42:53 -0600 (Thu, 01 Mar 2007) | 16 lines
Merge changes from svn/asterisk/team/russell/sla_updates
* Originally, I put in the documentation that only Zap interfaces would be
supported on the trunk side. However, after a discussion with Qwell, we came
up with a way to make IP trunks work as well, using some things already in
Asterisk. So, here it is, this now officially supports IP trunks.
* Update the SLA documentation to reflect how to setup IP trunks.
* Add a section in sla.txt that describes how to set up an SLA system with
voicemail.
* Simplify the way DTMF passthrough is handled in MeetMe.
* Fix a bug that exposed itself when using a Local channel on the trunk side
in SLA. The station's channel needs to be passed to the dial API when
dialing the trunk.
* Change a WARNING message to DEBUG in channel.h. This message is of no use
to users.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 22a08120c..55596b147 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -1375,15 +1375,16 @@ static inline int ast_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds, #define CRASH do { } while(0) #endif -#define CHECK_BLOCKING(c) { \ - if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\ - ast_log(LOG_WARNING, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \ - CRASH; \ - } else { \ - (c)->blocker = pthread_self(); \ - (c)->blockproc = __PRETTY_FUNCTION__; \ - ast_set_flag(c, AST_FLAG_BLOCKING); \ - } } +#define CHECK_BLOCKING(c) do { \ + if (ast_test_flag(c, AST_FLAG_BLOCKING)) {\ + if (option_debug) \ + ast_log(LOG_DEBUG, "Thread %ld Blocking '%s', already blocked by thread %ld in procedure %s\n", (long) pthread_self(), (c)->name, (long) (c)->blocker, (c)->blockproc); \ + CRASH; \ + } else { \ + (c)->blocker = pthread_self(); \ + (c)->blockproc = __PRETTY_FUNCTION__; \ + ast_set_flag(c, AST_FLAG_BLOCKING); \ + } } while (0) ast_group_t ast_get_group(const char *s); |