diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 18:03:31 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-02 18:03:31 +0000 |
commit | 3289f275b280a68c4d52db70d8ce39c2d190fcbe (patch) | |
tree | 478aca5f15533f80c62dd62ccababeb89c4750cb /channels/chan_dahdi.c | |
parent | f4be6d57fd867aefce3892a214a49842fc3da1af (diff) |
Merged revisions 160319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r160319 | jpeeler | 2008-12-02 12:00:24 -0600 (Tue, 02 Dec 2008) | 7 lines
(closes issue #13786)
Reported by: tzafrir
Readding DAHDI_CHECK_HOOKSTATE define that was removed in r134260 which fixes not being able to make outgoing calls on some FXO adapters:
http://lists.digium.com/pipermail/asterisk-users/2008-November/thread.html#221553
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@160326 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_dahdi.c')
-rw-r--r-- | channels/chan_dahdi.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index bf75d8371..0b4ec154a 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -145,6 +145,13 @@ static struct ast_jb_conf global_jbconf; */ /* #define DAHDI_CHECK_HOOKSTATE */ +/*! \note + * Define if you want to check the hook state for an FXO (FXS signalled) interface + * before dialing on it. Certain FXO interfaces always think they're out of + * service with this method however. + */ +/* #define DAHDI_CHECK_HOOKSTATE */ + /*! \brief Typically, how many rings before we should send Caller*ID */ #define DEFAULT_CIDRINGS 1 @@ -8730,7 +8737,11 @@ static inline int available(struct dahdi_pvt *p, int channelmatch, ast_group_t g } else if (par.rxisoffhook) { ast_debug(1, "Channel %d off hook, can't use\n", p->channel); /* Not available when the other end is off hook */ +#ifdef DAHDI_CHECK_HOOKSTATE return 0; +#else + return 1; +#endif } } return 1; |