diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-10-12 20:09:49 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-10-12 20:09:49 +0000 |
| commit | 3bc3e9bbb7535078a6a532ada6cd60953cd21dc8 (patch) | |
| tree | 5a38a1d4d8ecd9377d2e401dd9a77216d24cbabe | |
| parent | 796ed62f4774525032444479d72d2b239583abc4 (diff) | |
Initialize the PRI channel alarms properly on startup.
The PRI channel alarms were initialized with an inverted sense.
(closes issue ASTERISK-18710)
Reported by: Tzafrir Cohen
........
Merged revisions 340522 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 340523 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_dahdi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 3cfdf0c79..05b992402 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -12897,20 +12897,12 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, } } ioctl(tmp->subs[SUB_REAL].dfd,DAHDI_SETTONEZONE,&tmp->tonezone); -#ifdef HAVE_PRI - memset(&si, 0, sizeof(si)); - if (ioctl(tmp->subs[SUB_REAL].dfd,DAHDI_SPANSTAT,&si) == -1) { - ast_log(LOG_ERROR, "Unable to get span status: %s\n", strerror(errno)); - destroy_dahdi_pvt(tmp); - return NULL; - } -#endif if ((res = get_alarms(tmp)) != DAHDI_ALARM_NONE) { /* the dchannel is down so put the channel in alarm */ switch (tmp->sig) { #ifdef HAVE_PRI case SIG_PRI_LIB_HANDLE_CASES: - sig_pri_set_alarm(tmp->sig_pvt, !si.alarms); + sig_pri_set_alarm(tmp->sig_pvt, 1); break; #endif #if defined(HAVE_SS7) |