diff options
| author | Mark Spencer <markster@digium.com> | 2004-09-02 19:07:24 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2004-09-02 19:07:24 +0000 |
| commit | bc72d7584a6034039dd70f311b158ccdbbbab912 (patch) | |
| tree | 7e98ef6e98f26b20da4ba7d114e63839858c9ff3 /channels/chan_zap.c | |
| parent | b813a5f3faf0b154478ba44771f3fa6de19cd6c3 (diff) | |
Don't use FXO's with no battery (bug #2359)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rwxr-xr-x | channels/chan_zap.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index a061712ed..cafe99e14 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -6289,9 +6289,6 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch, return 1; } #endif - if ((p->sig == SIG_FXSKS) || (p->sig == SIG_FXSLS) || - (p->sig == SIG_FXSGS) || !p->sig) - return 1; if (!p->radio) { /* Check hook state */ @@ -6304,6 +6301,14 @@ static inline int available(struct zt_pvt *p, int channelmatch, int groupmatch, } if (res) { ast_log(LOG_WARNING, "Unable to check hook state on channel %d\n", p->channel); + } else if ((p->sig == SIG_FXSKS) || (p->sig == SIG_FXSLS) || + (p->sig == SIG_FXSGS) || !p->sig) { + /* When "onhook" that means no battery on the line, and thus + it is out of service... */ + if (par.rxisoffhook) + return 1; + else + return 0; } else if (par.rxisoffhook) { ast_log(LOG_DEBUG, "Channel %d off hook, can't use\n", p->channel); /* Not available when the other end is off hook */ |