aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-09-13 02:27:32 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-09-13 02:27:32 +0000
commit4ef986309141341c1c409bb0a4bc37967bd1adeb (patch)
tree9eed518bc9fffa0892f829cd9d314f621af599cc
parent37810120b42e0ee69262a15de3df17c27d634176 (diff)
Try a more generally correct solution, for NFAS (bug #5179)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6567 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_zap.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 7c2829b26..44b3fe1e8 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2205,8 +2205,6 @@ int pri_find_dchan(struct zt_pri *pri)
ast_log(LOG_NOTICE, "Switching from from d-channel %d to channel %d!\n",
pri->dchannels[oldslot], pri->dchannels[newslot]);
pri->pri = pri->dchans[newslot];
- if (!pri_is_up(pri) && !(pri->dchanavail[newslot] & DCHAN_NOTINALARM))
- pri_restart(pri->dchans[newslot]);
return 0;
}
#endif
@@ -8067,7 +8065,7 @@ static void *pri_dchannel(void *vpri)
pri_find_dchan(pri);
} else if (x == ZT_EVENT_NOALARM) {
pri->dchanavail[which] |= DCHAN_NOTINALARM;
- pri_find_dchan(pri);
+ pri_restart(pri->dchans[which]);
}
if (option_debug)